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
373ff66240
moved string functions from MiscFunctions to StringUtil
2013-05-11 00:05:11 -07:00
4bdd8b2502
Change space indentation to tabs
2013-05-09 11:37:51 -04:00
ffcff4aea1
Remove trailing whitespace
2013-05-09 11:13:16 -04:00
7560b6b0a7
NULL to nullptr
2013-05-04 18:06:58 -07:00
353d7cede0
Bards can now use instant cast AAs while singing (Fading Memories, Boastful Bellow)
...
AA reuse timers now start before the spell is cast and reset upon failure or canceling
2013-04-01 17:19:45 -04:00
2073ca8d38
Fixed and cleaned up Client::Escape()
...
Fixed SE_FadingMemories to use Client::Escape()
Rogue AA Escape now uses a spell instead of AA Action
Bard AA Fading Memories now only uses the AA Action to eat mana
2013-03-23 18:34:06 -04:00
e53ae5f6d5
More compiler warning fixes.
2013-03-10 18:55:18 +00:00
7ce6f4de0d
More shared memory work + moved spdat from zone to common
2013-02-19 15:33:21 -08:00
0d16361a40
Working on shared memory stuff - removed some stuff dealing with older code and loading spells from the non-database
2013-02-18 19:00:07 -08:00
07950b7a58
Fix calc of resuse timers on multi-rank AAs
2013-02-16 19:47:12 -05:00
da7347f76f
svn -> git Migration
2013-02-16 16:14:39 -08:00
Arthur Ice
j883376
mackal
Derision
KimLS