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

839 commits

This branch
This branch
All branches
Author SHA1 Message Date
Adam
95bf84ca6d correctly remove InstanceContent zones 2018-01-29 20:40:32 +11:00
Adam
e9d0e5cbb8 createInstanceContent and some minor refactoring 2018-01-29 19:40:27 +11:00
Adam
236c09fbd3 add some more mapped TerritoryIntendedUse values 2018-01-29 18:10:43 +11:00
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
Mordred
4cf6602133 Merge pull request #226 from GokuWeedLord/event_rewrite 
instance creation/removal & debug command
 2018-01-28 15:26:31 +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
Mordred
958aa0922e Updated submodule 2018-01-28 10:10:48 +01:00
Mordred
6a128b1912 Merge pull request #225 from GokuWeedLord/event_rewrite 
debug commands are now scripted, debugcommandhandler is now gone
 2018-01-28 10:07:58 +01:00
Adam
70cf3919d6 probably fixes linux builds 2018-01-28 19:36:03 +11:00
Adam
94845da821 remove debug output 2018-01-28 19:02:50 +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
Adam
3c890148f2 scripts include ScriptObject.h sanely now 2018-01-28 14:02:51 +11:00
Mordred
a104b5a928 Merge branch 'master' into event_rewrite 2018-01-28 00:30:16 +01:00
Mordred
0e34a6b107 Linux build fix 2018-01-28 00:09:53 +01:00
Mordred
62cfa0a291 Type on comment 2018-01-28 00:03:42 +01:00
Mordred
140f66a1d0 updated submodule 2018-01-27 23:55:34 +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
Mordred
9607bebb05 Merge pull request #218 from GokuWeedLord/feature/gm-debug-scripting 
update submodule and remove script name from scripts
 2018-01-19 11:12:06 +01:00
Adam
ef007bb442 update libs submodule 2018-01-19 20:30:01 +11: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
Mordred
0a8ce53b09 Merge pull request #217 from GokuWeedLord/event_rewrite 
fix hotloading setting, minor cleanup
 2018-01-18 09:03:06 +01:00
Adam
b3ba2a992c fix hotloading setting, minor cleanup 2018-01-18 13:56:55 +11:00
Mordred
9f62ca9423 Merge branch 'event_rewrite' of https://github.com/SapphireMordred/Sapphire into event_rewrite 2018-01-17 23:22:23 +01:00
Mordred
32d5a55ee9 Fixed weatherrate being pulled off the wrong field 2018-01-17 23:22:19 +01:00
Mordred
934784aec7 Merge pull request #216 from GokuWeedLord/event_rewrite 
use typeinfo for script types instead of an enum
 2018-01-17 11:12:42 +01:00
Adam
15d6ae7e0d use typeinfo for script types instead of an enum 2018-01-17 20:09:16 +11:00
Mordred
5bf895ec3d Updated submodules 2018-01-16 19:01:10 +01:00
Mordred
8574e92559 Fixed mysql autoreconnect for prepared statements 2018-01-16 16:36:24 +01: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