1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-28 23:27:45 +00:00
Commit graph

996 commits

Author SHA1 Message Date
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
e569ffd809 ReqServiceAccountList -> ClientVersionInfo 2018-10-14 18:33:16 +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
04d572f05f Attempted build fix 2018-09-24 09:24:08 -04: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
de6e87e0d7 classLevel cleanup, now check EXD 2018-09-21 03:26:02 +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
Biscuit Boy
06abc5f33d Lobby now shows correct info for everything 2018-09-21 01:59:45 +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
Biscuit Boy
b96ee1aeba Should probs mention it's decimal not hex 2018-09-20 00:00:01 +10:00
Biscuit Boy
953affede1 Fix InitZone bitmask and add my findings 2018-09-19 23:53:34 +10:00
Mordred
a3661c9d89 Updated field sizes in player.h 2018-09-19 14:07:38 +02:00
Mordred
3848091148 Mostly fixed for 4.4 2018-09-18 22:45:48 +02:00
NotAdam
fd7a688b10 opcode updates - part 1 #383 2018-09-18 20:20:25 +10:00
Mordred
6eb71b76e4 Fixed neck and ear being mixed up 2018-09-17 23:26:56 +02:00
Mordred
ddb3b69bd6 Merge branch 'bnpc' of https://github.com/SapphireMordred/Sapphire into bnpc 2018-09-17 23:10:59 +02:00
Mordred
827250f9cd Inventory fix 2018-09-17 22:52:57 +02:00
Mordred Admin
27fe651259 Merge error fix 2018-09-17 14:15:08 +02:00
Mordred Admin
238ea28d75 Merge develop into bnpc 2018-09-17 14:04:40 +02:00
Mordred
197d846a85 Fixed discovery information not being used correctly. 2018-09-17 08:41:09 +02:00
Mordred
d97970802b Mobs can now be spawned from templates using debug commands 2018-09-13 22:14:31 +02:00
Tahir Akhlaq
1834d8e3d2 moved examine packet to its own class
- fixed accessory display in examine packet
- fixed accessory display in playerspawn packet
2018-09-13 11:12:22 +01:00
Biscuit Boy
80942a168c Add some missing examine unknowns 2018-09-12 17:58:19 +10:00
Tahir Akhlaq
629b54ce39 added equip models for examine (todo: main/sub/accessories)
- added stub for item crafter name request
2018-09-11 17:46:04 +01:00
Mordred
18dc8aa377 More BNpc work, close to actual spawning 2018-09-10 23:57:14 +02:00
Tahir Akhlaq
f7f5992abd moved examine handling out of client trigger switch and into its own function 2018-09-10 15:01:13 +01:00
Tahir Akhlaq
bffebd0bc7 added basic examine functionality
- todo: fix gear models not displaying
2018-09-10 14:34:24 +01:00