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

806 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
53c28e04f8
Merge pull request #215 from goaaats/ex-rework 
Use millisecond accuracy for replays
 2018-01-09 23:45:17 +01:00
goaaats
bcd4ea0dfe Don't log replays 2018-01-09 18:56:05 +01:00
goaaats
ef954b202d Replay packets by milliseconds 2018-01-09 18:54:09 +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
Adam
897e02093f delete unloaded scripts 2017-12-27 18:53:45 +11:00
Adam
ac9613f2f5 scripts are now built into common libs instead of seperate libs 2017-12-27 18:47:51 +11:00
Adam
3a05770330 Merge remote-tracking branch 'upstream/native_scripting' into fix/set-classjob 2017-12-27 12:52:23 +11:00
Mordred
dcaffaa68b
Merge pull request #207 from AcedArmy/master 
Hopefully Added All Aetheryte Positions for ARR
 2017-12-25 00:30:58 +01:00
Mordred
afe2600853
Merge pull request #206 from goaaats/patch-1 
Fix ADD commands
 2017-12-25 00:30:21 +01:00
Biscuit
3723e2f0d8
Hopefully Added All Aetheryte Positions for ARR 2017-12-23 03:48:52 +11:00
goaaats
dbac086121
Fix ADD commands 2017-12-22 16:34:05 +01:00
Mordred
7b4f8f8689
Merge pull request #201 from takhlaq/tools 
updated quest_parser for c++ scripting, fixed typo in pcb_reader
 2017-12-20 23:33:24 +01:00
Mordred Admin
2a11428c09 Build fix 2017-12-20 15:28:12 +01:00
Tahir Akhlaq
0e82bf859a style fixes in ManFst004 2017-12-20 14:23:45 +00:00
Tahir Akhlaq
85e2ea072d Merge branch 'native_scripting' of https://github.com/SapphireMordred/Sapphire into native_scripting 
# Conflicts:
#	scripts/native/CMakeLists.txt
#	src/tools/quest_parser/main.cpp
 2017-12-20 13:23:49 +00:00
Mordred Admin
255cb196c1 readding version to gitignore 2017-12-20 13:42:35 +01:00