KimLS
ca380edfc8
Merge branch 'RunQueryToDatabaseQuery_zone_AA' of https://github.com/addtheice/Server into addtheice-RunQueryToDatabaseQuery_zone_AA
2014-08-22 00:17:53 -07:00
KimLS
389fa922e5
Merge branch 'addtheice-RunQueryToDatabaseQuery_zone_petitions'
2014-08-22 00:16:20 -07:00
KimLS
f9423b018c
Merging petitions.
2014-08-22 00:16:04 -07:00
Alex
05ccab87f3
Merge pull request #217 from KimLS/master
...
Renamed a bunch of files.
2014-08-22 00:07:10 -07:00
KimLS
27dec16551
Missed a file, thanks NTFS
2014-08-21 23:55:04 -07:00
KimLS
07a2cbe9a5
Renamed zone files
2014-08-21 23:46:01 -07:00
KimLS
4821ed79fb
More renames, world should be done
2014-08-21 23:30:09 -07:00
KimLS
5bf49d2ef9
More renames
2014-08-21 23:05:21 -07:00
KimLS
cd0824ee71
Moved some around, more renames
2014-08-21 22:43:33 -07:00
KimLS
504a8b19ce
Missed Mutex.h
2014-08-21 19:36:50 -07:00
KimLS
0b63eaa25d
Got rid of socket_server, why the heck is it still around
2014-08-21 19:34:45 -07:00
KimLS
7fc21b9e3a
Tons of renames
2014-08-21 19:33:02 -07:00
KimLS
e429260763
Missed eq stream factory
2014-08-21 17:30:00 -07:00
KimLS
06f18225ce
Renaming headers is hard work
2014-08-21 17:26:32 -07:00
KimLS
405884f47d
More file renames.
2014-08-21 16:59:32 -07:00
KimLS
6457c00548
Renaming files
2014-08-21 16:44:02 -07:00
Michael Cook (mackal)
2e80e56af1
Fix dangling else statements
2014-08-21 19:17:40 -04:00
Michael Cook (mackal)
0ad4ffe33f
Fix error in EQRawApplicationPacket::EQRawApplicationPacket()
2014-08-21 19:02:29 -04:00
Michael Cook (mackal)
16f112a281
Fix some if checks in Mob::CalcFocusEffect()
2014-08-21 18:10:40 -04:00
Michael Cook (mackal)
69944d907d
Fix compiler warning in zone/inventory.cpp
2014-08-21 17:59:52 -04:00
Michael Cook (mackal)
663dbf9fc2
Fix incorrect array size on A/B/C/DStackers
2014-08-21 17:56:32 -04:00
Michael Cook (mackal)
a4a8a1aba5
Clean up some compiler warnings with Stop_Return
2014-08-21 17:54:49 -04:00
Alex
fb84f7f84f
Merge pull request #198 from addtheice/RunQueryToDatabaseQuery_zone_forage
...
Run query to database query zone forage
2014-08-21 14:05:32 -07:00
Alex
1c295453da
Merge pull request #197 from addtheice/RunQueryToDatabaseQuery_world_zoneserver
...
Run query to database query world zoneserver
2014-08-21 14:04:50 -07:00
Alex
8199821343
Merge pull request #196 from addtheice/RunQueryToDatabaseQuery_EQLConfig
...
Run query to database query eql config
2014-08-21 14:04:32 -07:00
Alex
b59e856b33
Merge pull request #194 from addtheice/RunQueryToDatabaseQuery_Object
...
Run query to database query object
2014-08-21 14:04:06 -07:00
Alex
f81acf23a7
Merge pull request #195 from addtheice/RunQueryToDatabaseQuery_QGlobals
...
Run query to database query q globals
2014-08-21 14:03:57 -07:00
Alex
27eba2e6e9
Merge pull request #214 from KinglyKrab/master
...
Adds new column to 'merchantlist' table.
2014-08-21 14:02:27 -07:00
Kinglykrab
8b19c76e89
Adds new column to 'merchantlist' table.
...
Adds 'probability' after 'classes_required', valid values are 0 to 100.
2014-08-21 04:05:45 -04:00
Alex
8384ab9d2f
Merge pull request #193 from addtheice/RunQueryToDatabaseQuery_MobAI
...
Run query to database query mob ai
2014-08-20 21:04:27 -07:00
Alex
d5a5635a14
Merge pull request #192 from addtheice/RunQueryToDatabaseQuery_EQW
...
Run query to database query eqw
2014-08-20 21:03:44 -07:00
Alex
f8dc8be6e6
Merge pull request #191 from addtheice/RunQueryToDatabaseQuery_AdventureManager
...
Run query to database query adventure manager
2014-08-20 21:03:23 -07:00
Alex
5f9676d1a5
Merge pull request #190 from addtheice/RunQueryToDatabaseQuery_Adventure
...
Run query to database query adventure
2014-08-20 21:03:01 -07:00
Alex
964c4c83df
Merge pull request #189 from addtheice/RunQueryToDatabaseQuery_lfguild
...
Run query to database query lfguild
2014-08-20 21:02:20 -07:00
Uleat
5946af88a6
Reworked Trade::AddEntity() to allow client-directed movement of stacked items (as close to 'stacking' as I can get it - see changelog.txt)
2014-08-20 18:30:19 -04:00
Alex
1b6ccca709
Merge pull request #188 from addtheice/RunQueryToDatabaseQuery_rulesys
...
Run query to database query rulesys
2014-08-20 13:49:05 -07:00
Alex
957671e649
Merge pull request #187 from KinglyKrab/master
...
Renames spells_new fields.
2014-08-20 13:48:41 -07:00
Alex
79a9e393d2
Merge pull request #186 from addtheice/RunQueryToDatabaseQuery_client_files_import_main
...
Run query to database query client files import main
2014-08-20 13:48:24 -07:00
Alex
50c186b608
Merge pull request #185 from addtheice/RunQueryToDatabaseQuery_client_files_main
...
Run query to database query client files main
2014-08-20 13:47:43 -07:00
Alex
9054b93338
Merge pull request #183 from addtheice/RunQueryToDatabaseQuery_ptimer
...
Run query to database query ptimer
2014-08-20 13:46:43 -07:00
Alex
cf1f03fd5b
Merge pull request #181 from addtheice/RunQueryToDatabaseQuery_guild_base
...
Run query to database query guild base
2014-08-20 13:46:32 -07:00
Arthur Ice
1c87a6069a
CountAAEffects converted to QueryDatabase
2014-08-20 12:48:10 -07:00
Arthur Ice
9867fdd4d2
CountAAs converted to QueryDatabase
2014-08-20 12:45:41 -07:00
Arthur Ice
64cd589ca3
FillAAEffects converted to QueryDatabase
2014-08-20 12:41:37 -07:00
Arthur Ice
110d22e775
GetAASkillVars converted to QueryDatabase
2014-08-20 12:37:02 -07:00
Arthur Ice
3bc582885b
LoadAAs converted to QueryDatabase
2014-08-20 12:21:46 -07:00
Arthur Ice
e33e8b713e
GetTotalAALevels converted to QueryDatabase
2014-08-20 12:09:59 -07:00
Arthur Ice
4214cf47c2
LoadAAEffects converted to QueryDatabase
2014-08-20 12:05:57 -07:00
Arthur Ice
68115505f8
LoadAAEffects2 converted to QueryDatabase
2014-08-20 12:00:43 -07:00
Michael Cook (mackal)
d87c95c1f8
Properly set '-std=c++0x' as a CXX_FLAGS
...
This fixes an issue with clang compiling C files.
(Note: this does not mean clang is supported yet)
Ideally, this should check the compiler for -std=c++11 support,
then check -std=c++0x if the previous failed, then error if that
fails as well.
2014-08-19 20:06:49 -04:00
