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

994 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mordred
fa662d30b8 forgot proper namespace for Director 2018-01-28 13:52:53 +01:00
Mordred
137cc944b3 Begin of InstanceContent implementation 2018-01-28 13:49:51 +01:00
Mordred
2609a475a7 Removed author comment, we have git anyways. 2018-01-28 11:40:12 +01:00
Mordred
725ca11c60 Revert "Merge pull request #225 from GokuWeedLord/event_rewrite" 
This reverts commit 4e2319130f, reversing
changes made to 695fea7812.
 2018-01-28 11:16:34 +01:00
Mordred
9c862b2746 Updated submodule 2018-01-28 10:10:48 +01:00
Mordred
4e2319130f
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
20996c17f5 probably fixes linux builds 2018-01-28 19:36:03 +11:00
Adam
6d5317ea1a remove debug output 2018-01-28 19:02:50 +11:00
Adam
fb06cd4930 switch debugcommandhandler for scripted implementation 2018-01-28 18:52:53 +11:00
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
d78105f9c7
Merge pull request #224 from perize/master 
Add MSQ guide def
 2018-01-27 09:35:15 +01:00
Perize
5a3f548f86 MSQ guide packet def 2018-01-27 14:52:14 +09:00
Mordred
b4b02cf6ab
Merge pull request #223 from takhlaq/pcb_reader 
added planmap loading to pcb_reader
 2018-01-25 18:25:26 +01:00
Tahir Akhlaq
f0b888a4a3 added planmap loading to pcb_reader 2018-01-24 15:34:01 +00:00
Mordred
4c3ed1fa7d
Merge pull request #222 from takhlaq/pcb_reader 
updated pcb_reader with mordred's eobj/enpc entries
 2018-01-24 11:26:01 +01:00
Tahir Akhlaq
95f486ef19 updated pcb_reader with mordred's eobj/enpc entries 2018-01-24 00:15:46 +00:00
Mordred
caec894394
Merge pull request #221 from takhlaq/pcb_reader 
reenable pcb_reader build
 2018-01-23 20:30:30 +01:00
Tahir Akhlaq
7ac18f8f5a fix pcb_reader cmakelists i hope 2018-01-23 17:53:22 +00:00
Tahir Akhlaq
0cac614b96 reenabled pcb_reader build, removed dumb requirement of territorytype extraction on xivdat build for pcb_reader 2018-01-23 13:13:35 +00:00
Mordred
37f10fb53b
Merge pull request #220 from goaaats/eventnpc 
zone: Add EventNpc + logic
 2018-01-22 08:42:14 +01:00
goaaats
ee96791eac zone: Add EventNpc + logic 2018-01-20 22:03:41 +01:00
Mordred
7a6ca3d652
Merge pull request #219 from AcedArmy/master 
Fixed GM Call
 2018-01-19 22:08:36 +01:00
Biscuit Boy
1895accd5e Added GM1 Back since its needed 2018-01-20 02:04:38 +11:00
Biscuit Boy
7c90e133f8 Fixed GM Call 
GM Call was placed in GM1 instead of GM2 for some reason /shrug
 2018-01-20 01:56:00 +11: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