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

53 commits

Author SHA1 Message Date
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
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
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
Mordred
dbf0ce5284 First step of inventory cleanup, moving defs to common 2018-07-20 22:39:10 +02: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
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
Mordred
5bd6e94a16 Walking displays correctly 2018-07-08 00:43:03 +02: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
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
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
54be80a26b add isActingAsGm in Player 2018-07-01 21:31:49 +10:00
Mordred
671576b861 Packet rework of server_zone 2018-06-28 00:07:07 +02:00
Mordred
522010881d Implemented quest flag getters and setters 2018-05-20 00:33:26 +02:00
Biscuit Boy
51a1c020a1 Fixed Shitty commit mistake 2018-04-19 22:27:57 +10:00
Biscuit Boy
22abaf9d23 Added a whole lot of GM Stuff 
Added Icons, Added Invis, Added Chat Types for what we have now
 2018-04-18 21:00:20 +10:00
Adam
dd8ed62430 eventPlay -> playScene, added playSceneChain 2018-03-20 22:08:25 +11:00
Adam
093f23c5c4 bgm is set correctly for instances 2018-03-15 20:48:35 +11:00
Mordred
855ae3e961 Instance join cutscene will no longer mess up the player, removed wrong field from event start, cotire server_zone only when using linux 2018-03-12 23:51:17 +01:00
Mordred Admin
b91e711834 Cleanup of cmake files 2018-03-06 22:22:19 +01:00
Mordred
22402651e9 Basic event play for directors, still buggy. Also some small fixes all around 2018-03-05 23:01:55 +01:00
Adam
0de9fb05cf better handling of EventStart IPC for instances 2018-03-05 22:40:11 +11:00
Adam
8fd1a2e3df fix onEnterTerritory events 2018-03-05 22:10:14 +11:00
Adam
810d71f262 move eobj/player spawnindex generation to common manager 2018-03-02 02:55:02 +11:00
Adam
d024f0a396 fix eobj out of bounds allocation client crash 2018-02-28 23:53:20 +11:00
Mordred
67c2cb7971 Improved timing on instance starting 2018-02-24 23:53:32 +01:00
Mordred
f9722b5e2e EventObjects are not properly spawned and initialized 2018-02-23 23:47:21 +01:00
Mordred
6e5737f401 Actors are now used as base for any entity 2018-02-22 15:31:10 +01:00
Mordred
f12c431173 Removed battlenpc for cleanup work 2018-02-21 12:48:27 +01:00
Mordred
9a4e7533c6 Renaming classes in preperation of actor rework 2018-02-20 22:46:44 +01:00
Mordred
883916aa48 More cleanup of actionhandler 2018-02-18 01:50:20 +01:00
Mordred
1f37416202 Actionhandler cleaned up a bit 2018-02-17 01:20:40 +01:00
Mordred
b8cbdf3fa5 removed all unused state flags, mapped more client actions 2018-02-15 23:50:28 +01:00
Mordred
1f415a0d05 Majorly refactored usage of shared_ptr also added GameObject into Actor inheritance chain 2018-02-10 01:21:31 +01:00
Mordred
4e1c82c2be More preparational director logic, state inside can be modified with !instance <instanceId> <varIdx> <value> 2018-02-07 00:00:48 +01:00
Mordred
a05ef7bb1d updaing field sizes, make sure to run update.sql 2018-02-03 02:04:00 +01:00
Adam
20ee459e26 instance zoning and returning implemented 
instancecontent uses instancecontent class instead of zone too
 2018-01-29 13:05:33 +11:00
Mordred
ad88a058c2 Cleaning up zoneing code 2018-01-28 22:36:43 +01:00
Adam
ea47861f33 base implementation of instance creation 2018-01-28 23:53:58 +11:00
Mordred
695fea7812 Merge branch 'master' into event_rewrite 2018-01-28 00:30:16 +01:00
Mordred
2d8ea346a3 Beginning of splitting eventhandlers, pulling logic out of scriptmanager 2018-01-14 23:54:26 +01:00
Mordred
bafc511db2 Another approach at event improvements 2018-01-09 23:50:54 +01:00