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

1809 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Mordred
6deb276be4 Merge pull request #390 from KBiscuit/updates/examine 
Examine works correctly again / Handles errors for GM's and diff zones
 2018-09-24 22:19:23 +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
acf389d512 Linux build fix 2018-09-22 11:06:00 +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
cec5d31229 Fixed ActorCast opcode 2018-09-19 14:58:11 +02:00
Mordred
480a4456e4 Merge pull request #386 from AcedArmy/develop 
Fixed Gmrank in playerspawn
 2018-09-19 14:42:38 +02:00
Biscuit Boy
625487737d Fixed Gmrank in playerspawn 2018-09-19 22:25:14 +10:00
Mordred
a3661c9d89 Updated field sizes in player.h 2018-09-19 14:07:38 +02:00
Mordred
e2eb625e59 Updated field sizes in update.sql 2018-09-19 14:06:56 +02:00
Mordred
c12648e495 Fixed initui 2018-09-18 23:23:18 +02:00
Mordred
3848091148 Mostly fixed for 4.4 2018-09-18 22:45:48 +02:00
Mordred
a6b161f0cc Merge pull request #385 from NotAdam/develop 
opcode fixes (again)
 2018-09-18 17:56:45 +02:00
Mordred
ebb9ce03c0 Update Ipcs.h 2018-09-18 13:54:03 +02:00
NotAdam
23cc1fad23 please look forward to it™️ 2018-09-18 21:36:39 +10:00
NotAdam
5af2f41345 even more opcodes 2018-09-18 21:21:52 +10:00
NotAdam
2683353a2c packetzzzzzzzz 2018-09-18 20:56:12 +10:00
NotAdam
db3728a6be more opcodes #383 2018-09-18 20:34:37 +10:00
NotAdam
2f8c9f2731 no merge yet pls mordred :(((( 2018-09-18 20:29:35 +10:00
Mordred
d35c02c0e3 Merge pull request #384 from NotAdam/develop 
opcode updates
 2018-09-18 12:21:56 +02:00
NotAdam
fd7a688b10 opcode updates - part 1 #383 2018-09-18 20:20:25 +10:00
Mordred Admin
9f8d9bfe9d Merged to master 2018-09-18 08:39:08 +02:00
Mordred
93e254a88c Indices for models also adjusted 2018-09-17 23:28:29 +02: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
Mordred
0b97f8e68c Merge pull request #382 from takhlaq/develop 
added basic examine functionality
 2018-09-13 12:41:35 +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