181 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
21ce5c6daa Merge plus some work on fixing stacking for merchants. 2015-03-15 14:02:13 -07:00
KimLS
00af95502e Wip merchant stuff, summoning should work now. 2015-03-06 15:53:15 -08:00
Uleat
fe294e60b5 Fix for 'Invalid Slot ID' messages, item loss during corpse looting, and possible item loss during LDoN/Adventure merchant purchases 2015-03-03 04:08:52 -05:00
KimLS
abc5ddc5f8 Inventory Swap implemented and passes tests, though still want to verify it a bit more also does not yet save but that's next. Fixed a crash in memory buffer too. 2015-03-02 00:44:28 -08:00
KimLS
8bce7893ed BulkSendItems now works on RoF2 2015-02-23 17:33:21 -08:00
JJ
318a664b09 No "sigs". [skip ci] 2015-02-23 19:57:47 -05:00
KimLS
f511862004 Working working working on getting the basics setup 2015-02-21 15:21:45 -08:00
KimLS
a90e9cf4c6 Refactoring 2015-02-20 20:15:58 -08:00
KimLS
a5274b9b6e InventoryOld in client has been unhooked from loading/saving 2015-02-18 20:29:58 -08: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
KimLS
9daf572ea7 Fix for no factions in database crashing the server and shared memory 2015-02-10 11:53:39 -08:00
Michael Cook (mackal)
b590eb2dc4 Send item recast timestamps picking up ground spawns 2015-01-31 20:54:56 -05:00
Michael Cook (mackal)
5be1bd2ffb Make items with long reuse timers show the timer after zone
This adds a new table to store the timers in. This may seem
odd but the timers are associated with the player, not the
item, they're just included in the item header in the packet

Currently trading still needs to be handled
2015-01-31 17:53:50 -05:00
Michael Cook (mackal)
eb7d77bcac Shared Bank bug fix? 2015-01-31 03:48:59 -05:00
Michael Cook (mackal)
0bdbc5f5c9 More clang-formatting 2015-01-31 01:22:40 -05:00
Michael Cook (mackal)
0f1b504ed6 Some clang-formatting 2015-01-31 00:00:02 -05:00
Akkadius
3d74035e24 Merge remote-tracking branch 'remotes/origin/master' into logging_changes
Conflicts:
	zone/command.cpp
	zone/command.h
	zone/inventory.cpp
2015-01-21 16:40:46 -06:00
Akkadius
c86fc62132 Fix SetBotInspectMesssage from error message removal 2015-01-20 01:46:50 -06:00
Akkadius
590fa78539 Remove Duplicative MySQL Error: Error in SetBotInspectMessage query ' 2015-01-20 01:42:04 -06:00
Akkadius
abab487d7e Remove Duplicative MySQL Error: Error in GetBotInspectMessage query ' 2015-01-20 01:42:02 -06:00
Akkadius
a2514c9d64 Remove Duplicative MySQL Error: Error in GetCommands query ' 2015-01-20 01:41:58 -06:00
Akkadius
5f34f7e1a2 Remove Duplicative MySQL Error: Error in GetBook query ' 2015-01-20 01:41:54 -06:00
Akkadius
f15221784c Remove Duplicative MySQL Error: Error in SetSharedPlatinum query ' 2015-01-20 01:41:47 -06:00
Akkadius
487c53794c Remove Duplicative MySQL Error: Error in GetSharedPlatinum query ' 2015-01-20 01:41:44 -06:00
Akkadius
7a90d52e62 Remove Duplicative MySQL Error: Error in SetGMSpeed query ' 2015-01-20 01:41:34 -06:00
Akkadius
ef312b7b48 Remove Duplicative MySQL Error: 2015-01-20 01:38:43 -06:00
Akkadius
e271049fad Remove Duplicative MySQL Error: Error in CreateLauncher query: %s 2015-01-20 01:37:57 -06:00
Akkadius
d608b5afd6 Remove Duplicative MySQL Error: Error getting loot drop info from database: %s, %s 2015-01-19 05:26:18 -06:00
Akkadius
5930510274 Remove Duplicative MySQL Error: Error getting loot table info from database: %s, %s 2015-01-19 05:26:17 -06:00
Akkadius
f4e74705cf Remove Duplicative MySQL Error: Error getting loot table info from database: %s, %s 2015-01-19 05:26:15 -06:00
Akkadius
9ad299fa68 Remove Duplicative MySQL Error: Error getting loot table info from database: %s, %s 2015-01-19 05:26:13 -06:00
Akkadius
1e30a75cdc Remove Duplicative MySQL Error: Error in LoadBaseData query '%s' %s 2015-01-19 05:26:10 -06:00
Akkadius
b603344ecd Remove Duplicative MySQL Error: Error in GetMaxBaseDataLevel query '%s' %s 2015-01-19 05:26:09 -06:00
Akkadius
27d16a0a3e Remove Duplicative MySQL Error: Error in LoadSpells query '%s' %s 2015-01-19 05:26:07 -06:00
Akkadius
626aa140da Remove Duplicative MySQL Error: Error in GetMaxSpellID query '%s' %s 2015-01-19 05:26:06 -06:00
Akkadius
b8f7d88219 Remove Duplicative MySQL Error: Error in LoadDamageShieldTypes: %s %s 2015-01-19 05:26:05 -06:00
Akkadius
f43211afad Remove Duplicative MySQL Error: Error getting npc faction info from database: %s, %s 2015-01-19 05:26:03 -06:00
Akkadius
beeba6c8be Remove Duplicative MySQL Error: Error getting npc faction info from database: %s, %s 2015-01-19 05:26:02 -06:00
Akkadius
d4c0947280 Remove Duplicative MySQL Error: LoadItems '%s', %s 2015-01-19 05:26:00 -06:00
Akkadius
9d1da53d97 Remove Duplicative MySQL Error: Error in GetItemsCount '%s': '%s' 2015-01-19 05:25:58 -06:00
Akkadius
a128c74090 Remove Duplicative MySQL Error: GetInventory query '%s' %s 2015-01-19 05:25:55 -06:00
Akkadius
756e90b683 Remove Duplicative MySQL Error: GetInventory query '%s' %s 2015-01-19 05:25:52 -06:00
Akkadius
912de7704d Remove Duplicative MySQL Error: DeleteSharedBankSlot, bags query '%s': %s 2015-01-19 05:25:43 -06:00
Akkadius
51fc8d61cc Remove Duplicative MySQL Error: DeleteSharedBankSlot query '%s': %s 2015-01-19 05:25:36 -06:00
Akkadius
4c804e8515 Remove Duplicative MySQL Error: DeleteInventorySlot, bags query '%s': %s 2015-01-19 05:25:31 -06:00
Akkadius
3040a8b1a1 Remove Duplicative MySQL Error: DeleteInventorySlot query '%s': %s 2015-01-19 05:25:25 -06:00
Akkadius
807dd5198c Remove Duplicative MySQL Error: UpdateSharedBankSlot query '%s': %s 2015-01-19 05:25:20 -06:00
Akkadius
4d15ddfc8a Remove Duplicative MySQL Error: UpdateInventorySlot query '%s': %s 2015-01-19 05:25:15 -06:00