mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-03 01:07: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
Adam
5ea6682692 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
2b40db7007 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
Adam
7ee0ba330e 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
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
d8c58c679f Merge pull request to Update Master 
Updated to latest master
 2017-12-30 14:15:30 +11:00
Biscuit
8af8f2f3f0
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
31a2cf0209 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
4689615d00 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
Mordred
f6ae3a35c3 Just style fixes 2017-12-29 20:12:03 +01:00
Adam
86818e14ed remove EXPORT_SCRIPTOBJECT from generated scripts - unused now 2017-12-28 00:08:20 +11:00
Adam
6fd9bb1813 remove EXPORT_SCRIPTOBJECT from generated scripts - unused now 2017-12-28 00:08:20 +11:00
Adam
97dcf5640e Merge remote-tracking branch 'upstream/native_scripting' into feature/nativescripting 2017-12-27 19:49:13 +11:00
Adam
c7ada57d45 Merge remote-tracking branch 'upstream/native_scripting' into feature/nativescripting 2017-12-27 19:49:13 +11:00
Mordred
da15e65c00 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
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
76cd9cdd80 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
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
d390d594ac delete unloaded scripts 2017-12-27 18:53:45 +11:00
Adam
897e02093f delete unloaded scripts 2017-12-27 18:53:45 +11:00
Adam
2868bfc69f scripts are now built into common libs instead of seperate libs 2017-12-27 18:47:51 +11:00
Adam
ac9613f2f5 scripts are now built into common libs instead of seperate libs 2017-12-27 18:47:51 +11:00
Adam
0bbcf9ac29 Merge remote-tracking branch 'upstream/native_scripting' into fix/set-classjob 2017-12-27 12:52:23 +11:00
Adam
3a05770330 Merge remote-tracking branch 'upstream/native_scripting' into fix/set-classjob 2017-12-27 12:52:23 +11:00
Mordred
5dffb7dad1 Merge pull request #207 from AcedArmy/master 
Hopefully Added All Aetheryte Positions for ARR
 2017-12-25 00:30:58 +01: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
39a7b7bc3c Merge pull request #206 from goaaats/patch-1 
Fix ADD commands
 2017-12-25 00:30:21 +01:00
Mordred
afe2600853
Merge pull request #206 from goaaats/patch-1 
Fix ADD commands
 2017-12-25 00:30:21 +01:00
Biscuit
a6e3d34dd4 Hopefully Added All Aetheryte Positions for ARR 2017-12-23 03:48:52 +11:00
Biscuit
3723e2f0d8
Hopefully Added All Aetheryte Positions for ARR 2017-12-23 03:48:52 +11:00
goaaats
ea725f0f31 Fix ADD commands 2017-12-22 16:34:05 +01:00
goaaats
dbac086121
Fix ADD commands 2017-12-22 16:34:05 +01:00
Mordred
c0fb85379c 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
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
4622b50631 Build fix 2017-12-20 15:28:12 +01:00
Mordred Admin
2a11428c09 Build fix 2017-12-20 15:28:12 +01:00
Tahir Akhlaq
43caa4e70b style fixes in ManFst004 2017-12-20 14:23:45 +00:00
Tahir Akhlaq
0e82bf859a style fixes in ManFst004 2017-12-20 14:23:45 +00:00
Tahir Akhlaq
9a931baf39 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
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
fdb59ffebc readding version to gitignore 2017-12-20 13:42:35 +01:00
Mordred Admin
255cb196c1 readding version to gitignore 2017-12-20 13:42:35 +01:00
Mordred Admin
7c230e88fe Git version fix 2017-12-20 13:41:13 +01:00
Mordred Admin
e48a8c8e39 Git version fix 2017-12-20 13:41:13 +01:00
Mordred Admin
2382f72184 #182 - Renamed targets to be less ambigious 2017-12-19 09:27:22 +01:00