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

1422 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
71abe6b69e what are if statements, how do they work 2018-03-13 21:59:52 +11:00
Adam
f74c96a5d4 reorganise event defs, make instance cutscene playback generic 2018-03-13 20:06:34 +11:00
Adam
aa1c76602b fix some retarded clion refactoring 2018-03-13 19:26:28 +11:00
Adam
6c1b0f789e create zone cmd 2018-03-13 19:25:50 +11:00
Adam
bdd438e589 proper event plays upon entering sastasha 2018-03-13 17:57:52 +11:00
Mordred
c501a62916 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
d437af7a1e Removed scriptloaders 2018-03-11 00:56:20 +01:00
Mordred
46cafa2934 Merge pull request #270 from NotAdam/actor_rewrite 
remove scriptloader.cpp files from tree and ignore them, probably
 2018-03-09 21:47:40 +01:00
Mordred
a186c0681c Merge pull request #271 from Minoost/develop-qte_cmd 
Add a qte event command
 2018-03-09 17:02:51 +01:00
Adam
0f86b5f045 Add a qte event command 2018-03-10 00:06:44 +09:00
Adam
3f33f460ed what is git, how does it work 2018-03-09 23:54:57 +11:00
Adam
43de9533ec remove scriptloader from tree and update gitignore 2018-03-09 23:54:11 +11:00
Mordred Admin
225a064e55 Additional assert in framwork 2018-03-09 11:16:36 +01:00
Mordred Admin
9a93c25245 It builds! 2018-03-09 10:36:07 +01:00
Mordred Admin
f825eb5bdb More framework changes, linker still unhappy 2018-03-09 10:19:38 +01:00
Mordred
24399e31e4 WiP - implementing new framework 2018-03-09 00:06:44 +01:00
Mordred
7771b7c8e6 desperate try to figure out the appveyor issue 2018-03-07 17:41:16 +01:00
Mordred Admin
6fdf452895 updated submodule 2018-03-07 15:05:46 +01:00
Mordred
5860508590 Merge pull request #268 from itsMaru/actor_rewrite 
const correct
 2018-03-07 13:40:29 +01:00
Maru
59a9a44db8 Const correct 2018-03-07 07:49:20 -03:00
Mordred Admin
69ff6404d4 Oversight... 2018-03-07 09:22:08 +01:00
Mordred Admin
8e070adf75 Cleanup of script CMakeLists 2018-03-07 09:19:40 +01:00
Mordred Admin
ee836e5548 Disableing cotire for zone 2018-03-07 09:01:53 +01:00
Mordred Admin
01cd6e17ec forgot to remove old files 2018-03-07 08:48:16 +01:00
Mordred Admin
638ba45dd9 Moved scripts out of server_zone scope 2018-03-07 08:14:42 +01:00
Mordred
fd7489d5c0 Update submodules 2018-03-06 23:38:21 +01:00
Mordred
7ea3bc2523 Build fix... well ish... 2018-03-06 23:20:07 +01:00
Mordred Admin
a5008e744c Merge branch 'actor_rewrite' of https://github.com/SapphireMordred/Sapphire into actor_rewrite 2018-03-06 22:46:07 +01:00
Mordred Admin
2062bb14a5 Updated submodules 2018-03-06 22:45:46 +01:00
Mordred
a2e27ddb9a Merge branch 'actor_rewrite' of https://github.com/SapphireMordred/Sapphire into actor_rewrite 2018-03-06 22:34:12 +01:00
Mordred
552179c4e4 Merge remote-tracking branch 'origin/social_implementation' into actor_rewrite 2018-03-06 22:33:41 +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
Mordred
2b3c41c1f2 Merge pull request #266 from NotAdam/actor_rewrite 
minor instances fixes
 2018-03-06 08:19:01 +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
0adb47e4a5 remove double eventStart call 2018-03-06 13:34:02 +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
b3497ee06f Merge pull request #265 from NotAdam/actor_rewrite 
fix onEnterTerritory events, eventstart handling for instances
 2018-03-05 21:07:46 +01:00
Mordred
edd843fdd0 formatting 2018-03-05 14:35:03 +01:00
Mordred
38f018240d formatting 2018-03-05 14:34:34 +01:00
Adam
33429a0284 better handling of EventStart IPC for instances 2018-03-05 22:40:11 +11:00
Adam
0aae810e16 fix onEnterTerritory events 2018-03-05 22:10:14 +11:00
Adam
4496f8c144 add zone opcode 2018-03-05 17:01:37 +11:00
Mordred
3be616eddb Fixed boundByDuty state so duty menu works in instance 2018-03-04 17:53:40 +01:00
Mordred
8963f560c8 Merge pull request #264 from NotAdam/actor_rewrite 
eobj rotation ipc fix & new instance scripts
 2018-03-04 10:25:52 +01:00