mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-27 06:47:45 +00:00
Code Activity
1563 commits 10 branches 14 tags 26 MiB
Commit graph

1563 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Mordred
56e346b946
Merge pull request #382 from takhlaq/develop 
added basic examine functionality
 2018-09-13 12:41:35 +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
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
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
772c63dd8a
Update bnpctemplate.sql 2018-09-10 15:33:50 +02:00
Mordred
9b8b68b468
Update bnpctemplate.sql 2018-09-10 15:20:29 +02:00
Mordred
0d767e4986 Working towards getting bnpcs back in the game 2018-09-09 23:56:22 +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
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
NotAdam
24c3c92b7f send stain/durability 2018-09-01 00:00:19 +10:00
NotAdam
8b00fe6012 sql cleanup/improvements, add some fields for durability/stain 2018-08-31 23:25:53 +10:00
NotAdam
23344c02e6 incredible 2018-08-31 23:02:45 +10:00
NotAdam
e0d6c1024e item handin collection & fix quest abandon 2018-08-31 22:57:33 +10:00
Mordred
4946d18583
How did that slip through over all this time.. 2018-08-30 13:33:08 +02:00
Mordred
4b18ca0dcf
Update CONTRIBUTING.md 2018-08-30 13:32:12 +02:00
Mordred Admin
e6d827342b Update submodules and editorconfig 2018-08-30 13:38:40 +02:00
Mordred
d221758355 Properly use new classes... at least let this compile 2018-08-29 22:03:10 +02:00
Mordred
ab5f0c6955 Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2018-08-29 21:42:34 +02:00
Mordred
89a9b16555 Code style adjusted for 2 spaces and various other small things, checkout CodeStyle.xml for details 2018-08-29 21:40:59 +02:00
Mordred
fc6dde28dc
Merge pull request #379 from NotAdam/develop 
fix mob_parse on linux
 2018-08-29 12:01:06 +02:00
NotAdam
9c0b1235ad fix mob_parse on linux 2018-08-29 19:58:48 +10:00
Mordred
34c0f74139 Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2018-08-28 19:07:53 +02:00
Mordred
7f7588ef1f Simplified actorcontrol creation 2018-08-28 19:05:52 +02:00
Mordred
db856f5907
Merge pull request #378 from AcedArmy/develop 
Added Wireframe Rendering Actorcontrol type and GM Wireframe command
 2018-08-28 08:30:45 +02:00
Biscuit Boy
aa0857ccad forgot space 2018-08-28 15:09:03 +10:00
Biscuit Boy
cf3ad7628f Added wireframe rendering actorcontrol type and gm wireframe command 2018-08-28 15:02:59 +10:00
Mordred
5302db1fcb Some cleanups in preperation for bnpcs 2018-08-28 00:17:51 +02:00
Mordred
ac68133fa3 Basic class to hold BNpcTemplate information 2018-08-26 23:53:30 +02:00
Mordred
fffea9014f Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2018-08-26 11:47:10 +02:00
Mordred
95b6d3370c Simplistic parser for mobs 2018-08-26 11:46:56 +02:00
Mordred
2fe3a4d156
Merge pull request #377 from NotAdam/develop 
addItem is way less retarded now, stacks are automagically filled first
 2018-08-26 11:00:44 +02:00
NotAdam
15796c74ff update submodule 2018-08-26 18:55:21 +10:00
NotAdam
ff43c45f67 minor fixes 2018-08-26 18:48:45 +10:00
NotAdam
be1a5d53f3 fix db storage for classjobs, improve switching between classes 2018-08-26 16:19:05 +10:00
NotAdam
81de462cbd more consistent enum naming 2018-08-25 22:58:13 +10:00
NotAdam
7f448494ed EquipSlot -> GearSetSlot 2018-08-25 22:56:46 +10:00
NotAdam
2859e3731b cleanup unnecessary debug output 2018-08-25 22:41:03 +10:00
NotAdam
55ae5290f6 correctly store items in armory/inventory based on client flag 2018-08-25 22:38:07 +10:00
NotAdam
7c5c39cd42 cleanup stack calc code 2018-08-25 20:52:20 +10:00
NotAdam
9026358913 update submodule 2018-08-25 20:48:27 +10:00