mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-07 03:07:45 +00:00
Code Activity
1583 commits 10 branches 14 tags 26 MiB
Commit graph

38 commits

Author SHA1 Message Date
Mordred Admin
238ea28d75 Merge develop into bnpc 2018-09-17 14:04:40 +02:00
Mordred
9624d08b4c Working towards getting bnpcs back in the game 2018-09-09 23:56:22 +02:00
NotAdam
72ea5d689b send stain/durability 2018-09-01 00:00:19 +10:00
NotAdam
81bfd18b77 sql cleanup/improvements, add some fields for durability/stain 2018-08-31 23:25:53 +10:00
Mordred
e745bd0329 Code style adjusted for 2 spaces and various other small things, checkout CodeStyle.xml for details 2018-08-29 21:40:59 +02:00
NotAdam
abbff07e77 minor fixes 2018-08-26 18:48:45 +10:00
NotAdam
78ddbb3672 more consistent enum naming 2018-08-25 22:58:13 +10:00
NotAdam
4cab50f77c correctly store items in armory/inventory based on client flag 2018-08-25 22:38:07 +10:00
NotAdam
1b7d11bb43 addItem is way less retarded now, stacks are automagically filled first 2018-08-25 00:15:26 +10:00
NotAdam
347ec83ff3 additem returns an itemptr, handin item container 2018-08-12 22:53:21 +10:00
NotAdam
e114e9dab9 the last commit was shit, now it's done properly 2018-07-26 23:37:12 +10:00
Mordred Admin
cdb30f1f9c Inventory code cleanup number 2, packetWrapper for slot update 2018-07-26 14:09:09 +02:00
Mordred Admin
62494b4b9a Storing container configuration in container object 2018-07-25 14:03:43 +02:00
Mordred
b85c1c244e Not compilable atm, still moving stuff around 2018-07-24 23:58:08 +02:00
Mordred
6579a5d841 First step of inventory cleanup, moving defs to common 2018-07-20 22:39:10 +02:00
Mordred Admin
9d620d160c Merge remote-tracking branch 'origin/develop' into packet_work 
Conflicts:
	src/servers/sapphire_zone/Action/EventAction.cpp
	src/servers/sapphire_zone/Actor/Chara.cpp
	src/servers/sapphire_zone/Actor/EventObject.cpp
	src/servers/sapphire_zone/Actor/Player.cpp
	src/servers/sapphire_zone/Actor/PlayerInventory.cpp
	src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp
	src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
	src/servers/sapphire_zone/Zone/Zone.cpp
 2018-07-03 15:01:13 +02:00
Mordred
57cf959c94 Merge pull request #323 from goaaats/actor_control_redo 
common, zone: Streamline ActorControlTypes, refactor ActionHandler/ClientTrigger to ClientActorControl
 2018-07-03 14:38:57 +02:00
Mordred Admin
c7760a0dc6 Merge remote-tracking branch 'origin/develop' into packet_work 
Conflicts:
	src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
	src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
 2018-07-03 09:32:14 +02:00
NotAdam
200232ceed inventory item creation cleanup 2018-06-30 12:49:34 +10:00
NotAdam
820f755f17 fix added items having incorrect data 2018-06-30 12:45:41 +10:00
NotAdam
36ba7998de create larger stacks correctly, fix indent 2018-06-30 11:53:45 +10:00
Mordred
e9c9eaa53a Packet rework of server_zone 2018-06-28 00:07:07 +02:00
goaaats
f2c2087d7b Streamline ActorControlTypes, refactor ActionHandler/ClientTrigger to ClientActorControl 2018-06-23 21:38:04 +02:00
NotAdam
f3a0a1533d inventoryitemack opcode and some cleanup 2018-06-17 00:39:31 +10:00
NotAdam
31c452559a add silent param to not send item obtain actrl 2018-06-12 23:11:47 +10:00
NotAdam
12dcee8b8a set IS_DELETE flag on discarded/deleted items 2018-06-12 22:57:28 +10:00
NotAdam
3ac70352d1 #31 & #314: Splitting and stacking items in inventory now works 2018-06-12 22:46:05 +10:00
Mordred
86b2a9cded More cleanup yet 2018-06-02 15:52:35 +02:00
Mordred
d34598d295 Some cleanup and buildfix 2018-06-02 13:38:00 +02:00
Mordred
24399e31e4 WiP - implementing new framework 2018-03-09 00:06:44 +01:00
Mordred Admin
c2165e5f33 Cleanup of cmake files 2018-03-06 22:22:19 +01:00
Mordred
0833bdd76c Merge remote-tracking branch 'origin/master' into actor_rewrite 2018-03-06 00:10:36 +01:00
Mordred
3747b89b67 Fixed an inventory bug to to invalid size 2018-03-04 00:12:33 +01:00
Maru
b3318f14a3 Framework; Refactors, styling, other minor stuff; 2018-03-02 07:22:25 -03:00
Mordred Admin
df61b53d1a Cleaned up generated exd stuff 2018-02-14 12:31:47 +01:00
Mordred
2000d5d2f8 Majorly refactored usage of shared_ptr also added GameObject into Actor inheritance chain 2018-02-10 01:21:31 +01:00
goaaats
c0b3d3605b zone, api: Removed old EXD reader 2018-01-31 11:43:22 +01:00
Mordred Admin
2382f72184 #182 - Renamed targets to be less ambigious 2017-12-19 09:27:22 +01:00