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

211 commits

Author SHA1 Message Date
NotAdam
629c219b39 formatting 2018-08-23 23:32:44 +10:00
NotAdam
44fa5e545d fix some compile warnings 2018-08-23 23:19:25 +10:00
NotAdam
05585ac24b missed a ! during refactoring, oops 2018-08-12 23:04:23 +10:00
NotAdam
8a2b472554 additem returns an itemptr, handin item container 2018-08-12 22:53:21 +10:00
NotAdam
ade63f9170 fix item splitting 2018-08-12 22:30:18 +10:00
Mordred Admin
3650102807 Style fixes 2018-07-27 08:10:55 +02:00
Mordred
f5aba946be Merge remote-tracking branch 'origin/inventory_rework' into develop 2018-07-26 23:43:27 +02:00
Mordred
2f814ca60e Inventory Overhaul wrapup 2018-07-26 23:40:46 +02:00
NotAdam
460d4c79b7 the last commit was shit, now it's done properly 2018-07-26 23:37:12 +10:00
NotAdam
47f86e13c7 improve behaviour for creating items with correct max stack sizes 2018-07-26 23:29:58 +10:00
NotAdam
4385923129 currency and crystal are now multistorage containers 2018-07-26 23:21:57 +10:00
NotAdam
791f934a2d fix loading of currency/crystal items 2018-07-26 23:12:02 +10:00
Mordred Admin
783bd655a8 Inventory code cleanup number 2, packetWrapper for slot update 2018-07-26 14:09:09 +02:00
Mordred Admin
260092f542 Storing container configuration in container object 2018-07-25 14:03:43 +02:00
Mordred Admin
e11f1b3f20 Finished removing old inventory class and moving stuff into player 2018-07-25 09:48:54 +02:00
Mordred
8555f3060f Not compilable atm, still moving stuff around 2018-07-24 23:58:08 +02:00
NotAdam
5ac4573bd3 gilshops now work using the proper packet 2018-07-23 00:05:44 +10:00
NotAdam
9ab7d5c68a somewhat working gilshops 2018-07-22 23:20:22 +10:00
NotAdam
18a1ab79d6 extremely broken gilshop implementation 2018-07-22 22:11:03 +10:00
NotAdam
c84beee30a replace old inline generation of effects packet with a wrapper 2018-07-21 23:32:10 +10:00
NotAdam
9d7896043c fix builds with new effect packet 2018-07-21 15:54:37 +10:00
Mordred
dbf0ce5284 First step of inventory cleanup, moving defs to common 2018-07-20 22:39:10 +02:00
Maru
b15cd4948a InitUI pose def + set val; 2018-07-14 19:32:50 -03:00
Mordred
4308757379 fixes #122 - Searchmessages wont be overwritten anymore 2018-07-12 20:01:38 +02:00
NotAdam
5eb846118d fix emotes which require a weapon to be unholstered 2018-07-12 20:42:28 +10:00
Mordred
c12c0b1d99 Groundwork for pose, still needs to be added to spawn / initui 2018-07-11 23:52:24 +02:00
NotAdam
467bcf4163 persist emotes now persist through logout/login 2018-07-11 18:07:48 +10:00
Tahir Akhlaq
ca5db2cae3 changed player.setQuestBitFlag functions to allow unsetting the bit 2018-07-09 21:53:23 +01:00
Mordred
3dcb7c3629 #329 Fixed relogging while persistent emote is on ( restting state to idle ) 2018-07-09 22:34:56 +02:00
Mordred
afbb247e1c Persistent emotes now show properly to other players on spawn 2018-07-09 21:48:42 +02:00
Maru
542541b1f6 Emote stuff, launcher; 
Please don't look

Emote stuff;
 2018-07-09 01:29:16 -03:00
Mordred
f6d387c161 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
a5191c2b4f emotes with motion only added #329 2018-07-08 23:25:27 +02:00
NotAdam
7b1281fba4 Merge remote-tracking branch 'upstream/develop' into develop 2018-07-08 19:45:37 +10:00
Mordred
bc01b0ccb1 Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2018-07-08 00:43:08 +02:00
Mordred
5bd6e94a16 Walking displays correctly 2018-07-08 00:43:03 +02:00
goaaats
9292ee94f5 Correctly initialize m_targetId in Chara 2018-07-07 14:06:10 +02:00
NotAdam
0fa55e3d9a fix searchinfo update, add searchinfo ipc struct 2018-07-07 16:50:11 +10:00
Mordred
ac9845f827 Some movement improvements, still not perfect.. baby steps... 2018-07-07 00:10:16 +02:00
NotAdam
92cfe1e2a5 unlockAction now takes u16 param, unlockAction debug command added 2018-07-04 19:28:54 +10:00
Mordred Admin
a3d5dc8c26 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
b28a4e6776
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
0ae41974b2 segment header types, send inrange packets and override target id 2018-07-03 20:04:12 +10:00
Mordred Admin
b2aeed0f8a 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
50ba02ed27 Removed old GamePacket 2018-07-03 09:20:09 +02:00
Mordred
b784c9e311 More packet conversion for lobby and zone 2018-07-03 00:01:26 +02:00
Mordred
d4133f19d9
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
062566f848 change isActingAsGm const location and add const to getOnlineStatus 2018-07-02 07:31:23 +10:00
Biscuit Boy
667ab110b9 Update isActingAsGm so we don't call getOnlineStatus 3 times 2018-07-01 21:43:50 +10:00
Biscuit Boy
54be80a26b add isActingAsGm in Player 2018-07-01 21:31:49 +10:00