Michael Cook
0fdfe025cb
Remove 'using namespaces std' fixes #61
2013-05-22 16:17:19 -04:00
Arthur Ice
f1a487f606
Merge branch 'master' into StringFormatting.
...
Cleaned up the problems. Tested on Linux. Still need to test on windows.
Conflicts:
common/CMakeLists.txt
common/MiscFunctions.cpp
common/MiscFunctions.h
common/debug.cpp
world/Adventure.cpp
2013-05-19 18:56:21 -07:00
Arthur Ice
373ff66240
moved string functions from MiscFunctions to StringUtil
2013-05-11 00:05:11 -07:00
j883376
4bdd8b2502
Change space indentation to tabs
2013-05-09 11:37:51 -04:00
j883376
ffcff4aea1
Remove trailing whitespace
2013-05-09 11:13:16 -04:00
Arthur Ice
7560b6b0a7
NULL to nullptr
2013-05-04 18:06:58 -07:00
Derision
f32a277643
Fixed memory leak in OP_VeteranRewardsAvailable
2013-03-19 19:22:16 +00:00
Derision
5c9f2c0d50
Fixed a couple of memory leaks.
2013-03-18 21:09:23 +00:00
Derision
d036afee5b
Fixed missing version parameter in DB select in GetZoneWeather.
2013-03-17 15:52:48 +00:00
Derision
981cabe857
Fixed a couple of merc memory leaks and removed some commented out DumpPacket calls.
2013-03-17 13:52:43 +00:00
badcaptain
0a805feeec
Fixed Merc spell recast timers, changed how Mercs add mobs to their hate lists (should prevent IsEngaged() issues), initial Caster DPS Merc spell casting AI, initial Merc stance implementation, Mercs now suspend when their owner dies to prevent them being bugged (until it can be fixed), added 2 seconds between spell casts to be live-like.
2013-03-14 19:51:29 -04:00
badcaptain
ea72975e69
Fixed Merc duplicate save bug, focus items, spell_scale and heal_scale now work implemented, new merc equipment (with focus items), added checks during merc hire, unsuspend, & timer update for states where a merc can't be hired, unsuspended, or can't be retained due to insufficient funds, no room in group, in raid, invalid merc data, etc, and give appropriate feedback, added rules for charging of merc purchase and upkeep costs.
2013-03-01 00:01:27 -05:00
KimLS
147c96970c
Moved faction stuff around, removed stupid external item status stuff
2013-02-23 15:03:15 -08:00
badcaptain
a41874b6a7
Moved merc save data from extended player profile to new merc table, save merc buffs, added cure and rez spells to healer merc.
2013-02-18 00:50:19 -05:00
KimLS
15dc9cfaf4
Some warning fixes, unreferenced local variables.
2013-02-16 22:07:32 -08:00
KimLS
da7347f76f
svn -> git Migration
2013-02-16 16:14:39 -08:00
