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

6328 commits

This branch
This branch
All branches
Author SHA1 Message Date
GokuWeedLord
7b6dad0775 Merge remote-tracking branch 'upstream/master' into feature/nativescripting 2017-12-13 13:06:28 +11:00
GokuWeedLord
69d618f1d0 Merge remote-tracking branch 'upstream/master' into feature/nativescripting 2017-12-13 13:06:28 +11:00
GokuWeedLord
a9f2afaa22 fix incorrect usage of fatal error logging and switch typedef to using 2017-12-13 13:06:02 +11:00
GokuWeedLord
ed882044b1 fix incorrect usage of fatal error logging and switch typedef to using 2017-12-13 13:06:02 +11:00
GokuWeedLord
8a3c653ccd cleanup aetheryte code, refactor aetheryte/aethernet scriptid 
also revert changes in regards to debugcommandptr, out of scope of this PR
 2017-12-12 20:28:57 +11:00
GokuWeedLord
a59b3185e3 cleanup aetheryte code, refactor aetheryte/aethernet scriptid 
also revert changes in regards to debugcommandptr, out of scope of this PR
 2017-12-12 20:28:57 +11:00
GokuWeedLord
f2a7745dcd add aetheryte functionality back 2017-12-12 18:03:06 +11:00
GokuWeedLord
7dd5d73f5a add aetheryte functionality back 2017-12-12 18:03:06 +11:00
GokuWeedLord
1afefc3d79 aethernet works again 2017-12-12 17:29:31 +11:00
GokuWeedLord
0e7115f8a5 aethernet works again 2017-12-12 17:29:31 +11:00
GokuWeedLord
bbcc85a9db fix spacing 2017-12-12 15:00:56 +11:00
GokuWeedLord
c7dff9c053 fix spacing 2017-12-12 15:00:56 +11:00
GokuWeedLord
f53e42208b fix interactions getting locked in unhandled ontalk events 2017-12-12 14:58:50 +11:00
GokuWeedLord
c08c57f928 fix interactions getting locked in unhandled ontalk events 2017-12-12 14:58:50 +11:00
GokuWeedLord
b35dc0c25a change include order, make debugcommand shared_ptr type nicer 2017-12-12 14:58:36 +11:00
GokuWeedLord
06c4bac569 change include order, make debugcommand shared_ptr type nicer 2017-12-12 14:58:36 +11:00
GokuWeedLord
ed8958fb43 simplify script exporting, fix invalid indenting 2017-12-12 14:57:13 +11:00
GokuWeedLord
67a201e0c8 simplify script exporting, fix invalid indenting 2017-12-12 14:57:13 +11:00
GokuWeedLord
010d09239d refactor ability to action so it's consistent with the rest 2017-12-12 13:17:55 +11:00
GokuWeedLord
5f68dcdbd3 refactor ability to action so it's consistent with the rest 2017-12-12 13:17:55 +11:00
GokuWeedLord
77bf4662f6 unloading works now, scriptinfo is properly stored 2017-12-12 13:17:43 +11:00
GokuWeedLord
6f64c6492d unloading works now, scriptinfo is properly stored 2017-12-12 13:17:43 +11:00
Mordred
714a7c4ef9 Merge pull request #200 from takhlaq/pcb_teri 
updated pcb_reader to read territorytype from ffxivexplorer export
 2017-12-11 15:53:24 +01:00
Mordred
9c41c55092
Merge pull request #200 from takhlaq/pcb_teri 
updated pcb_reader to read territorytype from ffxivexplorer export
 2017-12-11 15:53:24 +01:00
GokuWeedLord
d58994fe9b script debug command, switch script info to a class 2017-12-12 01:45:24 +11:00
GokuWeedLord
723c1b9490 script debug command, switch script info to a class 2017-12-12 01:45:24 +11:00
GokuWeedLord
7728cda6e4 formatting fix 2017-12-11 22:52:10 +11:00
GokuWeedLord
f8cfc12f5d formatting fix 2017-12-11 22:52:10 +11:00
GokuWeedLord
0b63e6a0bf use references to actor in script, name scripts better 2017-12-11 22:21:37 +11:00
GokuWeedLord
742892e206 use references to actor in script, name scripts better 2017-12-11 22:21:37 +11:00
GokuWeedLord
de1964907b loading works, sprint works 2017-12-11 21:10:54 +11:00
GokuWeedLord
388adacf3b loading works, sprint works 2017-12-11 21:10:54 +11:00
GokuWeedLord
7c2a97804f rename sprint status/action script 2017-12-11 21:05:02 +11:00
GokuWeedLord
f926b03034 rename sprint status/action script 2017-12-11 21:05:02 +11:00
Mordred
5a83a82f36 Merge pull request #198 from reiichi001/master 
Fixed import.bat to include password on import loop and update.sql imort
 2017-12-11 00:06:00 +01:00
Mordred
0bb1234151
Merge pull request #198 from reiichi001/master 
Fixed import.bat to include password on import loop and update.sql imort
 2017-12-11 00:06:00 +01:00
Mordred
14eafd13b8 Merge pull request #195 from perize/master 
Perform fix
 2017-12-11 00:05:24 +01:00
Mordred
900b65c2ae
Merge pull request #195 from perize/master 
Perform fix
 2017-12-11 00:05:24 +01:00
Mordred
8728a4aae8 Merge pull request #197 from GokuWeedLord/fix/itemlevelcalc 
fix itemlevel calculation being incorrect
 2017-12-11 00:05:14 +01:00
Mordred
867227a624
Merge pull request #197 from GokuWeedLord/fix/itemlevelcalc 
fix itemlevel calculation being incorrect
 2017-12-11 00:05:14 +01:00
Robert Baker
e003c035c7 Fixed import.bat to include password on import loop and update.sql import. 2017-12-10 12:59:20 -08:00
Robert Baker
6ce2155476 Fixed import.bat to include password on import loop and update.sql import. 2017-12-10 12:59:20 -08:00
Tahir Akhlaq
bd00132e43 updated pcb_reader to read territorytype from ffxivexplorer export 2017-12-10 14:46:30 +00:00
Tahir Akhlaq
6b39deed6c updated pcb_reader to read territorytype from ffxivexplorer export 2017-12-10 14:46:30 +00:00
GokuWeedLord
e44bf87264 fix itemlevel calc 2017-12-11 00:40:52 +11:00
GokuWeedLord
552c8adfd4 fix itemlevel calc 2017-12-11 00:40:52 +11:00
GokuWeedLord
1bf33c8027 base scripts init code, call init before zone init for onZoneInit callback 2017-12-10 23:51:06 +11:00
GokuWeedLord
6b63d22391 base scripts init code, call init before zone init for onZoneInit callback 2017-12-10 23:51:06 +11:00
GokuWeedLord
aa72e715b6 change script location 2017-12-10 23:50:35 +11:00
GokuWeedLord
bb4665dc6a change script location 2017-12-10 23:50:35 +11:00