SecretsOTheP
b7dfdc5060
Oops.
2014-09-02 22:07:49 -04:00
Uleat
e25239a50d
Merge branch 'master' of https://github.com/EQEmu/Server
2014-09-02 21:20:06 -04:00
Uleat
76d3edc534
Changed #loc to report the same precision as /loc for Cartesians
2014-09-02 21:19:30 -04:00
SecretsOTheP
7301182b3e
Merge branch 'master' of https://github.com/EQEmu/Server
...
Conflicts:
changelog.txt
2014-09-02 21:18:30 -04:00
SecretsOTheP
832e5e90d1
Secrets: Identified OP_GuildPromote for RoF clients.
...
Secrets: Fixed promotion, demotion, transferring a leader and displaying of client ranks in the Rain of Fear client. The rain of fear client, as such, will only have 3 ranks like the other clients, but supports a theoretical 8 ranks later.
Secrets/Akkadius: Fixed an issue involving character name lookup in the new DB code.
2014-09-02 21:16:20 -04:00
Michael Cook (mackal)
7ddaabee30
Merge pull request #235 from addtheice/guild_mgr_patch
...
Fixed bug with loading failing on Guild bank areas
2014-09-02 16:11:05 -04:00
Arthur Dene Ice
41d57ddab6
Fixed bug with loading failing on Guild bank areas
2014-09-02 12:43:56 -07:00
Michael Cook (mackal)
8dd00f5288
Fix crash issue in zone/hate_list.cpp
2014-09-02 02:39:03 -04:00
KimLS
15f217b594
Fixed non-conforming sql files.
2014-09-01 15:48:22 -07:00
Michael Cook (mackal)
8422178233
Fix issue with requesting an adventure
2014-09-01 02:58:52 -04:00
Uleat
eebe902917
Script update for opcode_handlers.py - changes in file names.
2014-09-01 00:07:21 -04:00
KimLS
04dc593df9
Various bug fixes
2014-08-31 20:27:02 -07:00
Michael Cook (mackal)
11ed698642
(noudess) Merchants are more descriptive in their rejections
2014-08-30 01:38:49 -04:00
Arthur Ice
0996570b78
merge from upstream
2014-08-28 15:49:16 -07:00
KimLS
ca84040a39
Crash fixes oh my
2014-08-28 03:47:28 -07:00
KimLS
467afc86af
Merge branch 'master' of github.com:EQEmu/Server
2014-08-28 03:18:02 -07:00
KimLS
19271f90a4
Crash fixes
2014-08-28 03:17:47 -07:00
Arthur Ice
0a9732a267
LogMerchantTransaction converted to QueryDatabase
2014-08-28 00:10:55 -07:00
Arthur Ice
1bc06c9c24
LogPlayerMove converted to QueryDatabase
2014-08-28 00:05:28 -07:00
Arthur Ice
e0acc937b3
LogPlayerDelete converted to QueryDatabase
2014-08-28 00:04:20 -07:00
Arthur Ice
3a10a0129a
LogPlayerNPCKill converted to QueryDatabase
2014-08-27 23:53:37 -07:00
Arthur Ice
18dbcf16cc
LogPlayerHandin converted to QueryDatabase
2014-08-27 23:52:36 -07:00
Arthur Ice
bed8dc7d34
LogPlayerTrade converted to QueryDatabase
2014-08-27 23:52:35 -07:00
Arthur Ice
a0fc9844fd
AddSpeech converted to QueryDatabase
2014-08-27 23:21:09 -07:00
Michael Cook (mackal)
9d6dc47cf4
Fix crash with MySQLRequestResult::ErrorMessage()
2014-08-28 02:15:37 -04:00
Michael Cook
d42d77d3ef
Merge pull request #233 from addtheice/master
...
Fixed crash on expire mail success, messages where switched accidentally
2014-08-28 02:13:27 -04:00
Arthur Ice
9041891557
Fixed crash on expire mail success, messages where switched accidentally
2014-08-27 22:57:03 -07:00
akkadius
dedd1fc70d
NPC::ModifyNPCStat function bloat cleanup
2014-08-27 14:26:36 -05:00
Arthur Ice
9ddb56088e
merge from master
2014-08-26 18:49:15 -07:00
Alex
9f4167a65c
Merge pull request #230 from addtheice/RunQueryToDatabaseQuery_zone_guild_mgr
...
Run query to database query zone guild mgr
2014-08-26 17:36:46 -07:00
Alex
085b021587
Merge pull request #226 from addtheice/RunQueryToDatabaseQuery_zone_spawngroup
...
Run query to database query zone spawngroup
2014-08-26 17:36:17 -07:00
Alex
5a65fd4207
Merge pull request #227 from addtheice/RunQueryToDatabaseQuery_zone_spawn2
...
Run query to database query zone spawn2
2014-08-26 17:36:03 -07:00
Alex
0f321b3a69
Merge pull request #228 from addtheice/RunQueryToDatabaseQuery_zone_client_packet
...
Run query to database query zone client packet
2014-08-26 17:35:51 -07:00
Alex
53c7b789f2
Merge pull request #229 from KayenEQ/Development
...
Added new param to special attack NPC_NO_CHASE
2014-08-26 17:35:36 -07:00
Alex
850ea7789e
Merge pull request #225 from addtheice/RunQueryToDatabaseQuery_zone_spells
...
SpellGlobalCheck converted to QueryDatabase
2014-08-26 17:35:21 -07:00
Alex
c3a3dc19a7
Merge pull request #224 from addtheice/RunQueryToDatabaseQuery_zone_zone
...
LoadStaticZonePoints converted to QueryDatabase
2014-08-26 17:35:10 -07:00
Alex
2606592f32
Merge pull request #223 from addtheice/RunQueryToDatabaseQuery_zone_doors
...
Run query to database query zone doors
2014-08-26 17:34:53 -07:00
Alex
5c3791631a
Merge pull request #221 from addtheice/RunQueryToDatabaseQuery_ucs_database
...
Run query to database query ucs database
2014-08-26 17:34:36 -07:00
Alex
4c9108a906
Merge pull request #210 from addtheice/RunQueryToDatabaseQuery_zone_waypoints
...
Run query to database query zone waypoints
2014-08-26 17:34:23 -07:00
Uleat
efbcaf6f64
Merge pull request #231 from EQEmu/trade_stacking
...
'Smart' Trade Transfers
2014-08-26 19:04:01 -04:00
Uleat
18a4f831be
Tweaked QS code for Client::FinishTrade() and QueryServ handlers.
2014-08-26 06:37:40 -04:00
KimLS
6597967acd
Changed void* to EQEmu::Any in quest interface. Been meaning to change from void* for a while to a structure that data hides instead.
2014-08-25 22:59:52 -07:00
KimLS
24825677dc
Merge branch 'master' of github.com:EQEmu/Server
2014-08-25 22:31:15 -07:00
KimLS
70d5983562
Added eqemu::any
2014-08-25 22:31:02 -07:00
Uleat
d4a9fed45e
Added QS code to Client::FinishTrade()
2014-08-25 22:29:00 -04:00
Arthur Ice
a6b923a22e
UpdateItemQuantity converted to QueryDatabase
2014-08-25 15:10:46 -07:00
Arthur Ice
1e87086471
DeleteItem converted to QueryDatabase
2014-08-25 12:43:14 -07:00
Arthur Ice
c3fdbfe904
SetPermissions converted to QueryDatabase
2014-08-25 12:33:09 -07:00
Arthur Ice
00852063c2
Promote converted to QueryDatabase
2014-08-25 12:15:06 -07:00
Uleat
d525d040fe
Merge branch 'master' of https://github.com/EQEmu/Server into trade_stacking
2014-08-24 23:40:15 -04:00
