1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-27 14:57:44 +00:00
Commit graph

40 commits

Author SHA1 Message Date
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
Adam
bf404f7371 restructure script folder hierachy to remove unnecessary build targets 2018-02-08 23:28:52 +11: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
c5692bbe05 Style fix 2018-02-06 00:03:08 +01:00
Mordred
78606873ae Basic director handling for instances, just the bare minimum so far 2018-02-06 00:01:23 +01:00
Mordred
7a75b40ce6 Added events to zone for inheritance handling 2018-02-04 23:35:16 +01:00
Mordred
53b499de23 Minor cleanup of InstanceContent class 2018-01-29 19:41:41 +01:00
Adam
0d0db3b41c correctly remove InstanceContent zones 2018-01-29 20:40:32 +11:00
Adam
56c6b38966 createInstanceContent and some minor refactoring 2018-01-29 19:40:27 +11:00
Adam
2ad9b0efaa remove isPrivate param from constructors 2018-01-29 18:10:11 +11: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
137cc944b3 Begin of InstanceContent implementation 2018-01-28 13:49:51 +01:00