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

6588 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mordred Admin
9f8d9bfe9d Merged to master 2018-09-18 08:39:08 +02:00
Mordred Admin
d0a10d33e6 Merged to master 2018-09-18 08:39:08 +02:00
Maru
7870737205 Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2018-09-18 00:36:43 -03:00
Maru
9bf6e6386b Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2018-09-18 00:36:43 -03:00
Mordred
93e254a88c Indices for models also adjusted 2018-09-17 23:28:29 +02:00
Mordred
b51af5fd66 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
60c23d986e 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
275ac206a9 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
6ff116a9e1 Inventory fix 2018-09-17 22:52:57 +02:00
Maru
f8370a3bbc Merge dayo 2018-09-17 15:30:09 -03:00
Maru
a316230030 Merge dayo 2018-09-17 15:30:09 -03:00
Maru
2694e7df51 Merge https://github.com/SapphireMordred/Sapphire into develop 2018-09-17 15:29:29 -03:00
Maru
d7fa8b5401 Merge https://github.com/SapphireMordred/Sapphire into develop 2018-09-17 15:29:29 -03:00
Mordred Admin
27fe651259 Merge error fix 2018-09-17 14:15:08 +02:00
Mordred Admin
b51e24ca18 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 Admin
150ce725bc 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
95b549a5bf
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
eccb946a4c 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
Mordred
56e346b946
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
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
Tahir Akhlaq
b3794218a5 Merge pull request #4 from AcedArmy/develop 
Add some missing examine unknowns
 2018-09-12 12:30:24 +01:00
Tahir Akhlaq
0796644a21
Merge pull request #4 from AcedArmy/develop 
Add some missing examine unknowns
 2018-09-12 12:30:24 +01:00
Biscuit Boy
80942a168c Add some missing examine unknowns 2018-09-12 17:58:19 +10:00
Biscuit Boy
46f79fca4e 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
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
18dc8aa377 More BNpc work, close to actual spawning 2018-09-10 23:57:14 +02:00
Mordred
01a147b561 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
e487a9ae24 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
Tahir Akhlaq
afc4d89d22 added basic examine functionality 
- todo: fix gear models not displaying
 2018-09-10 14:34:24 +01:00
Mordred
df3b6774dd Update bnpctemplate.sql 2018-09-10 15:33:50 +02:00
Mordred
772c63dd8a
Update bnpctemplate.sql 2018-09-10 15:33:50 +02:00
Mordred
a5fabcf818 Update bnpctemplate.sql 2018-09-10 15:20:29 +02:00
Mordred
9b8b68b468
Update bnpctemplate.sql 2018-09-10 15:20:29 +02:00
Mordred
9624d08b4c Working towards getting bnpcs back in the game 2018-09-09 23:56:22 +02:00
Mordred
0d767e4986 Working towards getting bnpcs back in the game 2018-09-09 23:56:22 +02:00
Mordred
78e8f98942 Merge pull request #380 from NotAdam/develop 
item handin, quest abandoning, sql improvements, durability/stain persistance
 2018-09-06 14:23:20 +02:00
Mordred
611a68f50d
Merge pull request #380 from NotAdam/develop 
item handin, quest abandoning, sql improvements, durability/stain persistance
 2018-09-06 14:23:20 +02:00
NotAdam
9832ecb920 cleanup old festival vars 2018-09-01 21:34:48 +10:00
NotAdam
0cffd54606 cleanup old festival vars 2018-09-01 21:34:48 +10:00