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
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)
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
Trevius
f17fb2a8e1
Removed "Mercenary Debug:" from the Mercenary Log entries.
...
Resolved duplicate "You have no Mercenaries" messages when zoning without owning a Mercenary.
Mercenaries should now always be able to unsuspend if the timer is up.
More work on Mercenaries and Grouping to reduce bugs and redundant queries.
2015-01-27 00:35:39 -06:00
Paul Coene
5f3baf3649
Merge remote-tracking branch 'upstream/master'
2015-01-26 14:30:21 -05:00
Trevius
fc5266e115
Added Logs::Mercenaries to the new Logging System. Logging of Mercenary information is off by default with the required SQL.
2015-01-25 12:31:07 -06:00
Paul Coene
60412276da
Report repair as well as change from Update Personal Faction.
2015-01-25 09:55:41 -05:00
Paul Coene
22de30bab3
Repair faction messaging code.
...
The messages were being based on total faction rather than personal faction.
The personal faction range is all that is needed to detremine which message.
There were several bugs as well. Fixed several edge conditions
2015-01-25 09:46:00 -05:00
Uleat
cc1d7d54c2
Implemented mob equipment light sources
2015-01-24 22:00:06 -05:00
KimLS
73c6a0bb1d
Fix for bug with usage of IsOrigin, bug from when i was just doing glm::dot(pos, pos) == 0
2015-01-24 12:01:42 -08:00
KimLS
34bec5913b
Merge plus changed getposition to return a reference
2015-01-24 11:48:06 -08:00
Akkadius
7b6b3c8094
Removed EQDEBUG preprocessor check in TextLink::GenerateLink
2015-01-24 04:58:16 -06:00
Akkadius
b2dbc3923c
Remove occurence of ChangeSQLLog
2015-01-24 03:59:52 -06:00
Akkadius
5cb0fe0a6f
Remove Client::ChangeSQLLog
2015-01-24 03:51:48 -06:00
Akkadius
d5714cdcb0
Remove Client::LogSQL
2015-01-24 03:51:19 -06:00
KimLS
a7710c027b
Fix for polluted headers that were messing with glm
2015-01-23 17:58:03 -08:00
KimLS
17af9e3808
Merge fixes, hopefully didn't break anything.
2015-01-23 13:36:27 -08:00
KimLS
269d56e1d0
Switched out our kinda juryrigged vector types for glm::vec types since we use that as a 3d math library already but never switched out the types
2015-01-23 00:01:10 -08:00
Michael Cook (mackal)
f702e953e7
Some std::abs usage and a bit of clang-formatting
2015-01-22 22:59:52 -05:00
Alex
7bfc3a48a8
Merge pull request #343 from noudess/master
...
Made familiars persistent.
2015-01-22 16:48:38 -08:00
Akkadius
908c7b1464
Re-Fix Skills log message print types
2015-01-22 15:56:03 -06:00
Akkadius
c5447778a6
Merge remote-tracking branch 'remotes/origin/master' into logging_changes
...
Conflicts:
world/client.cpp
world/worlddb.cpp
zone/aggro.cpp
zone/bot.cpp
zone/client.cpp
zone/client_packet.cpp
zone/client_process.cpp
zone/doors.cpp
zone/entity.cpp
zone/inventory.cpp
zone/mob_ai.cpp
zone/perl_client.cpp
zone/spells.cpp
zone/waypoints.cpp
zone/zone.cpp
zone/zonedb.cpp
zone/zoning.cpp
2015-01-21 17:29:30 -06:00
Akkadius
3d74035e24
Merge remote-tracking branch 'remotes/origin/master' into logging_changes
...
Conflicts:
zone/command.cpp
zone/command.h
zone/inventory.cpp
2015-01-21 16:40:46 -06:00
Akkadius
98f0d4df49
UpdateAdmin Linux build fix
2015-01-20 19:22:28 -06:00
KayenEQ
ad711b0b5a
Fix for compile issue with vs2012
2015-01-20 17:35:39 -05:00
JJ
a84f480ffc
... and lang.
2015-01-20 15:51:00 -05:00
JJ
ee108b5b74
Skill gain logging fix. (iluvseq)
2015-01-20 15:33:26 -05:00
Akkadius
04ed14f424
Remove Duplicative MySQL Error: Error in SetAccountFlags query '
2015-01-20 01:41:47 -06:00
Akkadius
7f76ee04b0
Remove Duplicative MySQL Error: Error in LoadAccountFlags query '
2015-01-20 01:41:44 -06:00
Akkadius
6decdb6788
Remove Duplicative MySQL Error: Error in IsDiscovered query '
2015-01-20 01:41:35 -06:00
Akkadius
c82ada6dc4
Remove Duplicative MySQL Error:
2015-01-20 01:38:43 -06:00
Akkadius
8ecbf7c4dc
Remove Duplicative MySQL Error: Query failed: %s.
2015-01-20 01:37:58 -06:00
Akkadius
b2e4c98848
Remove commented std::cout : Sending mana update:
2015-01-20 01:30:53 -06:00
Michael Cook (mackal)
5c56929a23
Fix compile error with GCC
2015-01-20 00:04:22 -05:00
Uleat
e70e443950
Implemented 'enum class ClientVersion' -- added 'RoF2' to lua client version enumeration
2015-01-19 23:32:57 -05:00
Paul Coene
b96be9d5b8
Made familiars persistent.
2015-01-19 13:07:37 -05:00
Akkadius
acb677a4ba
More cleanup of some QueryDatabase references that no longer need auto results
2015-01-19 05:40:27 -06:00
Akkadius
bd6f6579ef
Remove Duplicative MySQL Error: Error in Client::TryReward(): %s (%s)
2015-01-19 05:25:25 -06:00
Akkadius
71842c62de
Remove Duplicative MySQL Error: Error in Client::TryReward(): %s (%s)
2015-01-19 05:25:21 -06:00
Akkadius
19dfc9e92d
Remove Duplicative MySQL Error: Error in Client::TryReward(): %s (%s)
2015-01-19 05:25:16 -06:00
Akkadius
381749933a
Remove Duplicative MySQL Error: Error in Client::SendRewards(): %s (%s)
2015-01-19 05:25:06 -06:00
Akkadius
0d9b6703a6
Rename debug.h to global_define.h, update cmakelists and such
2015-01-19 04:12:09 -06:00
Akkadius
fa83809130
Removal of client_logs.h from #includes
2015-01-19 03:40:09 -06:00
Akkadius
d7d1f9757b
Removal of client_logs.cpp/.h
2015-01-19 03:37:12 -06:00
Trevius
96820c4a31
Some work on RoF Guild Banks (still not functional).
2015-01-18 23:04:21 -06:00
Arthur Ice
c340fc9c39
Removed a usage of Mob::DistNoRootNoZ and used ComparativeDistanceNoZ instead
2015-01-18 02:10:42 -08:00
Arthur Ice
095f5d2587
Removed a usage of Mob::DistNoRootNoZ and used ComparativeDistanceNoZ instead
2015-01-18 02:08:18 -08:00
Arthur Ice
7c7250ee53
Removed a usage of Mob::DistNoRootNoZ and used ComparativeDistanceNoZ instead
2015-01-18 02:07:01 -08:00
Arthur Ice
952459a313
Removed a usage of Mob::DistNoRootNoZ and used ComparativeDistanceNoZ instead
2015-01-18 02:05:09 -08:00
