mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-20 17:37:44 +00:00
Code Activity
1505 commits 10 branches 14 tags 26 MiB
Commit graph

163 commits

Author SHA1 Message Date
NotAdam
84c5191377 correctly update items and select slot 2018-08-25 00:37:21 +10:00
NotAdam
1b7d11bb43 addItem is way less retarded now, stacks are automagically filled first 2018-08-25 00:15:26 +10:00
NotAdam
3396645e3c formatting 2018-08-23 23:32:44 +10:00
NotAdam
0583459ed2 fix some compile warnings 2018-08-23 23:19:25 +10:00
NotAdam
f8ee2a73e1 missed a ! during refactoring, oops 2018-08-12 23:04:23 +10:00
NotAdam
347ec83ff3 additem returns an itemptr, handin item container 2018-08-12 22:53:21 +10:00
NotAdam
0a0dcf59ae fix item splitting 2018-08-12 22:30:18 +10:00
Mordred Admin
56e65f6e47 Style fixes 2018-07-27 08:10:55 +02:00
Mordred
d80753a657 Merge remote-tracking branch 'origin/inventory_rework' into develop 2018-07-26 23:43:27 +02:00
Mordred
42bf23e7dc Inventory Overhaul wrapup 2018-07-26 23:40:46 +02:00
NotAdam
e114e9dab9 the last commit was shit, now it's done properly 2018-07-26 23:37:12 +10:00
NotAdam
b199036f5a improve behaviour for creating items with correct max stack sizes 2018-07-26 23:29:58 +10:00
NotAdam
f702d37bc9 currency and crystal are now multistorage containers 2018-07-26 23:21:57 +10:00
NotAdam
61280baad5 fix loading of currency/crystal items 2018-07-26 23:12:02 +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 Admin
1f5a890324 Finished removing old inventory class and moving stuff into player 2018-07-25 09:48:54 +02:00
Mordred
b85c1c244e Not compilable atm, still moving stuff around 2018-07-24 23:58:08 +02:00
NotAdam
1b7821ca1f gilshops now work using the proper packet 2018-07-23 00:05:44 +10:00
NotAdam
8c870d2f5d somewhat working gilshops 2018-07-22 23:20:22 +10:00
NotAdam
e3539fda75 extremely broken gilshop implementation 2018-07-22 22:11:03 +10:00
NotAdam
778de8f154 replace old inline generation of effects packet with a wrapper 2018-07-21 23:32:10 +10:00
NotAdam
f24bfaf74c fix builds with new effect packet 2018-07-21 15:54:37 +10:00
Mordred
6579a5d841 First step of inventory cleanup, moving defs to common 2018-07-20 22:39:10 +02:00
Maru
3032d9dc31 InitUI pose def + set val; 2018-07-14 19:32:50 -03:00
Mordred
b5bee7cfcb fixes #122 - Searchmessages wont be overwritten anymore 2018-07-12 20:01:38 +02:00
NotAdam
0305777e38 fix emotes which require a weapon to be unholstered 2018-07-12 20:42:28 +10:00
Mordred
d09cdb15af Groundwork for pose, still needs to be added to spawn / initui 2018-07-11 23:52:24 +02:00
NotAdam
0b88f63aa9 persist emotes now persist through logout/login 2018-07-11 18:07:48 +10:00
Tahir Akhlaq
cf184bda51 changed player.setQuestBitFlag functions to allow unsetting the bit 2018-07-09 21:53:23 +01:00
Mordred
533ba50447 #329 Fixed relogging while persistent emote is on ( restting state to idle ) 2018-07-09 22:34:56 +02:00
Mordred
e7e8977d5b Persistent emotes now show properly to other players on spawn 2018-07-09 21:48:42 +02:00
Maru
a52b6803fd Emote stuff, launcher; 
Please don't look

Emote stuff;
 2018-07-09 01:29:16 -03:00
Mordred
e9891a35c0 Emotes can now be interrupted, getting in and out of persistant emotes including /sit should work fine, too #329 2018-07-08 23:44:37 +02:00
Mordred
58efdbb519 emotes with motion only added #329 2018-07-08 23:25:27 +02:00
NotAdam
ae895ccfc0 Merge remote-tracking branch 'upstream/develop' into develop 2018-07-08 19:45:37 +10:00
Mordred
69a98f58df Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2018-07-08 00:43:08 +02:00
Mordred
406b69b88d Walking displays correctly 2018-07-08 00:43:03 +02:00
goaaats
02244211c4 Correctly initialize m_targetId in Chara 2018-07-07 14:06:10 +02:00
NotAdam
25b6359736 fix searchinfo update, add searchinfo ipc struct 2018-07-07 16:50:11 +10:00
Mordred
814d9e995c Some movement improvements, still not perfect.. baby steps... 2018-07-07 00:10:16 +02:00
NotAdam
3d09b3efc0 unlockAction now takes u16 param, unlockAction debug command added 2018-07-04 19:28:54 +10: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
NotAdam
f693fa0a2f segment header types, send inrange packets and override target id 2018-07-03 20:04:12 +10: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
Mordred Admin
8e6cdf0eda Removed old GamePacket 2018-07-03 09:20:09 +02:00
Mordred
30b08d5817 More packet conversion for lobby and zone 2018-07-03 00:01:26 +02:00
Mordred
70425780d5 Merge pull request #287 from AcedArmy/actor_rewrite 
Fixed making new zones and done some more gm stuff
 2018-07-02 11:34:47 +02:00
Biscuit Boy
27cfa2f27f change isActingAsGm const location and add const to getOnlineStatus 2018-07-02 07:31:23 +10:00