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

6451 commits

This branch
This branch
All branches
Author SHA1 Message Date
amibu
8c597608d4 Remove UserLevel, handle DebugCommand permissions via internal GM rank 2017-09-18 18:44:38 +02:00
Mordred
d12db28951 Build fix 2017-09-15 14:05:45 +02:00
Mordred
1659324118 Build fix 2017-09-15 14:05:45 +02:00
Mordred
c3b5d30322 getGmRank now actually returns the gm rank. Also const correctness 2017-09-15 12:29:47 +02:00
Mordred
90c553e0a8 getGmRank now actually returns the gm rank. Also const correctness 2017-09-15 12:29:47 +02:00
Mordred
0956d1eeee Merge pull request #101 from AcedArmy/master 
Added all Zonelines for Idyllshire
 2017-09-15 12:18:54 +02:00
Mordred
f20970586b Merge pull request #101 from AcedArmy/master 
Added all Zonelines for Idyllshire
 2017-09-15 12:18:54 +02:00
Biscuit Boy
cd345bfce4 Added all Zonelines for Idyllshire 
Added all of the Aethernet and zoneing positions to Idyllshire
 2017-09-15 20:15:18 +10:00
Biscuit Boy
6e20fc4b7c Added all Zonelines for Idyllshire 
Added all of the Aethernet and zoneing positions to Idyllshire
 2017-09-15 20:15:18 +10:00
Mordred
e8a6249226 Merge pull request #100 from AcedArmy/master 
Fixed the Lobby ContentID Problem
 2017-09-15 11:17:02 +02:00
Mordred
82d8ded088 Merge pull request #100 from AcedArmy/master 
Fixed the Lobby ContentID Problem
 2017-09-15 11:17:02 +02:00
Mordred
185c7e37ed Also adjusted item loading 2017-09-15 11:07:12 +02:00
Mordred
947bb20e3c Also adjusted item loading 2017-09-15 11:07:12 +02:00
Mordred
1b6b91490a Fixed indendation 2017-09-15 11:04:42 +02:00
Mordred
9f8473fc10 Fixed indendation 2017-09-15 11:04:42 +02:00
Biscuit Boy
4989f37eca Fixed ContentID 
Fixed the ContentID problem, This is a fix until the new db stuff
 2017-09-15 18:43:08 +10:00
Biscuit Boy
608119ede3 Fixed ContentID 
Fixed the ContentID problem, This is a fix until the new db stuff
 2017-09-15 18:43:08 +10:00
Mordred
8a63ea44bd Merge pull request #99 from itsmaru/master 
Status effect source reference; ActionCast battle log work; Cleaning compiler warnings up a bit;
 2017-09-15 07:43:35 +02:00
Mordred
ddc39143ce Merge pull request #99 from itsmaru/master 
Status effect source reference; ActionCast battle log work; Cleaning compiler warnings up a bit;
 2017-09-15 07:43:35 +02:00
Maru
597a7e8900 Status effect source reference; ActionCast battle log work; Cleaning compiler warnings; 2017-09-15 00:56:29 -03:00
Maru
d620f0763d Status effect source reference; ActionCast battle log work; Cleaning compiler warnings; 2017-09-15 00:56:29 -03:00
Mordred
b97162ba5d const correctness 2017-09-14 18:49:03 +02:00
Mordred
522dc15c39 const correctness 2017-09-14 18:49:03 +02:00
Mordred
1495b263d9 Begin of implementation of own simplified mysql c++ wrapper 2017-09-14 18:39:12 +02:00
Mordred
87bb613782 Begin of implementation of own simplified mysql c++ wrapper 2017-09-14 18:39:12 +02:00
Mordred
201a2e0623 Merge pull request #98 from amibu01/master 
Add basic server info command
 2017-09-14 17:41:37 +02:00
Mordred
3440e3495b Merge pull request #98 from amibu01/master 
Add basic server info command
 2017-09-14 17:41:37 +02:00
Mordred
40be07ac29 no qualifiers in headers 2017-09-14 17:28:24 +02:00
Mordred
7d8e62d95f no qualifiers in headers 2017-09-14 17:28:24 +02:00
amibu
9453134196 Style fixes 2017-09-14 17:19:44 +02:00
amibu
22b983cdcf Style fixes 2017-09-14 17:19:44 +02:00
amibu
a902987feb Add basic server info command 2017-09-14 17:07:58 +02:00
amibu
fd353792c2 Add basic server info command 2017-09-14 17:07:58 +02:00
Mordred
970c11e503 Merge pull request #97 from razor950/master 
Added git revision support to sapphire
 2017-09-14 00:18:02 +02:00
Mordred
f3efcbe08d Merge pull request #97 from razor950/master 
Added git revision support to sapphire
 2017-09-14 00:18:02 +02:00
Carlos C
d593e2b47e Add sapphire version string 
need to implement location(s) where to show git revision / version in core

server info & logs come to mind
 2017-09-13 18:06:31 -04:00
Carlos C
782698c814 Add sapphire version string 
need to implement location(s) where to show git revision / version in core

server info & logs come to mind
 2017-09-13 18:06:31 -04:00
Carlos C
d1b4a70c11 Merge remote-tracking branch 'SapphireRemote/master' 2017-09-13 17:19:03 -04:00
Carlos C
df7f83a72a Merge remote-tracking branch 'SapphireRemote/master' 2017-09-13 17:19:03 -04:00
Mordred Admin
924a4b3973 Majorly simplified and improved the cmake setup. 
Going forward it will be alot easier to maintain.

TODO: simplify path definitions

Conflicts:
	src/servers/Server_Lobby/CMakeLists.txt
	src/servers/Server_REST/CMakeLists.txt
	src/servers/Server_Zone/CMakeLists.txt
 2017-09-13 11:46:17 +02:00
Mordred Admin
8682f334bc Majorly simplified and improved the cmake setup. 
Going forward it will be alot easier to maintain.

TODO: simplify path definitions

Conflicts:
	src/servers/Server_Lobby/CMakeLists.txt
	src/servers/Server_REST/CMakeLists.txt
	src/servers/Server_Zone/CMakeLists.txt
 2017-09-13 11:46:17 +02:00
Mordred
a8d6d8e8fd Merge pull request #96 from Minoost/master 
Add SetOwnerId def
 2017-09-13 09:06:47 +02:00
Mordred
7b945650f2 Merge pull request #96 from Minoost/master 
Add SetOwnerId def
 2017-09-13 09:06:47 +02:00
Adam
5504156b56 Add setownerid 
Set source actor's owner id to param1
 2017-09-13 11:47:39 +09:00
Minho Kang
47c2a1ee6a Add setownerid 
Set source actor's owner id to param1
 2017-09-13 11:47:39 +09:00
Adam
21a1837306 Merge remote-tracking branch 'upstream/master' 2017-09-13 11:45:03 +09:00
Minho Kang
0c37547000 Merge remote-tracking branch 'upstream/master' 2017-09-13 11:45:03 +09:00
SapphireMordred
b10b3029f3 Merge pull request #93 from amibu01/master 
GM Ranks, some fixes
 2017-09-11 20:29:49 +02:00
SapphireMordred
5e97af6822 Merge pull request #93 from amibu01/master 
GM Ranks, some fixes
 2017-09-11 20:29:49 +02:00
amibu
ad5eae79ee Updated SQL 2017-09-11 19:06:53 +02:00