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

34 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
SapphireMordred
b0d8679f66 Merge pull request #3 from Minoost/master 
Add gitignore and fix UtilMath::clamp
 2017-08-08 14:05:42 +02:00
Minho Kang
569ae6eac1 Merge branch 'master' into master 2017-08-08 21:04:22 +09:00
Minho Kang
3c6b8276b8 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