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

5422 commits

Author SHA1 Message Date
Mordred
43702776be Merge branch 'SQL_REWRITE_OWN' of https://github.com/SapphireMordred/Sapphire into SQL_REWRITE_OWN 2017-09-19 23:13:02 +02:00
Mordred
9430358b48 Added transactions 2017-09-19 23:12:46 +02:00
Mordred
ee73eedc85 Added transactions 2017-09-19 23:12:46 +02:00
Minho Kang
720ef9d702 Fix indent 2017-09-19 23:33:49 +09:00
Adam
cf1365a5d0 Fix indent 2017-09-19 23:33:49 +09:00
Mordred Admin
ab8f9a55d6 Wrapping helpers in util namespace 2017-09-19 10:59:42 +02:00
Mordred Admin
dad2e255f5 Wrapping helpers in util namespace 2017-09-19 10:59:42 +02:00
Mordred
22fb4c681e Merge pull request #102 from amibu01/master 
Remove UserLevel, handle DebugCommand permissions via internal GM rank
 2017-09-19 08:05:21 +02:00
Mordred
81025faf7e Merge pull request #102 from amibu01/master 
Remove UserLevel, handle DebugCommand permissions via internal GM rank
 2017-09-19 08:05:21 +02:00
Maru
f2b486dbde Adjustments to new definitions of action effect packet; 2017-09-19 00:42:27 -03:00
Maru
069ab78e7e 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
07c73b62fa Definitions for Action Effects; Further (possibly temporary) changes to AoE heal packets; 2017-09-18 23:14:43 -03:00
Mordred
3f524dc08c Fix linux build, needs some love for the warnings 2017-09-19 00:20:45 +02:00
Mordred
1031d66522 Fix linux build, needs some love for the warnings 2017-09-19 00:20:45 +02:00
Maru
62734c7616 Map actions as pointers; Prototype AoE healing; 2017-09-18 19:07:41 -03:00
Maru
f5f8acb774 Map actions as pointers; Prototype AoE healing; 2017-09-18 19:07:41 -03:00
Mordred
40bc05cf71 First iteration of new mysql wrapper 2017-09-19 00:02:14 +02:00
Mordred
1faa3c3898 First iteration of new mysql wrapper 2017-09-19 00:02:14 +02:00
amibu
8c597608d4 Remove UserLevel, handle DebugCommand permissions via internal GM rank 2017-09-18 18:44:38 +02:00
amibu
00d5e93e74 Remove UserLevel, handle DebugCommand permissions via internal GM rank 2017-09-18 18:44:38 +02:00
Mordred
1659324118 Build fix 2017-09-15 14:05:45 +02:00
Mordred
d12db28951 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
c3b5d30322 getGmRank now actually returns the gm rank. Also const correctness 2017-09-15 12:29:47 +02:00
Mordred
947bb20e3c Also adjusted item loading 2017-09-15 11:07:12 +02:00
Mordred
185c7e37ed Also adjusted item loading 2017-09-15 11:07:12 +02:00
Mordred
9f8473fc10 Fixed indendation 2017-09-15 11:04:42 +02:00
Mordred
1b6b91490a 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
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
Maru
d620f0763d Status effect source reference; ActionCast battle log work; Cleaning compiler warnings; 2017-09-15 00:56:29 -03:00
Maru
597a7e8900 Status effect source reference; ActionCast battle log work; Cleaning compiler warnings; 2017-09-15 00:56:29 -03:00
Mordred
522dc15c39 const correctness 2017-09-14 18:49:03 +02:00
Mordred
b97162ba5d const correctness 2017-09-14 18:49:03 +02:00
Mordred
87bb613782 Begin of implementation of own simplified mysql c++ wrapper 2017-09-14 18:39:12 +02:00
Mordred
1495b263d9 Begin of implementation of own simplified mysql c++ wrapper 2017-09-14 18:39:12 +02:00
Mordred
7d8e62d95f no qualifiers in headers 2017-09-14 17:28:24 +02:00
Mordred
40be07ac29 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
9453134196 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
amibu
a902987feb Add basic server info command 2017-09-14 17:07:58 +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
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
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 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
Minho Kang
47c2a1ee6a Add setownerid 
Set source actor's owner id to param1
 2017-09-13 11:47:39 +09:00
Adam
5504156b56 Add setownerid 
Set source actor's owner id to param1
 2017-09-13 11:47:39 +09:00
SapphireMordred
5e97af6822 Merge pull request #93 from amibu01/master 
GM Ranks, some fixes
 2017-09-11 20:29:49 +02:00