mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-05 02:07:46 +00:00
Code Activity
836 commits 10 branches 14 tags 26 MiB
Commit graph

509 commits

Author SHA1 Message Date
Adam
36d64630d3 remove isPrivate param from constructors 2018-01-29 18:10:11 +11:00
Adam
7de0885b54 instance zoning and returning implemented 
instancecontent uses instancecontent class instead of zone too
 2018-01-29 13:05:33 +11:00
Adam
97e2c08a9f fix weather in zones 2018-01-29 13:03:52 +11:00
Mordred
bccf6e200a Cleaning up zoneing code 2018-01-28 22:36:43 +01:00
Adam
9d2d819e18 instance removal command 2018-01-29 00:52:11 +11:00
Adam
339a089d47 gm teri accepts instance id 2018-01-29 00:40:34 +11:00
Adam
5afe002c33 Merge remote-tracking branch 'upstream/event_rewrite' into event_rewrite 2018-01-28 23:54:10 +11:00
Adam
b05a05341c base implementation of instance creation 2018-01-28 23:53:58 +11:00
Mordred
63371153ae forgot proper namespace for Director 2018-01-28 13:52:53 +01:00
Mordred
d9da17cd35 Begin of InstanceContent implementation 2018-01-28 13:49:51 +01:00
Mordred
04f5823c4b Removed author comment, we have git anyways. 2018-01-28 11:40:12 +01:00
Mordred
babb58fa21 Revert "Merge pull request #225 from GokuWeedLord/event_rewrite" 
This reverts commit 6a128b1912, reversing
changes made to a104b5a928.
 2018-01-28 11:16:34 +01:00
Adam
70cf3919d6 probably fixes linux builds 2018-01-28 19:36:03 +11:00
Adam
dde0a30fa3 switch debugcommandhandler for scripted implementation 2018-01-28 18:52:53 +11:00
Adam
99300d746a make the output of territorymgr nicer on startup 👌 2018-01-28 18:49:29 +11:00
Adam
afd439c64f shouts now have correct behaviour 2018-01-28 18:48:56 +11:00
Mordred
a104b5a928 Merge branch 'master' into event_rewrite 2018-01-28 00:30:16 +01:00
Mordred
62cfa0a291 Type on comment 2018-01-28 00:03:42 +01:00
Mordred
6404951549 Removed debug code 2018-01-27 23:54:26 +01:00
Mordred
aabcdf6e74 Replacement of old ZoneMgr 2018-01-27 23:52:49 +01:00
Adam
4b9da92b34 remove scriptname from scripts 2018-01-19 20:17:49 +11:00
Mordred
c568a998c3 More event simplification 2018-01-18 21:49:12 +01:00
Adam
b3ba2a992c fix hotloading setting, minor cleanup 2018-01-18 13:56:55 +11:00
Adam
15d6ae7e0d use typeinfo for script types instead of an enum 2018-01-17 20:09:16 +11:00
Mordred
bc9d33724a Small reformmating of scriptmanager 2018-01-16 16:35:50 +01:00
Mordred
9d07048f0d Simplified EventReturnHandler 2018-01-16 14:01:58 +01:00
Mordred
52f341c906 More cleanup of event / script handlers 2018-01-16 02:16:48 +01:00
Mordred
147ff80f86 Beginning of splitting eventhandlers, pulling logic out of scriptmanager 2018-01-14 23:54:26 +01:00
Mordred Admin
add84d6516 Simplified handling of state flags 2018-01-11 14:59:39 +01:00
Mordred Admin
6d6c71d6af Removed redundancy in EventHandler type declarations 2018-01-10 10:47:47 +01:00
Mordred
0f16ad4812 Another approach at event improvements 2018-01-09 23:50:54 +01:00
Mordred
b26236c99b another event rewrite approach 2018-01-09 23:44:02 +01:00
goaaats
9f145c28c2 Style, cleanup 2018-01-08 23:38:27 +01:00
goaaats
f6ed8125b0 Style fixes 2018-01-08 23:23:09 +01:00
goaaats
da906586ea Added basic capture replay 2018-01-08 21:42:44 +01:00
Mordred
8519f118fe Merge pull request #212 from GokuWeedLord/feature/nativescripting 
generally simplify scripting system internals
 2018-01-05 18:22:58 +01:00
Adam
275d770c78 whitespace fixes 2018-01-04 22:40:48 +11:00
Adam
8009bc53bb use dynamic_cast instead of static_cast in script getter 2018-01-04 22:24:13 +11:00
Adam
19dcbd347d generally simplify scripting system internals 2018-01-04 16:14:14 +11:00
Mordred
6d1d34830f Merge remote-tracking branch 'origin/native_scripting' 2017-12-29 22:51:27 +01:00
Mordred
da15e65c00 Merge pull request #204 from GokuWeedLord/fix/set-classjob 
fix !set classjob not setting up classes properly
 2017-12-27 09:34:35 +01:00
Adam
d390d594ac delete unloaded scripts 2017-12-27 18:53:45 +11:00
Adam
2868bfc69f scripts are now built into common libs instead of seperate libs 2017-12-27 18:47:51 +11:00
Adam
0bbcf9ac29 Merge remote-tracking branch 'upstream/native_scripting' into fix/set-classjob 2017-12-27 12:52:23 +11:00
goaaats
ea725f0f31 Fix ADD commands 2017-12-22 16:34:05 +01:00
Tahir Akhlaq
9a931baf39 Merge branch 'native_scripting' of https://github.com/SapphireMordred/Sapphire into native_scripting 
# Conflicts:
#	scripts/native/CMakeLists.txt
#	src/tools/quest_parser/main.cpp
 2017-12-20 13:23:49 +00:00
Mordred Admin
2382f72184 #182 - Renamed targets to be less ambigious 2017-12-19 09:27:22 +01:00
Mordred
30ce2dfbf2 Windows build fix 2017-12-18 23:10:36 +01:00
Mordred Admin
e4d7b01fff Another attempt at fixing the build 2017-12-18 14:45:15 +01:00
Tahir Akhlaq
3396bbbc7b added close to home quest 2017-12-18 12:01:38 +00:00