mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-03 17:27:47 +00:00
Code Activity
6451 commits 10 branches 14 tags 26 MiB
Commit graph

6451 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mordred
73df60440f Type on comment 2018-01-28 00:03:42 +01:00
Mordred
140f66a1d0 updated submodule 2018-01-27 23:55:34 +01:00
Mordred
26062409cc updated submodule 2018-01-27 23:55:34 +01:00
Mordred
6404951549 Removed debug code 2018-01-27 23:54:26 +01:00
Mordred
ebad3f3c2f 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
35a2c6db09 Replacement of old ZoneMgr 2018-01-27 23:52:49 +01:00
Mordred
417d0f42a1 Merge pull request #224 from perize/master 
Add MSQ guide def
 2018-01-27 09:35:15 +01:00
Mordred
d78105f9c7
Merge pull request #224 from perize/master 
Add MSQ guide def
 2018-01-27 09:35:15 +01:00
Perize
2614f24a8e MSQ guide packet def 2018-01-27 14:52:14 +09:00
Perize
5a3f548f86 MSQ guide packet def 2018-01-27 14:52:14 +09:00
Mordred
f92bdd676a Merge pull request #223 from takhlaq/pcb_reader 
added planmap loading to pcb_reader
 2018-01-25 18:25:26 +01: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
d575c63152 added planmap loading to pcb_reader 2018-01-24 15:34:01 +00:00
Tahir Akhlaq
f0b888a4a3 added planmap loading to pcb_reader 2018-01-24 15:34:01 +00:00
Mordred
1ce2d4af03 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
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
b63b4eb612 updated pcb_reader with mordred's eobj/enpc entries 2018-01-24 00:15:46 +00:00
Tahir Akhlaq
95f486ef19 updated pcb_reader with mordred's eobj/enpc entries 2018-01-24 00:15:46 +00:00
Mordred
b7d0148539 Merge pull request #221 from takhlaq/pcb_reader 
reenable pcb_reader build
 2018-01-23 20:30:30 +01: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
e01710c2c3 fix pcb_reader cmakelists i hope 2018-01-23 17:53:22 +00:00
Tahir Akhlaq
7ac18f8f5a fix pcb_reader cmakelists i hope 2018-01-23 17:53:22 +00:00
Tahir Akhlaq
6d591a004f reenabled pcb_reader build, removed dumb requirement of territorytype extraction on xivdat build for pcb_reader 2018-01-23 13:13:35 +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
31f460d4c4 Merge pull request #220 from goaaats/eventnpc 
zone: Add EventNpc + logic
 2018-01-22 08:42:14 +01:00
Mordred
37f10fb53b
Merge pull request #220 from goaaats/eventnpc 
zone: Add EventNpc + logic
 2018-01-22 08:42:14 +01:00
goaaats
235f3cc8c8 zone: Add EventNpc + logic 2018-01-20 22:03:41 +01:00
goaaats
ee96791eac zone: Add EventNpc + logic 2018-01-20 22:03:41 +01:00
Mordred
b5a92485e7 Merge pull request #219 from AcedArmy/master 
Fixed GM Call
 2018-01-19 22:08:36 +01:00
Mordred
7a6ca3d652
Merge pull request #219 from AcedArmy/master 
Fixed GM Call
 2018-01-19 22:08:36 +01:00
Biscuit Boy
f80a2fd0a5 Added GM1 Back since its needed 2018-01-20 02:04:38 +11:00
Biscuit Boy
1895accd5e Added GM1 Back since its needed 2018-01-20 02:04:38 +11:00
Biscuit Boy
8f2f827427 Fixed GM Call 
GM Call was placed in GM1 instead of GM2 for some reason /shrug
 2018-01-20 01:56:00 +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
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
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
ef007bb442 update libs submodule 2018-01-19 20:30:01 +11:00
Adam
6476df8ce7 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
Adam
9324fe1e89 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
8890296639 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
Mordred
052227b85e
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
Adam
59e5a3a7f1 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
bad097f368 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