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

6588 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
amibu
424a1a787e Updated SQL 2017-09-11 19:06:53 +02:00
amibu
348ca42f0e GM Ranks, some fixes 2017-09-11 18:59:50 +02:00
amibu
cb7c6ab65e GM Ranks, some fixes 2017-09-11 18:59:50 +02:00
SapphireMordred
316f53b9db Merge pull request #92 from Minoost/pathscript 
Ported dump vfs path script to 4.06
 2017-09-10 17:45:03 +02:00
SapphireMordred
56826a975e Merge pull request #92 from Minoost/pathscript 
Ported dump vfs path script to 4.06
 2017-09-10 17:45:03 +02:00
SapphireMordred
e6b3123462 Merge pull request #91 from amibu01/master 
MotDs in array, full player sync after GM commands
 2017-09-10 17:44:43 +02:00
SapphireMordred
6b899b0fee Merge pull request #91 from amibu01/master 
MotDs in array, full player sync after GM commands
 2017-09-10 17:44:43 +02:00
Adam
0ddc2a7bed Ported dump vfs path script to 4.06 2017-09-10 23:52:50 +09:00
Minho Kang
e532d4b314 Ported dump vfs path script to 4.06 2017-09-10 23:52:50 +09:00
amibu
b9f8b06ea7 Put MotDs into a array to send multiple 2017-09-10 16:47:40 +02:00
amibu
4b914aae3c Put MotDs into a array to send multiple 2017-09-10 16:47:40 +02:00
amibu
f2ab6ec201 Force full player sync after GM command usage 2017-09-10 16:15:48 +02:00
amibu
d6966d7df2 Force full player sync after GM command usage 2017-09-10 16:15:48 +02:00