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

1785 commits

This branch
This branch
All branches
Author SHA1 Message Date
mordred
b1ad06642c Merge branch 'boost_scrap' of https://github.com/SapphireMordred/Sapphire into boost_scrap 2018-10-25 12:17:53 +02:00
mordred
882b88885e Fixed datreader 2018-10-25 12:17:40 +02:00
Mordred
2b5d92fe86 Merge pull request #410 from NotAdam/boost_scrap 
fix ini parsing
 2018-10-25 09:02:57 +02:00
NotAdam
e8be2b6505 Merge remote-tracking branch 'upstream/boost_scrap' into boost_scrap 2018-10-25 17:48:35 +11:00
NotAdam
dc85c5b422 merge config files and update config calls 2018-10-25 17:48:30 +11:00
Mordred
72f74efdc1 Merge pull request #409 from NotAdam/boost_scrap 
add spdlog, remove more boost
 2018-10-25 08:02:07 +02:00
NotAdam
9c3ff73bf6 fix file extension for log files & always flush log on critical messages 2018-10-25 15:39:36 +11:00
NotAdam
1b267f55d3 api now links successfully 2018-10-25 15:25:55 +11:00
NotAdam
ae0af25ea8 remove more boost from api 2018-10-25 14:16:47 +11:00
NotAdam
0684149310 more boost gone & remove duplicated watchdog lib 2018-10-25 13:38:32 +11:00
NotAdam
42064014ac remove more boost 2018-10-25 12:44:51 +11:00
NotAdam
e357521ee6 add spdlog, remove boost is gone from common 2018-10-25 12:21:22 +11:00
mordred
28b5fd0714 Server Lobby boost scrapping ( does not link atm 2018-10-24 23:39:11 +02:00
mordred
b153c81e2e Added inih and repalced property_tree usage in ConfigMgr 2018-10-24 23:02:30 +02:00
mordred
0d4d204297 More boost removed from common 2018-10-24 17:58:57 +02:00
mordred
5cf7281fc2 Updated travis to use gcc for the time being 2018-10-24 16:04:19 +02:00
mordred
d5f59a72f0 Boost asio no longer used 2018-10-24 16:01:30 +02:00
mordred
a9ee2a7ebc Added asio as submodule, some initial network changes 2018-10-24 15:17:40 +02:00
Mordred
990a656a72 Merge pull request #407 from NotAdam/deps-folder 
remove sapphirelibs, move to deps folder
 2018-10-24 14:33:45 +02:00
NotAdam
bfa6dd1b30 remove sapphirelibs, move to deps folder 2018-10-24 23:31:26 +11:00
mordred
e2598afe6d Merge remote-tracking branch 'origin/develop' into boost_scrap 2018-10-24 14:00:56 +02:00
mordred
79978bf778 Remove the need for boost interprocess 2018-10-24 13:52:27 +02:00
mordred
72a034d92a More boost removal 2018-10-24 13:14:14 +02:00
mordred
81cd0558e4 dbm is not part of this 2018-10-24 12:56:41 +02:00
mordred
873667cb86 Removing boost from common 2018-10-24 12:53:26 +02:00
Mordred
274502f658 Merge pull request #404 from Squall5668/SoulCrystals 
ClassJob changes when changing Soul Crystals
 2018-10-20 16:47:46 +02:00
Squall Leonhart
d728ecdaf4 These should be the only references. 2018-10-20 15:39:20 +03:00
Squall Leonhart
da89793d56 No space 2018-10-20 14:36:56 +03:00
Squall Leonhart
78b8de04b4 Add equipSoulCrystal & unequipSoulCrystal 2018-10-20 14:20:39 +03:00
Squall Leonhart
679686e6ff Add level1 to setCLassJob. 2018-10-20 13:56:01 +03:00
Mordred
ddae03382a Merge remote-tracking branch 'origin/develop' 2018-10-19 18:53:55 +02:00
Mordred
97111d79e0 Merge pull request #403 from Squall5668/develop 
Thanks Adam. Change c-style cast.
 2018-10-19 18:53:38 +02:00
Squall Leonhart
44980a74b9 Thanks Adam. Change c-style cast. 2018-10-19 16:48:18 +03:00
Mordred
c35f70fdfc Merge pull request #402 from Squall5668/develop 
Add class change on weapon swaps. Also adds a forgotten inventory on character creation.
 2018-10-19 09:40:12 +02:00
Squall Leonhart
19f7bf82c9 Fixes logon crash when using weapon of another class. 2018-10-18 20:59:04 +03:00
Mordred
6f8200db44 Merge pull request #401 from KBiscuit/updates/packetDefs 
ModelEquip Updates
 2018-10-18 12:38:47 +02:00
Biscuit
8588d549ba ModelEquip Updates 
Turns out padding1 holds some extra stuff
 2018-10-18 20:46:55 +11:00
Squall Leonhart
3d5e794d6e Code style. 2018-10-18 07:48:34 +03:00
Squall Leonhart
a503a6007f Implements class change on weapon swap. 2018-10-17 23:25:41 +03:00
Squall Leonhart
91d5ece427 Add ArmorySoulCrystal on new character creation. 2018-10-16 20:06:30 +03:00
Mordred
99e4a90708 Merge pull request #399 from Squall5668/develop 
Fixes disappearing soul crystals on re-logging.
 2018-10-15 20:45:30 +02:00
Squall Leonhart
6d3896dc72 Fixes disappearing soul crystals on re-logging. 2018-10-15 21:38:39 +03:00
Mordred
6fb2765e30 Opps, thanks Squall. ( missing backtick ) 2018-10-15 08:16:57 +02:00
Mordred
b622764cf7 Fixed an error in Update.sql 2018-10-15 08:06:39 +02:00
Mordred
eb39de6f34 Merge pull request #398 from NotAdam/develop 
minor reference cleanup and compile warning fixes
 2018-10-14 16:09:36 +02:00
NotAdam
c06ce46e38 Merge remote-tracking branch 'upstream/develop' into develop 2018-10-14 23:36:05 +11:00
NotAdam
dbbd6bb530 cleanup unnecessary refs 2018-10-14 23:31:52 +11:00
NotAdam
638b84d31d fix some compiler warnings 2018-10-14 19:20:06 +11:00
Mordred
7259af9273 Merge pull request #397 from NotAdam/develop 
ReqServiceAccountList -> ClientVersionInfo, only version info is in the packet
 2018-10-14 09:37:46 +02:00
NotAdam
88c0559877 Merge remote-tracking branch 'origin/develop' into develop 2018-10-14 18:33:23 +11:00