mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-02 16:57:47 +00:00
Code Activity
6262 commits 10 branches 14 tags 26 MiB
Commit graph

6262 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
SapphireMordred
ab5dd65ddb Merge pull request #90 from Minoost/master 
Add chat restricted packet def
 2017-09-10 09:55:35 +02:00
SapphireMordred
09bf2cfddf Merge pull request #90 from Minoost/master 
Add chat restricted packet def
 2017-09-10 09:55:35 +02:00
SapphireMordred
c853206729 Merge pull request #89 from amibu01/master 
Changeable World name + MotD
 2017-09-10 09:55:15 +02:00
SapphireMordred
e119a836c5 Merge pull request #89 from amibu01/master 
Changeable World name + MotD
 2017-09-10 09:55:15 +02:00
Adam
6ffb9e90d5 Add chat restricted packet def 2017-09-10 14:02:16 +09:00
Minho Kang
c43874990a Add chat restricted packet def 2017-09-10 14:02:16 +09:00
amibu
c6e208ffdf Changeable World name + MotD 2017-09-10 02:24:29 +02:00
amibu
b999639f04 Changeable World name + MotD 2017-09-10 02:24:29 +02:00
SapphireMordred
9739b92c46 Merge pull request #88 from itsmaru/master 
New BaseStat formulas (SB, HW, ARR)
 2017-09-08 08:24:03 +02:00
SapphireMordred
4d1f48968f Merge pull request #88 from itsmaru/master 
New BaseStat formulas (SB, HW, ARR)
 2017-09-08 08:24:03 +02:00
Maru
1dc07c7711 Floats are cool; 2017-09-07 23:36:31 -03:00
Maru
f9f18886ec Floats are cool; 2017-09-07 23:36:31 -03:00
Maru
7e1c73ae60 New BaseStat formulas (SB, HW, ARR) 2017-09-07 22:09:30 -03:00
Maru
62a198c0d8 New BaseStat formulas (SB, HW, ARR) 2017-09-07 22:09:30 -03:00
SapphireMordred
2c6dec165b Merge pull request #87 from amibu01/master 
Make Players spawn with StatusEffects, fix news.xml, without conflicts
 2017-09-06 21:32:30 +02:00
SapphireMordred
8910c5a3ea Merge pull request #87 from amibu01/master 
Make Players spawn with StatusEffects, fix news.xml, without conflicts
 2017-09-06 21:32:30 +02:00
amibu
7226d5d079 Add status table 2017-09-06 20:26:05 +02:00
amibu
fd3d8151c8 Add status table 2017-09-06 20:26:05 +02:00
amibu
1b49a53afc Make players spawn with StatusEffects 2017-09-06 20:25:58 +02:00
amibu
dea2cc1507 Make players spawn with StatusEffects 2017-09-06 20:25:58 +02:00
amibu
30d72ace1f Fix news.xml 2017-09-06 20:25:41 +02:00
amibu
59bacef68c Fix news.xml 2017-09-06 20:25:41 +02:00
SapphireMordred
c04b1c5386 Merge pull request #84 from itsmaru/master 
Definition for ActionModel and ActionAspect; Handling removing status from HUD (partial);
 2017-09-06 19:14:19 +02:00
SapphireMordred
e3f22108df Merge pull request #84 from itsmaru/master 
Definition for ActionModel and ActionAspect; Handling removing status from HUD (partial);
 2017-09-06 19:14:19 +02:00
SapphireMordred
324f11c909 Merge pull request #85 from AcedArmy/master 
Updated Sapphire Launcher HTML with New Look
 2017-09-06 08:24:16 +02:00
SapphireMordred
23bf5980ca Merge pull request #85 from AcedArmy/master 
Updated Sapphire Launcher HTML with New Look
 2017-09-06 08:24:16 +02:00