1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-27 22:57:45 +00:00
Commit graph

6109 commits

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
e7ab2f0327 travis build crap 2017-08-09 23:38:08 +01:00
Tahir Akhlaq
e79f1b9689 travis build crap 2017-08-09 23:38:08 +01:00
Mordred
978922c38a Merge branch 'master' of https://github.com/SapphireMordred/Sapphire 2017-08-09 23:13:52 +02:00
Mordred
d8af791d53 Merge branch 'master' of https://github.com/SapphireMordred/Sapphire 2017-08-09 23:13:52 +02:00
Mordred
2b5ed15794 Fixed red circle in exp bar 2017-08-09 23:13:27 +02:00
Mordred
fe1909b4ee Fixed red circle in exp bar 2017-08-09 23:13:27 +02:00
SapphireMordred
afa18e3a6f Merge pull request #19 from amibu01/master
Chai bindings for status effects, Sprint script
2017-08-09 22:52:38 +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
67a18a8253 Fixed levelup crashing the client occasionally 2017-08-09 22:50:59 +02:00
Mordred
f6679f7ad0 Fixed levelup crashing the client occasionally 2017-08-09 22:50:59 +02:00
amibu
89d9e54a85 Chai bindings for status effects, Sprint script 2017-08-09 22:31:24 +02:00
amibu
0a62578590 Chai bindings for status effects, Sprint script 2017-08-09 22:31:24 +02:00
SapphireMordred
0bc3116cb9 Merge pull request #18 from Minoost/matchmaking
Unlock all duty finder contents on login
2017-08-09 19:35:48 +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
Adam
de28fd909a Unlock all contents in duty finder for now 2017-08-10 00:41:37 +09:00
Minho Kang
6109a191b2 Unlock all contents in duty finder for now 2017-08-10 00:41:37 +09:00
Mordred
80ac11839b Travis... why do you hate me... 2017-08-09 17:32:41 +02:00
Mordred
518ba5898a Travis... why do you hate me... 2017-08-09 17:32:41 +02:00
Mordred
30d35f1bf4 ... Travis... 2017-08-09 17:30:17 +02:00
Mordred
983d39521e ... Travis... 2017-08-09 17:30:17 +02:00
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