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

1422 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Tahir Akhlaq
b63b4eb612 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
Tahir Akhlaq
e01710c2c3 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
Mordred
31f460d4c4 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
Mordred
b5a92485e7 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
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
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
824a308359 Merge pull request #215 from goaaats/ex-rework 
Use millisecond accuracy for replays
 2018-01-09 23:45:17 +01:00
Mordred
b26236c99b another event rewrite approach 2018-01-09 23:44:02 +01:00
goaaats
1f8e5f18a8 Don't log replays 2018-01-09 18:56:05 +01:00
goaaats
691f5dfd54 Replay packets by milliseconds 2018-01-09 18:54:09 +01:00
Mordred
72ae0b5bcb Merge pull request #214 from goaaats/ex-rework 
Added basic capture replay
 2018-01-08 23:41:00 +01:00
goaaats
9f145c28c2 Style, cleanup 2018-01-08 23:38:27 +01:00
goaaats
f6ed8125b0 Style fixes 2018-01-08 23:23:09 +01:00
goaaats
da906586ea Added basic capture replay 2018-01-08 21:42:44 +01:00
Mordred
8519f118fe Merge pull request #212 from GokuWeedLord/feature/nativescripting 
generally simplify scripting system internals
 2018-01-05 18:22:58 +01:00
Mordred
f812b31721 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
7abc33c930 Update SubFst002.cpp 
removed unneeded space
 2018-01-05 18:21:49 +01:00
Biscuit Boy
4a6fa2e9da Added Space in Func Call Arguments 2018-01-05 23:44:08 +11:00
Biscuit Boy
8b1e246cc2 Fixed The Formatting Again 
Please be the last time
 2018-01-05 23:29:09 +11:00
Adam
275d770c78 whitespace fixes 2018-01-04 22:40:48 +11:00
Adam
8009bc53bb use dynamic_cast instead of static_cast in script getter 2018-01-04 22:24:13 +11:00
Adam
19dcbd347d generally simplify scripting system internals 2018-01-04 16:14:14 +11:00
Biscuit
f71b5ab7f3 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
d8c58c679f Merge pull request to Update Master 
Updated to latest master
 2017-12-30 14:15:30 +11:00
Mordred
6d1d34830f Merge remote-tracking branch 'origin/native_scripting' 2017-12-29 22:51:27 +01:00
Mordred
07dbb25480 Removed all chaiscripts, check git history if you really want em 2017-12-29 20:14:39 +01:00
Mordred
e824446fce Just style fixes 2017-12-29 20:12:03 +01:00