pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 01:11:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,068 Commits 88 Branches 159 Tags
Commit Graph

4068 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Cook (mackal)
5be1bd2ffb Make items with long reuse timers show the timer after zone 
This adds a new table to store the timers in. This may seem
odd but the timers are associated with the player, not the
item, they're just included in the item header in the packet

Currently trading still needs to be handled
 2015-01-31 17:53:50 -05:00
Michael Cook (mackal)
b5d45effec Fix some zone/npc.cpp functions 2015-01-31 17:33:41 -05:00
JJ
96925f0dde Some minor cleanup. [skip ci] 2015-01-31 17:03:44 -05:00
Michael Cook (mackal)
c06c69c420 Merge pull request #356 from clucksoft/rof_merchantlist 
Rof merchantlist
 2015-01-31 16:22:39 -05:00
JJ
17d276cd4e Finish proper SQL. [skip ci] 2015-01-31 15:22:03 -05:00
Russell Kinasz
2763fe36a3 RoF+ can send 200 items in merchantlist 2015-01-31 11:17:28 -08:00
Russell Kinasz
1e8916ee98 RoF+ can send 200 items in merchantlist 2015-01-31 11:11:06 -08:00
Trevius
fe6fa75385 Fixed FindGroundZ() and GetGroundZ() to once again utilize the X and Y arguments that are passed to them. 2015-01-31 11:44:25 -06:00
Michael Cook (mackal)
eb7d77bcac Shared Bank bug fix? 2015-01-31 03:48:59 -05:00
Michael Cook (mackal)
0bdbc5f5c9 More clang-formatting 2015-01-31 01:22:40 -05:00
Akkadius
3c08af5ca1 (Bobaski) Add PoK New Merchant sql/git/optional/2015_01_30_poknowledge_spell_vendors.sql 2015-01-30 23:43:35 -06:00
Akkadius
7a3399e510 WOOPS! (That's what he said) 2015-01-30 23:17:11 -06:00
Akkadius
877d2cab4e Merge branch 'master' of https://github.com/EQEmu/Server 2015-01-30 23:16:08 -06:00
Akkadius
39a47ceb93 Implemented LUA counterpart of EVENT_ENVIRONMENTAL_DAMAGE 2015-01-30 23:15:48 -06:00
Akkadius
8229a578ee Implemented event type "EVENT_ENVIRONMENTAL_DAMAGE" 
- This event triggers when taking any sort of environmental damage. Example use:
	sub EVENT_ENVIRONMENTAL_DAMAGE{
		quest::debug("EVENT_ENVIRONMENTAL_DAMAGE");
		quest::debug("env_damage is " . $env_damage);
		quest::debug("env_damage_type is " . $env_damage_type);
		quest::debug("env_final_damage is " . $env_final_damage);
	}
	Result: (Test falling in Velks): http://i.imgur.com/tPRL7yL.png
 2015-01-30 23:01:31 -06:00
Michael Cook (mackal)
0f1b504ed6 Some clang-formatting 2015-01-31 00:00:02 -05:00
Akkadius
62197d7d33 Merge branch 'master' of https://github.com/EQEmu/Server 2015-01-30 22:58:52 -06:00
Michael Cook (mackal)
a18cb6f61e Another tell_queue leak fix 2015-01-30 22:00:39 -05:00
Michael Cook (mackal)
18fb507f24 Tell queue memleak fix 2015-01-30 20:23:17 -05:00
KayenEQ
db948b3653 Merge pull request #355 from KayenEQ/Development 
remove debug
 2015-01-30 19:32:17 -05:00
KayenEQ
e8553576f7 remove debug 2015-01-30 19:28:16 -05:00
KayenEQ
867b57bcf6 removed debug msg 2015-01-30 19:21:24 -05:00
Akkadius
ee57568c5d Implement Rule Based Environment damage multiplier 2015-01-30 18:12:00 -06:00
KayenEQ
d93f3bdd9e Merge pull request #354 from KayenEQ/Development 
Charm/Paci fixes
 2015-01-30 18:48:38 -05:00
KayenEQ
ccbaf337f4 Fix for minimum charm and root resist chances (was always returning 0). 
Fix for pacification not doing a proper second resist check upon resisting intial pacification.
 2015-01-30 18:47:27 -05:00
Michael Cook (mackal)
b592d2e786 clang format some stuff in zone/command.cpp 2015-01-30 18:32:28 -05:00
KimLS
9a664476b0 Merge branch 'eqstream_ptr' 2015-01-30 15:03:40 -08:00
KimLS
f388a605dd Spelling errors and revised my cle change to put it much lower so it shouldn't have any side effects other than avoiding the crash 2015-01-30 15:03:02 -08:00
Alex
01c0a87cee Merge pull request #353 from EQEmu/eqstream_ptr 
Change EQStream raw pointers to be std::shared_ptr
 2015-01-30 13:41:49 -08:00
KimLS
faaa98d3f0 Crash fix for crash we saw on peq 2015-01-30 13:04:51 -08:00
Michael Cook (mackal)
769987ca33 unique_ptr is a better fit here 2015-01-30 02:34:33 -05:00
Michael Cook (mackal)
8086eecfe2 Fix db manifest 2015-01-30 01:38:26 -05:00
Michael Cook (mackal)
8ec1cb949a Fix merc attack delay 2015-01-30 01:33:55 -05:00
KimLS
5e1a886e8f Merge branch 'master' into eqstream_ptr 2015-01-29 22:13:41 -08:00
Trevius
0aba2d578a Added more information to Mercenary Logging. 
Added potential fix for Mercenaries that fail to unsuspend.
Added a new "statscale" field to the merc_stats table that can be used to quickly balance Mercenary Stats based on Level.
The new "statscale" field now combines with the Mercs::ScaleRate rule value (default 100 percent for both).
 2015-01-29 23:04:41 -06:00
KayenEQ
dd980ab8ad Merge pull request #352 from KayenEQ/Development 
Fix for range procs
 2015-01-28 23:54:38 -05:00
KayenEQ
30dbe34f78 Fix for range procs 2015-01-28 23:53:52 -05:00
Akkadius
5d465a4d49 UCS Crash Fix 2015-01-28 22:47:43 -06:00
Akkadius
0c934272c0 Added Logs::DebugQuest category per request from Trevius (Great idea) 
- Exported quest::debug(log_message, [debug_level = 1)
	- Example:
		quest::debug("This is a test debug message, level 1 (default)");
		quest::debug("This is a test debug message, level 1", 1);
		quest::debug("This is a test debug message, level 2", 2);
		quest::debug("This is a test debug message, level 3", 3);

		Result: http://i.imgur.com/6VoafGE.png
	- Uses traditional logging system to output this category
	- Required MySQL Source in Database version 9070
 2015-01-28 20:00:03 -06:00
Akkadius
61e9160d47 Update eqemu_update.pl to download patch_UF.conf instead of patch_Underfoot.conf 2015-01-28 00:05:29 -06:00
KimLS
7dbe6a7426 Many tweaks to stream memory allocation, including but not limited to streams now are shared_ptrs. 2015-01-27 21:12:44 -08:00
Michael Cook (mackal)
5f545df312 Remove const 2015-01-27 21:48:11 -05:00
Michael Cook (mackal)
99164fe3f9 Switch AI timers to smart pointers 2015-01-27 21:28:38 -05:00
Akkadius
2211a63fe7 Some minor format changes to SaveCharacterCorpse 2015-01-27 20:24:43 -06:00
Akkadius
0f196cc995 Fix for ZoneDatabase::SaveCharacterCorpse where a corpse was empty and two individual corpses would be created 2015-01-27 19:46:31 -06:00
Michael Cook (mackal)
a12011ca1e Fix some bugs with starting AI in mercs 
The vtable ptr is that of the current constructor the code is in ...
 2015-01-27 19:53:13 -05:00
Michael Cook (mackal)
7dcd12fb9d clang-modernize use-nullptr on zone/mob_ai.cpp 2015-01-27 19:32:49 -05:00
Uleat
d037bc9dcc Merge branch 'master' of https://github.com/EQEmu/Server 2015-01-27 18:40:04 -05:00
Uleat
dd9f419735 Merge branch 'master' of https://github.com/EQEmu/Server 
Conflicts:
	changelog.txt
 2015-01-27 18:34:43 -05:00
Michael Cook (mackal)
62d1b0c2bd Merc NPCType memleak fix 2015-01-27 18:32:32 -05:00