4142 Commits

Author SHA1 Message Date
Paul Coene
1ff2a043f4 Merge branch 'master' of https://github.com/EQEmu/Server 2015-02-01 09:34:04 -05:00
Paul Coene
115d0d14ac Fix issues with faction where chars were not allowed to earn faction to
offset starting faction values.
2015-02-01 09:31:07 -05:00
KayenEQ
7df541ea1c Merge pull request #357 from KayenEQ/Development
Pets can now cast group spells on self will now affect group.
2015-02-01 06:35:08 -05:00
KayenEQ
73ac566c17 remove debug... 2015-02-01 06:32:56 -05:00
KayenEQ
cc4c6b6339 Fix/Implemented - Pets who cast group spells (Target Type 43) will now have the spell
affect entire group instead of just the pet.

This used to work at some point, no clue when it broke...
2015-02-01 06:31:53 -05:00
Akkadius
b3ea1a9da7 Some changes 2015-02-01 04:05:32 -06:00
Akkadius
5fcd3eb38e Implement stable Server -> Client packet logging 2015-02-01 03:25:16 -06:00
Akkadius
e35205eaf4 Add Packet :: Server -> Client logging 2015-02-01 02:13:47 -06:00
Akkadius
081a61a948 Add Packet :: Server -> Client category 2015-02-01 02:11:58 -06:00
Akkadius
d75c632d73 Chnage netcode logging check to use is_category_enabled instead of just checking for console 2015-02-01 02:10:18 -06:00
Akkadius
d9c47fcd41 Add a category check pre Logs::Client_Server_Packet trigger 2015-02-01 02:09:24 -06:00
Akkadius
387b445685 Fix the 'is_category_enabled' in each of the database loaders 2015-02-01 02:08:46 -06:00
Akkadius
46ac254b3a Add struct member LogSettings::is_category_enabled so that it can be used for fast checking in intense portions of code 2015-02-01 01:58:10 -06:00
Akkadius
5f64b1e1c8 Modify category descriptor Packet :: Client -> Server 2015-02-01 01:06:19 -06:00
Akkadius
5c729e65c9 Add sanity checks to GMSayHookCallBackProcess 2015-02-01 01:05:39 -06:00
Akkadius
4f4eee2b16 Re-Order string_util.h 2015-02-01 01:03:30 -06:00
Akkadius
ed9bdaf60c Add to string_util.h void find_replace(std::string& string_subject, std::string& search_string, std::string& replace_string) { 2015-02-01 01:00:05 -06:00
Michael Cook (mackal)
b590eb2dc4 Send item recast timestamps picking up ground spawns 2015-01-31 20:54:56 -05:00
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
Akkadius
a6b95aeceb At point in which Client -> Server packet logging is working, will do more prechecking to declare that anything actually is subscribed to this category before outputting 2015-01-31 02:23:58 -06: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