1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-13 22:17:45 +00:00
Commit graph

478 commits

Author SHA1 Message Date
mordred
a4f2a1e4a8 Disabled cotire for a test 2018-10-26 13:40:39 +02:00
NotAdam
0e37785d31 zone and api work a bit better now 2018-10-26 22:14:12 +11:00
mordred
538189d8b9 More boost or... less boost. 2018-10-26 11:38:56 +02:00
mordred
929955013d sapphire_zone is now boost-free 2018-10-26 09:40:47 +02:00
mordred
d140acf613 57 occurances of boost to go 2018-10-26 08:25:20 +02:00
mordred
c5f4bb0659 Yet more boost gone 2018-10-25 23:50:18 +02:00
mordred
6d27d957e1 More boost gone 2018-10-25 15:15:27 +02:00
NotAdam
dc85c5b422 merge config files and update config calls 2018-10-25 17:48:30 +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
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
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
6d3896dc72 Fixes disappearing soul crystals on re-logging. 2018-10-15 21:38:39 +03: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
7d1291009f Merge pull request #396 from KBiscuit/updates/packetDefs
GMCommand1 & 2 almost fully mapped / Fixed /playtime
2018-10-14 09:16:14 +02:00
Biscuit
23c288489f Update GMCommand 1 and 2 Defs 2018-10-14 12:52:06 +11:00
root
d22cf7e762 Also include boost to_lower stuff 2018-09-26 09:25:19 -04:00
root
f6d4712929 Lexical cast missing on windows 2018-09-26 09:11:59 -04:00
root
d1efbe6307 Various small cleanups 2018-09-26 08:47:22 -04:00
root
94b111ee85 Fixed a couple compiler warnings 2018-09-26 03:32:43 -04:00
root
64a9eec055 Split up NativeScriptApi 2018-09-25 07:18:42 -04:00
Mordred
84e334d9bb Various cleanups and start of spawn system 2018-09-24 23:48:42 +02:00
Mordred
4d3988ed12 Merge pull request #389 from KBiscuit/develop
Lobby now shows correct info (fixes #328), Gm teri improvements, Discov ref is debug text
2018-09-24 22:20:19 +02:00
Biscuit Boy
b19a4ea35d style 2018-09-25 01:24:50 +10:00
Biscuit Boy
7b701781ad Examine works correctly again / Handles errors for GM's and diff zones 2018-09-25 01:11:14 +10:00
root
b89402e109 Some linker reorg 2018-09-24 09:03:29 -04:00
Mordred
02de786f60 Another build fix attempt 2018-09-22 15:04:18 +02:00
Mordred
a8a820b89c Linux build fix #2 2018-09-22 13:07:20 +02:00
Mordred
a3234bba44 More cmake cleanup 2018-09-22 09:57:40 +02:00
Biscuit Boy
efb0d74494 welcome back to moredreds coooode review!
today we are going to be hunting for some extra brackets in the sewer! so come along for the ride
2018-09-21 09:28:34 +10:00
Mordred
a2f03fd304 Some cmake cleanups 2018-09-20 23:31:38 +02:00
Biscuit Boy
e448863215 Style for mordred 2018-09-21 03:50:38 +10:00
Biscuit Boy
749490bb27 I can already hear the screams of mordred shouting style 2018-09-21 02:06:00 +10:00
Biscuit Boy
68d0fb7186 Discov ref should be a debug, not notice 2018-09-21 02:03:10 +10:00
Biscuit Boy
d8c71d69ca Gm teri will now tele to the main aetheryte if there is one in the zone 2018-09-21 02:02:51 +10:00
Mordred
7bd6318167 Build fix 2018-09-19 23:26:36 +02:00
Mordred
ea46624148 Fixed !instance cr, it now takes contentfindercondition ids as input though 2018-09-19 23:04:23 +02:00
Mordred
ba754e0e7e Merge pull request #387 from AcedArmy/develop
Fix InitZone bitmask and share my findings on it
2018-09-19 17:26:06 +02:00