KimLS
a3e24b6854
Merge from master
2013-05-23 12:50:34 -07:00
Arthur Ice
5255c236c3
added std:: to a lot of locations which where
...
missed and added NOMINMAX to cmakelist
2013-05-22 23:55:49 -07: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
KimLS
f2e0f9cca5
Changed a bunch of event names, made event_death returning more seamless and fixed up trading quests to have them always face target outside the parser
2013-05-15 18:43:06 -07:00
KimLS
b26df187e6
Merge from master terrible
2013-05-15 16:01:13 -07:00
KimLS
9e13a2271c
Merge conflicts
2013-05-15 13:22:46 -07:00
KimLS
3cc1065873
more lua, gonna work on single interpreter soon
2013-05-14 19:05:49 -07:00
Arthur Ice
373ff66240
moved string functions from MiscFunctions to StringUtil
2013-05-11 00:05:11 -07:00
Uleat
7a4cac84ac
-- Added missing wrapper to bot update message
...
-- Added notes to AESpell() update
2013-05-10 22:24:56 -04:00
Uleat
c98c115cb6
-- Added Bot primary weapon proc (secondary and ranged already exist)
...
-- Added Bard Bot Instrumentation bonuses
-- Added checks to avoid AE Buff casting on enemy mobs
-- Fixed a few typos in 'Vah Shir'-related code
2013-05-09 20:57:02 -04: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
badcaptain
e2f25d1c92
Fixed a couple of merc stat issues and a few bot aggro issues, removed unneeded bot pet AI.
2013-04-25 00:42:52 -04:00
Arthur Ice
0c6eee6d81
More warning clean ups (NULL to 0 on int, sprintf flags, typedef on enum)
2013-03-03 21:45:46 -08:00
Derision
af1f87a00f
Fixed uninitialised variabled tempBot in #bot stance command (cppcheck)
2013-03-03 22:26:57 +00:00
KimLS
147c96970c
Moved faction stuff around, removed stupid external item status stuff
2013-02-23 15:03:15 -08:00
KimLS
da7347f76f
svn -> git Migration
2013-02-16 16:14:39 -08:00
