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

309 commits

This branch
This branch
All branches
Author SHA1 Message Date
SapphireMordred
882bdb9bad Merge pull request #21 from takhlaq/travis 
travis build crap
 2017-08-10 00:41:05 +02:00
Tahir Akhlaq
e79f1b9689 travis build crap 2017-08-09 23:38:08 +01:00
Mordred
d8af791d53 Merge branch 'master' of https://github.com/SapphireMordred/Sapphire 2017-08-09 23:13:52 +02:00
Mordred
fe1909b4ee Fixed red circle in exp bar 2017-08-09 23:13:27 +02:00
SapphireMordred
568a88ac73 Merge pull request #19 from amibu01/master 
Chai bindings for status effects, Sprint script
 2017-08-09 22:52:38 +02:00
Mordred
f6679f7ad0 Fixed levelup crashing the client occasionally 2017-08-09 22:50:59 +02:00
amibu
0a62578590 Chai bindings for status effects, Sprint script 2017-08-09 22:31:24 +02:00
SapphireMordred
e38c0aa1f7 Merge pull request #18 from Minoost/matchmaking 
Unlock all duty finder contents on login
 2017-08-09 19:35:48 +02:00
Minho Kang
6109a191b2 Unlock all contents in duty finder for now 2017-08-10 00:41:37 +09:00
Mordred
518ba5898a Travis... why do you hate me... 2017-08-09 17:32:41 +02:00
Mordred
983d39521e ... Travis... 2017-08-09 17:30:17 +02:00
Mordred
847910f183 Fair enough travis... well played... 2017-08-09 17:26:34 +02:00
Mordred
77da4d1b4d another travis test 2017-08-09 17:23:02 +02:00
Mordred
ceeafa6737 travis test 2017-08-09 17:19:06 +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
Minho Kang
0914e1dbd5 Merge branch 'master' into matchmaking 2017-08-10 00:14:03 +09: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
e49dff4d4d Test .travis.yml 2017-08-09 16:36:19 +02:00
SapphireMordred
5334367c34 Merge pull request #14 from Minoost/master 
Add SapphireLibs as a submodule
 2017-08-09 16:26:54 +02:00
Minho Kang
77aec38a75 Add libraries as a submodule 2017-08-09 23:19:14 +09:00
Minho Kang
3fa66835f5 Add dutyreg packet definition and opcodes 2017-08-09 23:15:55 +09:00
Minho Kang
405d7983c1 Merge remote-tracking branch 'upstream/master' 2017-08-09 23:14:46 +09:00
amibu
78452638df PoC Skill Scripting 2017-08-09 16:08:43 +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
c40c7574bb Updated Zoneline 1317533 
Zoneline 1317533 will no longer put you back into Old Grid
 2017-08-09 23:17:15 +10:00
SapphireMordred
d6c93f7cad Merge pull request #12 from takhlaq/editorconfig 
add editorconfig file
 2017-08-09 15:09:23 +02:00
SapphireMordred
7a04724bc6 Merge pull request #11 from amibu01/master 
Chat output for ZoneLines
 2017-08-09 15:04:12 +02:00
amibu
757105403a ZoneLine chat output 2017-08-09 15:02:24 +02:00
Tahir Akhlaq
962a11ee72 add editorconfig file 2017-08-09 13:44:57 +01:00
SapphireMordred
188db87409 Merge pull request #10 from amibu01/master 
Add "@set classjob" command
 2017-08-09 14:41:23 +02:00
amibu
4c2339ccfa Add "@set classjob" command 2017-08-09 14:38:46 +02:00
Mordred Admin
d939f55836 Please use spaces instead of tabs 2017-08-09 10:30:18 +02:00
SapphireMordred
38e42eaf7c Merge pull request #9 from zynjec/master 
Standardize log location
 2017-08-09 00:38:30 +02:00
Mordred
686d55dafc Fixed level 0 and no weapon bug 2017-08-09 00:36:26 +02:00
Zynjec
43d29984e2 Standardize log location 
Updated REST and Zone server to use log folder.
 2017-08-08 18:35:31 -04:00
SapphireMordred
e81d7c2538 Merge pull request #7 from amibu01/master 
Added PoC PS4 Support back
 2017-08-08 22:50:47 +02:00
amibu
226b0d5f8a PS4 insert html 2017-08-08 22:56:48 +02:00
amibu
97580d6460 Added hacky PS4 support back 2017-08-08 22:55:02 +02:00
SapphireMordred
8bf197c3c9 Merge pull request #6 from zynjec/patch-1 
Updated table name in 'discovery_pos'
 2017-08-08 21:35:31 +02:00
zynjec
c258bffb2a Updated table name in 'discovery_pos' 
Table was renamed from dbdiscoveryref to discoveryinfo, updating to reflect that.
 2017-08-08 15:17:34 -04:00
SapphireMordred
9fa34626c0 Merge pull request #5 from Minoost/master 
Fix zoneline
 2017-08-08 19:51:40 +02:00
SapphireMordred
24b10a25c6 Merge pull request #4 from amibu01/master 
GM Command opcodes, gitignore update for libraries, set expansion
 2017-08-08 19:51:21 +02:00
amibu
81a1c006f7 Added unlockaetheryte command 2017-08-08 19:24:41 +02:00
Minho Kang
861957fe33 Merge remote-tracking branch 'upstream/master' 2017-08-09 01:52:22 +09:00
Minho Kang
4ea0da2505 Fix zoneline handler 
Old table name was still in use.
 2017-08-09 01:49:23 +09:00
amibu
1151e19154 GM command opcodes 2017-08-08 18:22:18 +02:00
amibu
45b2fa55b7 Set expansion level, update gitignore for libraries 2017-08-08 18:05:56 +02:00
Mordred Admin
b6d89381ab Merge branch 'master' of https://github.com/SapphireMordred/Sapphire 2017-08-08 18:04:29 +02:00
Mordred Admin
2758b4e536 Added field for expansion in InitUI 2017-08-08 18:03:39 +02:00
Mordred Admin
35c35f9b02 Lazy hack for windows compiling issue 2017-08-08 14:25:04 +02:00