pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-24 13:11:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,499 Commits 87 Branches 159 Tags
Commit Graph

95 Commits

Author SHA1 Message Date
KimLS
46cb96a026 Merchant buying in flux but it works better now 2015-06-22 23:50:39 -07:00
KimLS
ff3cb9fc54 Merge branch 'master' into inv2 2015-04-07 16:29:07 -07:00
KimLS
b6a01871d8 Fix for another bazaar problem 2015-03-28 23:38:41 -07:00
KimLS
279ed8d86c Merge branch 'master' into inv2 2015-03-25 15:55:16 -07:00
KimLS
0cf5cca415 Other half of bazaar exploit 2015-03-22 23:18:08 -07:00
KimLS
6c26bc9c8f Fix for alt currency reclaim exploit and fix for exploit in trader code where price != set price 2015-03-20 13:10:36 -07:00
KimLS
18b4d068ea Early stages of swapping requirements in, should check for basic validity and equipable status 2015-02-26 22:09:29 -08:00
KimLS
568938d003 Merge from master 2015-02-25 19:39:48 -08:00
KimLS
69612b44d4 OP_MoveItem encode/decode for RoF2, disabled other patches for now (until i get rof2 packets and mechanics working well enough to go back and fix those) 2015-02-23 22:45:50 -08:00
JJ
318a664b09 No "sigs". [skip ci] 2015-02-23 19:57:47 -05:00
KimLS
b3c53e5907 Merge master, fix conflicts 2015-02-21 15:30:15 -08:00
KimLS
a90e9cf4c6 Refactoring 2015-02-20 20:15:58 -08:00
Trevius
3b45a66498 Fix for potential recursive loops if using RemoveFromHateList() within EVENT_HATE_LIST. 
Some work on Bazaar searching, but not functional yet.
 2015-02-18 21:32:18 -06:00
KimLS
701e194ece Renamed Item_Struct to ItemData 2015-02-17 18:06:22 -08:00
KimLS
b75e6308dd Renamed Inventory to InventoryOld 2015-02-17 13:42:21 -08:00
Trevius
28be3b87b7 (RoF2) Bazaar Trading (Buying/Selling) is now fully functional. Bazaar (/bazaar) search is not yet functional. 2015-02-16 11:56:23 -06:00
Trevius
811e8809cc (RoF2) Bazaar is now partially functional. RoF2 clients can start/end trader mode and other clients can purchase from them. No other functionality yet. 2015-02-14 11:09:36 -06:00
Michael Cook (mackal)
67ee327f5b Better sanity checking in Client::BuyTraderItem to prevent potential exploits 2015-02-07 12:39:46 -05:00
Akkadius
dfeb6e62a4 Changed a log entry to use Trade category instead of none 2015-01-24 04:55:03 -06:00
Akkadius
e24b67cbb4 Fixed DumpTrade to filter through trading Debug level 3 logs. Removed preprocessor checks 2015-01-24 04:54:02 -06:00
Akkadius
c5447778a6 Merge remote-tracking branch 'remotes/origin/master' into logging_changes 
Conflicts:
	world/client.cpp
	world/worlddb.cpp
	zone/aggro.cpp
	zone/bot.cpp
	zone/client.cpp
	zone/client_packet.cpp
	zone/client_process.cpp
	zone/doors.cpp
	zone/entity.cpp
	zone/inventory.cpp
	zone/mob_ai.cpp
	zone/perl_client.cpp
	zone/spells.cpp
	zone/waypoints.cpp
	zone/zone.cpp
	zone/zonedb.cpp
	zone/zoning.cpp
 2015-01-21 17:29:30 -06:00
Uleat
e70e443950 Implemented 'enum class ClientVersion' -- added 'RoF2' to lua client version enumeration 2015-01-19 23:32:57 -05:00
Akkadius
99baba4762 More cleanup of some QueryDatabase references that no longer need auto results 2015-01-19 05:38:23 -06:00
Akkadius
6d3b9ae40b Remove Duplicative MySQL Error: 2015-01-19 05:25:22 -06:00
Akkadius
8ccb1ca3e7 Remove Duplicative MySQL Error: 2015-01-19 05:25:17 -06:00
Akkadius
9fdc22f78b Remove Duplicative MySQL Error: 2015-01-19 05:25:08 -06:00
Akkadius
0d9b6703a6 Rename debug.h to global_define.h, update cmakelists and such 2015-01-19 04:12:09 -06:00
Akkadius
14bac9f8c0 Remove occurrences of _pkt 2015-01-18 03:25:52 -06:00
Akkadius
467b359d0c Moved all EQEmuLogSys:: enum references used in Log.Out to a namespace 'Logs' for shortening of syntax 2015-01-18 02:20:16 -06:00
Akkadius
c025765283 Renamed DoLog to Out as the aggregate logging function for simplicity of use and shortened syntax of Log.Out 2015-01-18 02:00:15 -06:00
Akkadius
1c048cb1d1 Renamed DebugCategory to DoLog as the aggregate logging function for simplicity of use and shortened syntax of Log.DoLog 2015-01-18 01:54:09 -06:00
Akkadius
e691735a2d Consolidate 'LogType' Error logs over to 'LogCategory' 2015-01-18 01:30:25 -06:00
Akkadius
7dbde36b03 Rename reference logger to Log 2015-01-18 00:41:18 -06:00
Akkadius
58d0b86a67 Consolidate EQEmuLogsys::Debug General calls into DebugCategory 2015-01-18 00:00:03 -06:00
Akkadius
d45ed9befa Consolidate EQEmuLogsys::Debug calls into DebugCategory 2015-01-17 23:59:06 -06:00
Akkadius
5b41bdeec6 port mlog 'CLIENT__TRADING' category to new log system 2015-01-17 02:30:58 -06:00
Akkadius
132fbbb0c6 Rename LogDebugType to DebugCategory 2015-01-16 03:09:02 -06:00
Akkadius
3390164aea Convert 'TRADING' debugging _log to logger.LogDebugType 2015-01-12 22:51:35 -06:00
Akkadius
7e7c59967c _log error convert to logger.Log(EQEmuLogSys::Error 2015-01-10 19:05:46 -06:00
Akkadius
b2a1597e73 More _log Client replacements 2015-01-10 18:52:27 -06:00
Akkadius
b76e179d75 Fix spacing 2015-01-10 15:47:36 -06:00
Akkadius
6844645dfb Replace LogFile->write(EQEmuLog::Error, with logger.logevents(EQEmuLogSys::Error 2015-01-10 15:44:35 -06:00
Akkadius
dadae1a71f Replaced Debug messages: LogFile->write with logger.LogDebug 2015-01-10 15:26:38 -06:00
Akkadius
be381b4e56 Renamed EQEMuLog class to EQEmuLog 2015-01-08 19:46:28 -06:00
Uleat
34ab3e10f5 Added some nullptr checks for ItemInst* in a few places (tradeskills.cpp - particularly augments - needs a better review) 2014-12-23 10:14:45 -05:00
Akkadius
a9226c00d8 trading.cpp header include cleanup 2014-12-15 18:59:21 -06:00
Trevius
200027bf89 (RoF+) Implemented the 6th Augment Slot for Items. 
Player Corpses now saved attuned settings for Items.
Renamed IsInstNoDrop() and SetInstNoDrop() to IsAttuned() and SetAttuned() respectively.
 2014-12-15 17:55:23 -06:00
Michael Cook (mackal)
be52d413db Fix bazaar welcome message 2014-10-01 02:11:38 -04:00
Michael Cook (mackal)
2497c719ee Rename Name variable in SendBazaarResults to temp_buffer fixes #253 2014-09-26 12:43:34 -04:00
Alex
225929d937 Merge pull request #240 from addtheice/RunQueryToDatabaseQuery_zone_trading 
Run query to database query zone trading
 2014-09-25 17:26:48 -07:00