mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-26 06:27:45 +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
4ecaa3703b Fair enough travis... well played... 2017-08-09 17:26:34 +02:00
Mordred
847910f183 Fair enough travis... well played... 2017-08-09 17:26:34 +02:00
Mordred
b9c684bc32 another travis test 2017-08-09 17:23:02 +02:00
Mordred
77da4d1b4d another travis test 2017-08-09 17:23:02 +02:00
Mordred
e8cdef7027 travis test 2017-08-09 17:19:06 +02:00
Mordred
ceeafa6737 travis test 2017-08-09 17:19:06 +02:00
SapphireMordred
2d1305f73c Merge pull request #17 from Minoost/matchmaking 
Add dutyreg packet definition and opcodes
 2017-08-09 17:15:33 +02:00
SapphireMordred
f586640906 Merge pull request #17 from Minoost/matchmaking 
Add dutyreg packet definition and opcodes
 2017-08-09 17:15:33 +02:00
Adam
2588a5f3ab Merge branch 'master' into matchmaking 2017-08-10 00:14:03 +09:00
Minho Kang
0914e1dbd5 Merge branch 'master' into matchmaking 2017-08-10 00:14:03 +09:00
SapphireMordred
65dfbd32cb Merge pull request #15 from amibu01/master 
.travis.yml test and start of skill scripting
 2017-08-09 16:38:24 +02:00
SapphireMordred
2d0c3070da Merge pull request #15 from amibu01/master 
.travis.yml test and start of skill scripting
 2017-08-09 16:38:24 +02:00
amibu
5e2a9927f1 Test .travis.yml 2017-08-09 16:36:19 +02:00
amibu
e49dff4d4d Test .travis.yml 2017-08-09 16:36:19 +02:00
SapphireMordred
ba9d80d0e3 Merge pull request #14 from Minoost/master 
Add SapphireLibs as a submodule
 2017-08-09 16:26:54 +02:00
SapphireMordred
5334367c34 Merge pull request #14 from Minoost/master 
Add SapphireLibs as a submodule
 2017-08-09 16:26:54 +02:00
Adam
1ad797d583 Add libraries as a submodule 2017-08-09 23:19:14 +09:00
Minho Kang
77aec38a75 Add libraries as a submodule 2017-08-09 23:19:14 +09:00
Adam
1a8660e322 Add dutyreg packet definition and opcodes 2017-08-09 23:15:55 +09:00
Minho Kang
3fa66835f5 Add dutyreg packet definition and opcodes 2017-08-09 23:15:55 +09:00
Adam
6235c834aa Merge remote-tracking branch 'upstream/master' 2017-08-09 23:14:46 +09:00
Minho Kang
405d7983c1 Merge remote-tracking branch 'upstream/master' 2017-08-09 23:14:46 +09:00
amibu
337c45d000 PoC Skill Scripting 2017-08-09 16:08:43 +02:00
amibu
78452638df PoC Skill Scripting 2017-08-09 16:08:43 +02:00
SapphireMordred
b2d07cc175 Merge pull request #13 from AcedArmy/Updated-Zoneline-1317533 
Updated Zoneline 1317533
 2017-08-09 15:28:16 +02:00
SapphireMordred
caca1b1439 Merge pull request #13 from AcedArmy/Updated-Zoneline-1317533 
Updated Zoneline 1317533
 2017-08-09 15:28:16 +02:00
Biscuit Boy
d382b4d113 Updated Zoneline 1317533 
Zoneline 1317533 will no longer put you back into Old Grid
 2017-08-09 23:17:15 +10:00
Biscuit Boy
c40c7574bb Updated Zoneline 1317533 
Zoneline 1317533 will no longer put you back into Old Grid
 2017-08-09 23:17:15 +10:00
SapphireMordred
fc4a2c5062 Merge pull request #12 from takhlaq/editorconfig 
add editorconfig file
 2017-08-09 15:09:23 +02:00
SapphireMordred
d6c93f7cad Merge pull request #12 from takhlaq/editorconfig 
add editorconfig file
 2017-08-09 15:09:23 +02:00
SapphireMordred
bd6a32781b Merge pull request #11 from amibu01/master 
Chat output for ZoneLines
 2017-08-09 15:04:12 +02:00
SapphireMordred
7a04724bc6 Merge pull request #11 from amibu01/master 
Chat output for ZoneLines
 2017-08-09 15:04:12 +02:00
amibu
e6c9c959f2 ZoneLine chat output 2017-08-09 15:02:24 +02:00
amibu
757105403a ZoneLine chat output 2017-08-09 15:02:24 +02:00
Tahir Akhlaq
da93ea0de2 add editorconfig file 2017-08-09 13:44:57 +01:00
Tahir Akhlaq
962a11ee72 add editorconfig file 2017-08-09 13:44:57 +01:00
SapphireMordred
2881fd43ed Merge pull request #10 from amibu01/master 
Add "@set classjob" command
 2017-08-09 14:41:23 +02:00
SapphireMordred
188db87409 Merge pull request #10 from amibu01/master 
Add "@set classjob" command
 2017-08-09 14:41:23 +02:00
amibu
eeee74d523 Add "@set classjob" command 2017-08-09 14:38:46 +02:00
amibu
4c2339ccfa Add "@set classjob" command 2017-08-09 14:38:46 +02:00
Mordred Admin
3924e5450c Please use spaces instead of tabs 2017-08-09 10:30:18 +02:00
Mordred Admin
d939f55836 Please use spaces instead of tabs 2017-08-09 10:30:18 +02:00
SapphireMordred
b00aadf19e Merge pull request #9 from zynjec/master 
Standardize log location
 2017-08-09 00:38:30 +02:00
SapphireMordred
38e42eaf7c Merge pull request #9 from zynjec/master 
Standardize log location
 2017-08-09 00:38:30 +02:00
Mordred
1f10c555f8 Fixed level 0 and no weapon bug 2017-08-09 00:36:26 +02:00
Mordred
686d55dafc Fixed level 0 and no weapon bug 2017-08-09 00:36:26 +02:00
Zynjec
7bc9873ed4 Standardize log location 
Updated REST and Zone server to use log folder.
 2017-08-08 18:35:31 -04:00
Zynjec
43d29984e2 Standardize log location 
Updated REST and Zone server to use log folder.
 2017-08-08 18:35:31 -04:00
SapphireMordred
5ccba7ce61 Merge pull request #7 from amibu01/master 
Added PoC PS4 Support back
 2017-08-08 22:50:47 +02:00
amibu
e943187d10 PS4 insert html 2017-08-08 22:56:48 +02:00