1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-07 19:27:45 +00:00
Commit graph

458 commits

Author SHA1 Message Date
Squall Leonhart
8d96779a8e Code style. 2018-10-18 07:48:34 +03:00
Squall Leonhart
30c80450e2 Implements class change on weapon swap. 2018-10-17 23:25:41 +03:00
Squall Leonhart
62a5bcb8cb Fixes disappearing soul crystals on re-logging. 2018-10-15 21:38:39 +03:00
NotAdam
66b6ec2b20 Merge remote-tracking branch 'upstream/develop' into develop 2018-10-14 23:36:05 +11:00
NotAdam
319e9e5050 cleanup unnecessary refs 2018-10-14 23:31:52 +11:00
NotAdam
8f584177d7 fix some compiler warnings 2018-10-14 19:20:06 +11:00
Mordred
89b3b6368d
Merge pull request #396 from KBiscuit/updates/packetDefs
GMCommand1 & 2 almost fully mapped / Fixed /playtime
2018-10-14 09:16:14 +02:00
Biscuit
72fde12b0c Update GMCommand 1 and 2 Defs 2018-10-14 12:52:06 +11:00
root
ab992eb3b8 Also include boost to_lower stuff 2018-09-26 09:25:19 -04:00
root
bebfd928ad Lexical cast missing on windows 2018-09-26 09:11:59 -04:00
root
7fdcc53af8 Various small cleanups 2018-09-26 08:47:22 -04:00
root
2228979cd1 Fixed a couple compiler warnings 2018-09-26 03:32:43 -04:00
root
7146502415 Split up NativeScriptApi 2018-09-25 07:18:42 -04:00
Mordred
8421980b43 Various cleanups and start of spawn system 2018-09-24 23:48:42 +02:00
Mordred
f6cf3b076b
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
30a47d3494 style 2018-09-25 01:24:50 +10:00
Biscuit Boy
ef87b9b36d Examine works correctly again / Handles errors for GM's and diff zones 2018-09-25 01:11:14 +10:00
root
99cd9c236d Some linker reorg 2018-09-24 09:03:29 -04:00
Mordred
d4cb28f99f Another build fix attempt 2018-09-22 15:04:18 +02:00
Mordred
edff024004 Linux build fix #2 2018-09-22 13:07:20 +02:00
Mordred
295ff9b535 More cmake cleanup 2018-09-22 09:57:40 +02:00
Biscuit Boy
a045dfc5c5 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
81eb149d8e Some cmake cleanups 2018-09-20 23:31:38 +02:00
Biscuit Boy
87d099c6d8 Style for mordred 2018-09-21 03:50:38 +10:00
Biscuit Boy
31333dea49 I can already hear the screams of mordred shouting style 2018-09-21 02:06:00 +10:00
Biscuit Boy
ff186c7d0e Discov ref should be a debug, not notice 2018-09-21 02:03:10 +10:00
Biscuit Boy
d32cc45f0d 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
c0f873dce1 Build fix 2018-09-19 23:26:36 +02:00
Mordred
f7d2bb813a Fixed !instance cr, it now takes contentfindercondition ids as input though 2018-09-19 23:04:23 +02:00
Mordred
a58056cde7
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
658046c132 Should probs mention it's decimal not hex 2018-09-20 00:00:01 +10:00
Biscuit Boy
94b05d5362 Fix InitZone bitmask and add my findings 2018-09-19 23:53:34 +10:00
Mordred
456de96f42
Updated field sizes in player.h 2018-09-19 14:07:38 +02:00
Mordred
0aa94d6efc Mostly fixed for 4.4 2018-09-18 22:45:48 +02:00
Mordred
275ac206a9 Merge branch 'bnpc' of https://github.com/SapphireMordred/Sapphire into bnpc 2018-09-17 23:10:59 +02:00
Mordred
6ff116a9e1 Inventory fix 2018-09-17 22:52:57 +02:00
Mordred Admin
b51e24ca18 Merge error fix 2018-09-17 14:15:08 +02:00
Mordred Admin
150ce725bc Merge develop into bnpc 2018-09-17 14:04:40 +02:00
Mordred
95b549a5bf
Fixed discovery information not being used correctly. 2018-09-17 08:41:09 +02:00
Mordred
eccb946a4c Mobs can now be spawned from templates using debug commands 2018-09-13 22:14:31 +02:00
Tahir Akhlaq
5ca9b8f90b 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
46f79fca4e Add some missing examine unknowns 2018-09-12 17:58:19 +10:00
Tahir Akhlaq
8d6ec91757 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
01a147b561 More BNpc work, close to actual spawning 2018-09-10 23:57:14 +02:00
Tahir Akhlaq
e487a9ae24 moved examine handling out of client trigger switch and into its own function 2018-09-10 15:01:13 +01:00
Tahir Akhlaq
afc4d89d22 added basic examine functionality
- todo: fix gear models not displaying
2018-09-10 14:34:24 +01:00
Mordred
0d767e4986 Working towards getting bnpcs back in the game 2018-09-09 23:56:22 +02:00
NotAdam
0cffd54606 cleanup old festival vars 2018-09-01 21:34:48 +10:00
NotAdam
d88efbf30d allow for multiple festivals to run at once 2018-09-01 20:55:28 +10:00
NotAdam
77d59fe664 fix msvc builds? 2018-09-01 14:36:04 +10:00