1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-25 14:07:46 +00:00
Commit graph

48 commits

Author SHA1 Message Date
Mordred
919abe5162 style fix 2018-03-15 12:24:34 +01:00
Adam
6bb3c4f45c Implement director wide bgm
Warning: Not tested
2018-03-15 19:57:35 +09:00
Adam
108268b107 bgm is set correctly for instances 2018-03-15 20:48:35 +11:00
Adam
f0319081f2 style points and packet def 2018-03-15 18:06:12 +11:00
Adam
8bd3e871d6 its magic 2018-03-15 02:49:35 +11:00
Adam
a9087289fe magic numbers mason 2018-03-15 02:36:16 +11:00
Adam
f74c96a5d4 reorganise event defs, make instance cutscene playback generic 2018-03-13 20:06:34 +11:00
Adam
bdd438e589 proper event plays upon entering sastasha 2018-03-13 17:57:52 +11:00
Adam
0f86b5f045 Add a qte event command 2018-03-10 00:06:44 +09:00
Mordred Admin
f825eb5bdb More framework changes, linker still unhappy 2018-03-09 10:19:38 +01:00
Mordred Admin
28811277a8 Merge branch 'actor_rewrite' of https://github.com/SapphireMordred/Sapphire into actor_rewrite 2018-03-06 22:24:25 +01:00
Mordred Admin
c2165e5f33 Cleanup of cmake files 2018-03-06 22:22:19 +01:00
Adam
4bc06c95ba make mordred happy 2018-03-06 18:00:57 +11:00
Adam
5ae1a99769 if player already zoned into instance, don't teleport them back to start on zonein 2018-03-06 14:26:35 +11:00
Adam
8dd19cf815 auto hide entrance circle 2018-03-06 13:33:10 +11:00
Mordred
0833bdd76c Merge remote-tracking branch 'origin/master' into actor_rewrite 2018-03-06 00:10:36 +01:00
Mordred
37e7c2e51b Basic event play for directors, still buggy. Also some small fixes all around 2018-03-05 23:01:55 +01:00
Mordred
38f018240d formatting 2018-03-05 14:34:34 +01:00
Adam
0aae810e16 fix onEnterTerritory events 2018-03-05 22:10:14 +11:00
Maru
b3318f14a3 Framework; Refactors, styling, other minor stuff; 2018-03-02 07:22:25 -03:00
Adam
439eeaaaf9 fix eobj out of bounds allocation client crash 2018-02-28 23:53:20 +11:00
Adam
841e292e9b director sequence/branch setters & debug command 2018-02-28 22:25:18 +11:00
Mordred Admin
72e8fa36e8 Rearranged includes for potential speed increases 2018-02-28 10:26:03 +01:00
Adam
d4c3250ab0 eobj state cmd and some ontalk fixes 2018-02-27 23:05:42 +11:00
Adam
efd00c719f eobj interaction callbacks, eobj spawning fixed, sastasha instance eobjs 2018-02-27 02:13:01 +11:00
Adam
3cf0a233b1 redirect ontalk events inside instances to instancecontent ptr 2018-02-25 17:23:52 +11:00
Mordred
2ce7d91096 Improved timing on instance starting 2018-02-24 23:53:32 +01:00
Mordred
7bf58b315a EObjects are now given a name and can be retrieved using it 2018-02-24 00:07:07 +01:00
Mordred
0a177c3470 EventObjects are not properly spawned and initialized 2018-02-23 23:47:21 +01:00
Adam
530cf8a37a move instance objects to zone from instancecontent 2018-02-10 21:53:16 +11:00
Adam
d51c5924c5 rename objectcontrol -> objectspawn 2018-02-10 21:51:02 +11:00
Adam
bc5004598d Merge remote-tracking branch 'upstream/develop' into instancescripting 2018-02-10 14:05:12 +11:00
Adam
32f0e30e8e instane obj spawning 2018-02-10 14:03:59 +11:00
Mordred
2000d5d2f8 Majorly refactored usage of shared_ptr also added GameObject into Actor inheritance chain 2018-02-10 01:21:31 +01:00
Adam
0c54d41304 instance objects, gameobj implementation 2018-02-10 02:47:32 +11:00
Adam
61dfd16d7b instance scripting stuff 2018-02-09 02:34:43 +11:00
Adam
bb5c97ed2f fix instance expire time 2018-02-09 00:04:46 +11:00
Adam
6f84e9ef41 restructure script folder hierachy to remove unnecessary build targets 2018-02-08 23:28:52 +11:00
Mordred
0cb304083d More preparational director logic, state inside can be modified with !instance <instanceId> <varIdx> <value> 2018-02-07 00:00:48 +01:00
Mordred
59da08be28 Style fix 2018-02-06 00:03:08 +01:00
Mordred
0d75ba0096 Basic director handling for instances, just the bare minimum so far 2018-02-06 00:01:23 +01:00
Mordred
6ed0baf91f Added events to zone for inheritance handling 2018-02-04 23:35:16 +01:00
Mordred
8afe739aaf Minor cleanup of InstanceContent class 2018-01-29 19:41:41 +01:00
Adam
95bf84ca6d correctly remove InstanceContent zones 2018-01-29 20:40:32 +11:00
Adam
e9d0e5cbb8 createInstanceContent and some minor refactoring 2018-01-29 19:40:27 +11:00
Adam
36d64630d3 remove isPrivate param from constructors 2018-01-29 18:10:11 +11:00
Adam
7de0885b54 instance zoning and returning implemented
instancecontent uses instancecontent class instead of zone too
2018-01-29 13:05:33 +11:00
Mordred
d9da17cd35 Begin of InstanceContent implementation 2018-01-28 13:49:51 +01:00