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

2593 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
amibu
5e2a9927f1 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
Adam
1ad797d583 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
Adam
6235c834aa 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
SapphireMordred
b2d07cc175 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
SapphireMordred
fc4a2c5062 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
amibu
e6c9c959f2 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
SapphireMordred
2881fd43ed 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
Mordred Admin
3924e5450c 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
Mordred
1f10c555f8 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
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
amibu
c1d287b15b Added hacky PS4 support back 2017-08-08 22:55:02 +02:00
SapphireMordred
cb9a672cdd Merge pull request #6 from zynjec/patch-1 
Updated table name in 'discovery_pos'
 2017-08-08 21:35:31 +02:00
zynjec
5579e5ab34 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
b94499e901 Merge pull request #5 from Minoost/master 
Fix zoneline
 2017-08-08 19:51:40 +02:00
SapphireMordred
5d40abc877 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
d4a86366dd Added unlockaetheryte command 2017-08-08 19:24:41 +02:00
Adam
1a4706a8df Merge remote-tracking branch 'upstream/master' 2017-08-09 01:52:22 +09:00
Adam
d67e6fdabd Fix zoneline handler 
Old table name was still in use.
 2017-08-09 01:49:23 +09:00
amibu
28370ebd30 GM command opcodes 2017-08-08 18:22:18 +02:00
amibu
c28fcdd02b Set expansion level, update gitignore for libraries 2017-08-08 18:05:56 +02:00
Mordred Admin
72a631a961 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
SapphireMordred
9267fc7ebf Merge pull request #3 from Minoost/master 
Add gitignore and fix UtilMath::clamp
 2017-08-08 14:05:42 +02:00
Minho Kang
004c665f03 Merge branch 'master' into master 2017-08-08 21:04:22 +09:00
Adam
015fa17628 Add gitignore and fix UtilMath::clamp 2017-08-08 21:01:09 +09:00
Mordred Admin
e691d0504a Initial commit of the sapphire server 2017-08-08 13:53:47 +02:00
SapphireMordred
4ca8b7ab28 Merge pull request #2 from amibu01/master 
Fix for StatusIcons
 2017-08-08 13:16:05 +02:00
amibu
cd2982a158 Fix for StatusIcons 2017-08-08 13:18:55 +02:00
amibu
ffcb90aa24 Added gitignore from Sapphire2 2017-08-08 13:07:17 +02:00
amibu
7fcffb7f0b Default port for REST to 80(frontier) and restoring frontier additions to REST 2017-08-08 13:05:33 +02:00
SapphireMordred
ffaabf1b9d Merge pull request #1 from amibu01/master 
Default rest port should probably be changed to 8080 though
 2017-08-08 13:04:01 +02:00