1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-26 22:37:45 +00:00
Commit graph

1458 commits

Author SHA1 Message Date
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
Mordred
97ae0ac742
formatting 2018-03-05 14:35:03 +01:00
Mordred
df29f674df
formatting 2018-03-05 14:34:34 +01:00
Adam
0de9fb05cf better handling of EventStart IPC for instances 2018-03-05 22:40:11 +11:00
Adam
8fd1a2e3df fix onEnterTerritory events 2018-03-05 22:10:14 +11:00
Adam
b26a6f3317 add zone opcode 2018-03-05 17:01:37 +11:00
Mordred
be46ec837d Fixed boundByDuty state so duty menu works in instance 2018-03-04 17:53:40 +01:00
Mordred
77d7e95c07
Merge pull request #264 from NotAdam/actor_rewrite
eobj rotation ipc fix & new instance scripts
2018-03-04 10:25:52 +01:00
Adam
2f126e8dec build fix? 2018-03-04 18:13:05 +11:00
Adam
2c6253e37c new instance scripts with eobj rotation 2018-03-04 17:51:32 +11:00
Adam
628f01e2eb use subfolders for instancecontenttype and export eobj rotation 2018-03-04 17:49:18 +11:00
Adam
6255df16f2 fix rotation in objectspawn ipc and send it too 2018-03-04 17:41:17 +11:00
Mordred
0e9e155e53 Instance parser updated to map sgb content to EObjects 2018-03-04 00:16:44 +01:00
Mordred
619d39e6f8 Fixed an inventory bug to to invalid size 2018-03-04 00:12:33 +01:00
Mordred
60661e32bd
Merge pull request #261 from itsMaru/master
Framework class; General refactoring and styling;
2018-03-03 00:28:15 +01:00
Mordred
dc6fab5eb6
Merge pull request #262 from takhlaq/opening_quest
fixed limsa and uldah intro quest
2018-03-03 00:26:54 +01:00
Tahir Akhlaq
ad082ae176 fixed limsa and uldah intro quest 2018-03-02 16:27:04 +00:00
Maru
6d65274d13 Qualifiers 2018-03-02 10:18:54 -03:00
Maru
e31b3c35ef Build succeeded. 2018-03-02 10:11:03 -03:00
Maru
c93c6e24f1 Fix Travis Build 2018-03-02 09:55:03 -03:00
Maru
52468262f3 More style stuff; 2018-03-02 08:25:48 -03:00
Maru
b7f2ed462e 🗣 💩 2018-03-02 08:13:45 -03:00