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

6109 commits

This branch
This branch
All branches
Author SHA1 Message Date
Adam
0842b4a864 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
e868f8c4f4 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
b441d4ec99 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 Admin
250b1aef79 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
83cb17610c 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
c7914a80e4 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 Admin
02adcc3ef5 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
Mordred
d7f51a2dcf
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
Maru
926404693f Const correct 2018-03-07 07:49:20 -03:00
Mordred Admin
69ff6404d4 Oversight... 2018-03-07 09:22:08 +01:00
Mordred Admin
3d3c05fdb3 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
8fc9bcf564 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
5a6835c7f1 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
8accf4cacf 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 Admin
e15c46500c 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
88cf5de3b4 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
42a556b487 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
a489e9f576 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 Admin
6350f1d917 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
ef39c72bc8 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
a7d43d7855 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
6ed1b274a3 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 Admin
b91e711834 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
Mordred
b32393ab42
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
32e10ec6e8 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
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
0adb47e4a5 remove double eventStart call 2018-03-06 13:34:02 +11:00