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

275 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mordred
14a26f3bfd stdexcept header for linux# 2017-09-23 23:56:49 +02:00
Mordred
696cbc6039 More formatting and linux stuff 2017-09-23 23:47:42 +02:00
Mordred
224b75da48 Some formatting oversights 2017-09-23 23:40:32 +02:00
Mordred
438f66732b Linux build fix 2017-09-23 23:36:45 +02:00
Mordred
4e25fa0ed7 Implemented prepared statmements 2017-09-23 23:26:23 +02:00
Mordred
98899756fb Linux needs memcopy from string.h 2017-09-20 18:34:38 +02:00
Mordred
58517dc731 Removed unneeded string 2017-09-20 18:27:00 +02:00
Mordred
271c857d40 Blob fields can now be returned as vector. 2017-09-20 18:25:51 +02:00
Mordred
6f62b2f13b 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 Admin
ab8f9a55d6 Wrapping helpers in util namespace 2017-09-19 10:59:42 +02:00
Mordred
3f524dc08c Fix linux build, needs some love for the warnings 2017-09-19 00:20:45 +02:00
Mordred
40bc05cf71 First iteration of new mysql wrapper 2017-09-19 00:02:14 +02:00
Mordred
522dc15c39 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 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
Tahir Akhlaq
10e7dee216 updated CMakeSettings.json for edit and continue 2017-09-04 03:19:40 +01:00
Maru
a8ce37b419 Merge branch 'master' of https://github.com/SapphireMordred/Sapphire 2017-09-03 13:39:22 -03:00
SapphireMordred
0889564230 Merge pull request #82 from takhlaq/edit_and_continue 
enabled edit and continue on windows
 2017-09-03 08:31:04 +02:00
Tahir Akhlaq
0ecf2bd962 enabled edit and continue on windows 
- usage: tools > options > debugging > general > enable edit and continue (tick all options within its subtree)
 - attach vs to a server, edit its code, alt + f10
 2017-09-03 03:25:12 +01:00
Maru
2d15367c7d Definitions for Action type and aspect; 2017-09-02 18:24:31 -03:00