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

1479 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Mordred
deb46e9a96
Merge pull request #273 from NotAdam/actor_rewrite 
proper event plays upon entering sastasha
 2018-03-14 22:35:45 +01:00
Adam
56fe72e58a fix indent: episode 2 2018-03-15 03:31:46 +11:00
Adam
b542af8407 make leave instance button work 2018-03-15 03:22:59 +11:00
Adam
378dad0008 fix indent and leave button opcode def 2018-03-15 03:13:20 +11:00
Adam
00a83a17df packet doc 2018-03-15 03:05:49 +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
22faac5d06 what are if statements, how do they work 2018-03-13 21:59:52 +11:00
Adam
3baa7efa30 reorganise event defs, make instance cutscene playback generic 2018-03-13 20:06:34 +11:00
Adam
4ca37d142e fix some retarded clion refactoring 2018-03-13 19:26:28 +11:00
Adam
ddd52bcbab create zone cmd 2018-03-13 19:25:50 +11:00
Adam
28ee0fd182 proper event plays upon entering sastasha 2018-03-13 17:57:52 +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
113273e571 Removed scriptloaders 2018-03-11 00:56:20 +01:00
Mordred
592a16e5c0
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
c1e85cf9f1
Merge pull request #271 from Minoost/develop-qte_cmd 
Add a qte event command
 2018-03-09 17:02:51 +01:00
Mino
a33894f70a Add a qte event command 2018-03-10 00:06:44 +09:00
Adam
4f268fd4ba what is git, how does it work 2018-03-09 23:54:57 +11:00
Adam
0842b4a864 remove scriptloader from tree and update gitignore 2018-03-09 23:54:11 +11:00
Mordred Admin
e868f8c4f4 Additional assert in framwork 2018-03-09 11:16:36 +01:00
Mordred Admin
b441d4ec99 It builds! 2018-03-09 10:36:07 +01:00
Mordred Admin
250b1aef79 More framework changes, linker still unhappy 2018-03-09 10:19:38 +01:00
Mordred
83cb17610c WiP - implementing new framework 2018-03-09 00:06:44 +01:00
Mordred
c7914a80e4 desperate try to figure out the appveyor issue 2018-03-07 17:41:16 +01:00
Mordred Admin
02adcc3ef5 updated submodule 2018-03-07 15:05:46 +01:00
Mordred
d7f51a2dcf
Merge pull request #268 from itsMaru/actor_rewrite 
const correct
 2018-03-07 13:40:29 +01:00
Maru
926404693f Const correct 2018-03-07 07:49:20 -03:00
Mordred Admin
3d3c05fdb3 Oversight... 2018-03-07 09:22:08 +01:00
Mordred Admin
8fc9bcf564 Cleanup of script CMakeLists 2018-03-07 09:19:40 +01:00
Mordred Admin
5a6835c7f1 Disableing cotire for zone 2018-03-07 09:01:53 +01:00
Mordred Admin
8accf4cacf forgot to remove old files 2018-03-07 08:48:16 +01:00
Mordred Admin
e15c46500c Moved scripts out of server_zone scope 2018-03-07 08:14:42 +01:00
Mordred
88cf5de3b4 Update submodules 2018-03-06 23:38:21 +01:00
Mordred
42a556b487 Build fix... well ish... 2018-03-06 23:20:07 +01:00
Mordred Admin
a489e9f576 Merge branch 'actor_rewrite' of https://github.com/SapphireMordred/Sapphire into actor_rewrite 2018-03-06 22:46:07 +01:00
Mordred Admin
6350f1d917 Updated submodules 2018-03-06 22:45:46 +01:00
Mordred
ef39c72bc8 Merge branch 'actor_rewrite' of https://github.com/SapphireMordred/Sapphire into actor_rewrite 2018-03-06 22:34:12 +01:00
Mordred
a7d43d7855 Merge remote-tracking branch 'origin/social_implementation' into actor_rewrite 2018-03-06 22:33:41 +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
Mordred
b32393ab42
Merge pull request #266 from NotAdam/actor_rewrite 
minor instances fixes
 2018-03-06 08:19:01 +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
dcd0d6b0cd remove double eventStart call 2018-03-06 13:34:02 +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
5781232516
Merge pull request #265 from NotAdam/actor_rewrite 
fix onEnterTerritory events, eventstart handling for instances
 2018-03-05 21:07:46 +01:00