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

818 commits

This branch
This branch
All branches
Author SHA1 Message Date
Adam
87a91a19ea make the output of territorymgr nicer on startup 👌 2018-01-28 18:49:29 +11:00
Adam
2ea7f776ba shouts now have correct behaviour 2018-01-28 18:48:56 +11:00
Adam
8a462c5609 scripts include ScriptObject.h sanely now 2018-01-28 14:02:51 +11:00
Mordred
695fea7812 Merge branch 'master' into event_rewrite 2018-01-28 00:30:16 +01:00
Mordred
0c05252c10 Linux build fix 2018-01-28 00:09:53 +01:00
Mordred
73df60440f Type on comment 2018-01-28 00:03:42 +01:00
Mordred
26062409cc updated submodule 2018-01-27 23:55:34 +01:00
Mordred
ebad3f3c2f Removed debug code 2018-01-27 23:54:26 +01:00
Mordred
35a2c6db09 Replacement of old ZoneMgr 2018-01-27 23:52:49 +01:00
Mordred
2a1593fc4c
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
6476df8ce7 update libs submodule 2018-01-19 20:30:01 +11:00
Adam
9324fe1e89 remove scriptname from scripts 2018-01-19 20:17:49 +11:00
Mordred
8890296639 More event simplification 2018-01-18 21:49:12 +01:00
Mordred
052227b85e
Merge pull request #217 from GokuWeedLord/event_rewrite 
fix hotloading setting, minor cleanup
 2018-01-18 09:03:06 +01:00
Adam
59e5a3a7f1 fix hotloading setting, minor cleanup 2018-01-18 13:56:55 +11:00
Mordred
bad097f368 Merge branch 'event_rewrite' of https://github.com/SapphireMordred/Sapphire into event_rewrite 2018-01-17 23:22:23 +01:00
Mordred
3eb0997b2e Fixed weatherrate being pulled off the wrong field 2018-01-17 23:22:19 +01:00
Mordred
8808e867a6
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
1cbfccb1b3 use typeinfo for script types instead of an enum 2018-01-17 20:09:16 +11:00
Mordred
152495061f Updated submodules 2018-01-16 19:01:10 +01:00
Mordred
4ce4a73570 Fixed mysql autoreconnect for prepared statements 2018-01-16 16:36:24 +01:00
Mordred
ea91f7e141 Small reformmating of scriptmanager 2018-01-16 16:35:50 +01:00
Mordred
f7dc992103 Simplified EventReturnHandler 2018-01-16 14:01:58 +01:00
Mordred
e7f7cc947f More cleanup of event / script handlers 2018-01-16 02:16:48 +01:00
Mordred
2d8ea346a3 Beginning of splitting eventhandlers, pulling logic out of scriptmanager 2018-01-14 23:54:26 +01:00
Mordred Admin
f3d5bf5fa6 Simplified handling of state flags 2018-01-11 14:59:39 +01:00
Mordred Admin
5e4b4fac3e Removed redundancy in EventHandler type declarations 2018-01-10 10:47:47 +01:00
Mordred
bafc511db2 Another approach at event improvements 2018-01-09 23:50:54 +01:00
Mordred
8d967870bd another event rewrite approach 2018-01-09 23:44:02 +01:00
Mordred
6a13729dca
Merge pull request #214 from goaaats/ex-rework 
Added basic capture replay
 2018-01-08 23:41:00 +01:00
goaaats
5b5406fd7a Style, cleanup 2018-01-08 23:38:27 +01:00
goaaats
a543a149cc Style fixes 2018-01-08 23:23:09 +01:00
goaaats
a25ee827a5 Added basic capture replay 2018-01-08 21:42:44 +01:00
Mordred
ffaa89a35e
Merge pull request #212 from GokuWeedLord/feature/nativescripting 
generally simplify scripting system internals
 2018-01-05 18:22:58 +01:00
Mordred
c8a2e455d7
Merge pull request #213 from AcedArmy/Chai_to_Native 
Ported the Quarrels with Squirrels Quest from Chai
 2018-01-05 18:22:18 +01:00
Mordred
0a81f0a0c8
Update SubFst002.cpp 
removed unneeded space
 2018-01-05 18:21:49 +01:00
Biscuit Boy
e8ebcb812c Added Space in Func Call Arguments 2018-01-05 23:44:08 +11:00
Biscuit Boy
8dc9faa7dc Fixed The Formatting Again 
Please be the last time
 2018-01-05 23:29:09 +11:00
Adam
5ea6682692 whitespace fixes 2018-01-04 22:40:48 +11:00
Adam
2b40db7007 use dynamic_cast instead of static_cast in script getter 2018-01-04 22:24:13 +11:00
Adam
7ee0ba330e generally simplify scripting system internals 2018-01-04 16:14:14 +11:00
Biscuit
73cc3f3deb
Ported the Quarrels with Squirrels Quest from Chai 
Ported the Quarrels with Squirrels from the old ChaiScript over to Native.
I cannot Test the Port up to Killing a NPC right now since a Bug, but after the Bug is fixed it should work fine.
 2017-12-30 14:21:33 +11:00
Biscuit
8af8f2f3f0
Merge pull request to Update Master 
Updated to latest master
 2017-12-30 14:15:30 +11:00
Mordred
31a2cf0209 Merge remote-tracking branch 'origin/native_scripting' 2017-12-29 22:51:27 +01:00
Mordred
4689615d00 Removed all chaiscripts, check git history if you really want em 2017-12-29 20:14:39 +01:00
Mordred
f6ae3a35c3 Just style fixes 2017-12-29 20:12:03 +01:00
Adam
6fd9bb1813 remove EXPORT_SCRIPTOBJECT from generated scripts - unused now 2017-12-28 00:08:20 +11:00
Adam
c7ada57d45 Merge remote-tracking branch 'upstream/native_scripting' into feature/nativescripting 2017-12-27 19:49:13 +11:00
Mordred
75c2dfffd2
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
Mordred
c1973990cc
Merge pull request #208 from GokuWeedLord/feature/nativescripting 
scripts are now built into common libs instead of seperate libs
 2017-12-27 09:33:54 +01:00