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

1785 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Tahir Akhlaq
b3794218a5 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
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
Mordred
df3b6774dd 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
9624d08b4c 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
NotAdam
9832ecb920 cleanup old festival vars 2018-09-01 21:34:48 +10:00
NotAdam
0946b0636e allow for multiple festivals to run at once 2018-09-01 20:55:28 +10:00
NotAdam
92d9268e25 fix msvc builds? 2018-09-01 14:36:04 +10:00
NotAdam
72ea5d689b send stain/durability 2018-09-01 00:00:19 +10:00
NotAdam
81bfd18b77 sql cleanup/improvements, add some fields for durability/stain 2018-08-31 23:25:53 +10:00
NotAdam
39e4cf09b9 incredible 2018-08-31 23:02:45 +10:00
NotAdam
d300c0a77e item handin collection & fix quest abandon 2018-08-31 22:57:33 +10:00
Mordred
016d1963f2 How did that slip through over all this time.. 2018-08-30 13:33:08 +02:00
Mordred
3a3b86203c Update CONTRIBUTING.md 2018-08-30 13:32:12 +02:00
Mordred Admin
c14ce6205c Update submodules and editorconfig 2018-08-30 13:38:40 +02:00
Mordred
7655f4ca63 Update CONTRIBUTING.md 2018-08-30 13:31:33 +02:00
Mordred
8a9e0b027d Updated .editorconfig for 2 spaces 2018-08-30 11:39:39 +02:00
Mordred
89dbbab066 Properly use new classes... at least let this compile 2018-08-29 22:03:10 +02:00
Mordred
51a292415e Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2018-08-29 21:42:34 +02:00