mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-30 08:07:46 +00:00
Code Activity
6588 commits 10 branches 14 tags 26 MiB
Commit graph

6588 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Mordred Admin
0f3f51c304 #182 - Renamed targets to be less ambigious 2017-12-19 09:27:22 +01:00
Mordred
30ce2dfbf2 Windows build fix 2017-12-18 23:10:36 +01:00
Mordred
232d9cd1ad Windows build fix 2017-12-18 23:10:36 +01:00
Mordred Admin
e4d7b01fff Another attempt at fixing the build 2017-12-18 14:45:15 +01:00
Mordred Admin
4606e83d15 Another attempt at fixing the build 2017-12-18 14:45:15 +01:00
Tahir Akhlaq
3396bbbc7b added close to home quest 2017-12-18 12:01:38 +00:00
Tahir Akhlaq
d799f2e3c2 added close to home quest 2017-12-18 12:01:38 +00:00
Mordred Admin
5c9ec6f695 Windows build fix 2017-12-18 12:57:24 +01:00
Mordred Admin
32d886675c Windows build fix 2017-12-18 12:57:24 +01:00
Mordred Admin
764b73b11c Moved and renamed Server_Common, now just src/common 2017-12-18 12:36:52 +01:00
Mordred Admin
e0f93eaf1c Moved and renamed Server_Common, now just src/common 2017-12-18 12:36:52 +01:00
Mordred
48c130472e Removed old actorspawn structure as it is not used anymore 2017-12-17 23:49:11 +01:00
Mordred
1673292b62 Removed old actorspawn structure as it is not used anymore 2017-12-17 23:49:11 +01:00