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

1809 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tahir Akhlaq
43caa4e70b 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
Mordred Admin
fdb59ffebc 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
2382f72184 #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 Admin
e4d7b01fff 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
Mordred Admin
5c9ec6f695 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
48c130472e Removed old actorspawn structure as it is not used anymore 2017-12-17 23:49:11 +01:00
Mordred
84a851d0a1 Fixed questmessage and a quest field size 2017-12-17 18:50:03 +01:00
Tahir Akhlaq
e69a5d1cd4 clean up generated script public/private members 2017-12-17 10:56:41 +00:00
Tahir Akhlaq
83f88102f9 update quest_parser for c++ scripting 
- fixed pcb_reader path
 2017-12-17 09:56:35 +00:00
GokuWeedLord
1a3173bf43 fix !set classjob not setting up classes properly 2017-12-16 23:00:04 +11:00
Mordred
05e48baf7b Merge pull request #203 from GokuWeedLord/feature/nativescripting 
add some gridania quests and move some constants into ScriptObject
 2017-12-16 10:27:46 +01:00
GokuWeedLord
77c6557391 fix compile warning 2017-12-16 19:05:14 +11:00
GokuWeedLord
feddeec418 opening quests done, still missing some functionality but you teleport into the real zones 2017-12-16 14:45:40 +11:00
GokuWeedLord
78c636b4b1 add some gridania quests and move some constants into ScriptObject 2017-12-16 12:13:45 +11:00
Mordred
2ce60e4c43 Forgot to fix field name 2017-12-16 00:57:52 +01:00
Mordred
33eeb6acb6 Greatly improved initui and changed DB and player field sizes 2017-12-16 00:41:51 +01:00
Mordred
e574d4035d Merge pull request #202 from GokuWeedLord/feature/nativescripting 
automagically reload rebuilt scripts
 2017-12-14 23:54:48 +01:00
GokuWeedLord
89b6ac76df improve script reloading and fix openinggridania 2017-12-15 00:19:30 +11:00
GokuWeedLord
70960ceb1d my spacebar died for my sins 2017-12-14 23:11:29 +11:00
GokuWeedLord
c60b680a27 change reload -> queue reload & some minor refactoring 2017-12-14 23:05:53 +11:00
GokuWeedLord
6e345a265b automagically reload rebuilt scripts 2017-12-14 22:30:06 +11:00
Mordred
28609515a2 Merge pull request #199 from GokuWeedLord/feature/nativescripting 
Native Scripting
 2017-12-14 09:11:20 +01:00
GokuWeedLord
bd676cc4f0 Travis: A Lost Hope - Episode VI DLC 1 2017-12-14 17:38:50 +11:00
GokuWeedLord
87b7081501 Travis: A Lost Hope - Episode VI 2017-12-14 17:37:39 +11:00
GokuWeedLord
c77ade6e3c fix deps 2017-12-14 17:21:42 +11:00
GokuWeedLord
17d7c5a5a2 fix add-apt-repository cmd 2017-12-14 17:11:07 +11:00
GokuWeedLord
ec3e43fb09 maybe travis will use boost1.63 2017-12-14 17:02:30 +11:00
GokuWeedLord
6ff62d4a3a update boost ver on appveyor & set cxx flags for experimental/filesystem 2017-12-14 16:46:51 +11:00
GokuWeedLord
27f6261e33 maybe, just maybe, it builds on travis now 2017-12-14 15:03:23 +11:00
GokuWeedLord
f8d94acd83 add module cache back, add reload functionality/debug cmd 2017-12-14 13:23:59 +11:00
GokuWeedLord
1d9c12ce1c remove module cache code 2017-12-13 23:08:16 +11:00
GokuWeedLord
75202b0782 hopefully it'll build properly on windows/linux 2017-12-13 23:08:02 +11:00
GokuWeedLord
10d32a0e36 copy scripts to a cache before loading, update config, implement all scriptmanager functionality 2017-12-13 22:19:00 +11:00
GokuWeedLord
2627b17a37 generally simplify code and change nativescript to nativescriptmanager 2017-12-13 15:07:03 +11:00
GokuWeedLord
f33c59a102 use precompiled headers for script compilation on msvc 2017-12-13 14:20:11 +11:00
GokuWeedLord
d9f744e97d use defines for fixed script ids 2017-12-13 14:05:50 +11:00
GokuWeedLord
7b6dad0775 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
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
f2a7745dcd 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
bbcc85a9db 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
b35dc0c25a 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