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

280 commits

This branch
This branch
All branches
Author SHA1 Message Date
Maru
f2b486dbde Adjustments to new definitions of action effect packet; 2017-09-19 00:42:27 -03:00
Maru
c5669558ae Definitions for Action Effects; Further (possibly temporary) changes to AoE heal packets; 2017-09-18 23:14:43 -03:00
Maru
62734c7616 Map actions as pointers; Prototype AoE healing; 2017-09-18 19:07:41 -03:00
Mordred
1659324118 Build fix 2017-09-15 14:05:45 +02:00
Mordred
90c553e0a8 getGmRank now actually returns the gm rank. Also const correctness 2017-09-15 12:29:47 +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
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
82d8ded088 Merge pull request #100 from AcedArmy/master 
Fixed the Lobby ContentID Problem
 2017-09-15 11:17:02 +02:00
Mordred
947bb20e3c Also adjusted item loading 2017-09-15 11:07:12 +02:00
Mordred
9f8473fc10 Fixed indendation 2017-09-15 11:04:42 +02: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
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
d620f0763d Status effect source reference; ActionCast battle log work; Cleaning compiler warnings; 2017-09-15 00:56:29 -03:00
Mordred
3440e3495b Merge pull request #98 from amibu01/master 
Add basic server info command
 2017-09-14 17:41:37 +02:00
Mordred
7d8e62d95f no qualifiers in headers 2017-09-14 17:28:24 +02:00
amibu
22b983cdcf Style fixes 2017-09-14 17:19:44 +02:00
amibu
fd353792c2 Add basic server info command 2017-09-14 17:07:58 +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
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
df7f83a72a Merge remote-tracking branch 'SapphireRemote/master' 2017-09-13 17:19:03 -04: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
7b945650f2 Merge pull request #96 from Minoost/master 
Add SetOwnerId def
 2017-09-13 09:06:47 +02:00
Minho Kang
47c2a1ee6a Add setownerid 
Set source actor's owner id to param1
 2017-09-13 11:47:39 +09:00
Minho Kang
0c37547000 Merge remote-tracking branch 'upstream/master' 2017-09-13 11:45:03 +09:00
SapphireMordred
5e97af6822 Merge pull request #93 from amibu01/master 
GM Ranks, some fixes
 2017-09-11 20:29:49 +02:00
amibu
424a1a787e Updated SQL 2017-09-11 19:06:53 +02:00
amibu
cb7c6ab65e GM Ranks, some fixes 2017-09-11 18:59:50 +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
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
Minho Kang
e532d4b314 Ported dump vfs path script to 4.06 2017-09-10 23:52:50 +09:00
amibu
4b914aae3c Put MotDs into a array to send multiple 2017-09-10 16:47:40 +02:00
amibu
d6966d7df2 Force full player sync after GM command usage 2017-09-10 16:15:48 +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
e119a836c5 Merge pull request #89 from amibu01/master 
Changeable World name + MotD
 2017-09-10 09:55:15 +02:00
Minho Kang
c43874990a Add chat restricted packet def 2017-09-10 14:02:16 +09:00
amibu
b999639f04 Changeable World name + MotD 2017-09-10 02:24:29 +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
f9f18886ec Floats are cool; 2017-09-07 23:36:31 -03:00
Maru
62a198c0d8 New BaseStat formulas (SB, HW, ARR) 2017-09-07 22:09:30 -03: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
fd3d8151c8 Add status table 2017-09-06 20:26:05 +02:00
amibu
dea2cc1507 Make players spawn with StatusEffects 2017-09-06 20:25:58 +02:00
amibu
59bacef68c Fix news.xml 2017-09-06 20:25:41 +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
23bf5980ca Merge pull request #85 from AcedArmy/master 
Updated Sapphire Launcher HTML with New Look
 2017-09-06 08:24:16 +02:00
Biscuit Boy
25ff8595b3 Updated Sapphire Launcher HTML with New Look 
Updated the Sapphire HTML with a New Look https://uploads.ninty.ninja/i/q8zyy.png
 2017-09-06 04:20:30 +10:00
Maru
161d24f505 Might as well refactor a bit more; 2017-09-05 00:37:22 -03:00
Maru
353f2a3cd0 🔥 Build ✔️ please 2017-09-04 06:53:04 -03:00
SapphireMordred
b6a20b465c Merge pull request #83 from takhlaq/edit_and_continue 
updated CMakeSettings.json for edit and continue
 2017-09-04 08:15:53 +02:00
Maru
68e862d95b Redefining: ActionModel and ActionAspect; Action for removing status effect off from HUD; 2017-09-04 01:36:19 -03:00