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

61 commits

Author SHA1 Message Date
NotAdam
daf8fbfdb6 more boost gone & remove duplicated watchdog lib 2018-10-25 13:38:32 +11:00
Mordred
f7d2bb813a Fixed !instance cr, it now takes contentfindercondition ids as input though 2018-09-19 23:04:23 +02:00
Mordred
89a9b16555 Code style adjusted for 2 spaces and various other small things, checkout CodeStyle.xml for details 2018-08-29 21:40:59 +02:00
Mordred
7f7588ef1f Simplified actorcontrol creation 2018-08-28 19:05:52 +02:00
Mordred
d96c86853b Changed director trigger/function names 2018-07-17 22:39:04 +02: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
671576b861 Packet rework of server_zone 2018-06-28 00:07:07 +02:00
goaaats
3b9811ef17 Streamline ActorControlTypes, refactor ActionHandler/ClientTrigger to ClientActorControl 2018-06-23 21:38:04 +02:00
Mordred
2d4d6c6579 Fixed an issue where players were removed from the wrong zone 2018-03-17 11:36:56 +01:00
Adam
15dd60534c some more initui figured out 2018-03-17 01:25:44 +11:00
Adam
96bf9d506a don't start instance until all bound players are present 2018-03-16 19:43:36 +11:00
Adam
00771da156 instance player binding done, minor refactoring 2018-03-16 16:56:43 +11:00
Mordred
efa0a81d9e Basics of instance binding system 2018-03-15 23:37:21 +01:00
Mordred
fa198efbb5
style fix 2018-03-15 12:24:34 +01:00
Mino
1e19a7b0ae Implement director wide bgm 
Warning: Not tested
 2018-03-15 19:57:35 +09:00
Adam
093f23c5c4 bgm is set correctly for instances 2018-03-15 20:48:35 +11:00
Adam
3f0cdfac73 style points and packet def 2018-03-15 18:06:12 +11:00
Adam
2456902467 its magic 2018-03-15 02:49:35 +11:00
Adam
f6a4edc6de magic numbers mason 2018-03-15 02:36:16 +11:00
Adam
3baa7efa30 reorganise event defs, make instance cutscene playback generic 2018-03-13 20:06:34 +11:00
Adam
28ee0fd182 proper event plays upon entering sastasha 2018-03-13 17:57:52 +11:00
Mino
a33894f70a Add a qte event command 2018-03-10 00:06:44 +09:00
Mordred Admin
250b1aef79 More framework changes, linker still unhappy 2018-03-09 10:19:38 +01:00
Mordred Admin
6ed1b274a3 Merge branch 'actor_rewrite' of https://github.com/SapphireMordred/Sapphire into actor_rewrite 2018-03-06 22:24:25 +01:00
Mordred Admin
b91e711834 Cleanup of cmake files 2018-03-06 22:22:19 +01:00
Adam
32e10ec6e8 make mordred happy 2018-03-06 18:00:57 +11:00
Adam
df4ee95cf5 if player already zoned into instance, don't teleport them back to start on zonein 2018-03-06 14:26:35 +11:00
Adam
39e379747d auto hide entrance circle 2018-03-06 13:33:10 +11:00
Mordred
ec0335b64a Merge remote-tracking branch 'origin/master' into actor_rewrite 2018-03-06 00:10:36 +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
Mordred
df29f674df
formatting 2018-03-05 14:34:34 +01:00
Adam
8fd1a2e3df fix onEnterTerritory events 2018-03-05 22:10:14 +11:00
Maru
a61aef2c1e Framework; Refactors, styling, other minor stuff; 2018-03-02 07:22:25 -03:00
Adam
d024f0a396 fix eobj out of bounds allocation client crash 2018-02-28 23:53:20 +11:00
Adam
416366c144 director sequence/branch setters & debug command 2018-02-28 22:25:18 +11:00
Mordred Admin
083a3aa239 Rearranged includes for potential speed increases 2018-02-28 10:26:03 +01:00
Adam
6d6c3c0f90 eobj state cmd and some ontalk fixes 2018-02-27 23:05:42 +11:00
Adam
4afc9e91b7 eobj interaction callbacks, eobj spawning fixed, sastasha instance eobjs 2018-02-27 02:13:01 +11:00
Adam
8a3ed93fbc redirect ontalk events inside instances to instancecontent ptr 2018-02-25 17:23:52 +11:00
Mordred
67c2cb7971 Improved timing on instance starting 2018-02-24 23:53:32 +01:00
Mordred
acee4d4b51 EObjects are now given a name and can be retrieved using it 2018-02-24 00:07:07 +01:00
Mordred
f9722b5e2e EventObjects are not properly spawned and initialized 2018-02-23 23:47:21 +01:00
Adam
31a9ed45a6 move instance objects to zone from instancecontent 2018-02-10 21:53:16 +11:00
Adam
3d1555209e rename objectcontrol -> objectspawn 2018-02-10 21:51:02 +11:00
Adam
727207ec08 Merge remote-tracking branch 'upstream/develop' into instancescripting 2018-02-10 14:05:12 +11:00
Adam
2f6bc9e1eb instane obj spawning 2018-02-10 14:03:59 +11:00
Mordred
1f415a0d05 Majorly refactored usage of shared_ptr also added GameObject into Actor inheritance chain 2018-02-10 01:21:31 +01:00
Adam
01e22b679d instance objects, gameobj implementation 2018-02-10 02:47:32 +11:00
Adam
d3bdd8856a instance scripting stuff 2018-02-09 02:34:43 +11:00
Adam
1e7c2adefb fix instance expire time 2018-02-09 00:04:46 +11:00