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

6427 commits

This branch
This branch
All branches
Author SHA1 Message Date
NotAdam
e0d6c1024e 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
4946d18583
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
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
7655f4ca63 Update CONTRIBUTING.md 2018-08-30 13:31:33 +02:00
Mordred
87478ea541
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
1552268dae
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
d221758355 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
Mordred
ab5f0c6955 Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2018-08-29 21:42:34 +02:00
Mordred
e745bd0329 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
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
b3fd4c7e64 Merge pull request #379 from NotAdam/develop 
fix mob_parse on linux
 2018-08-29 12:01:06 +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
e32cf610af fix mob_parse on linux 2018-08-29 19:58:48 +10:00
NotAdam
9c0b1235ad fix mob_parse on linux 2018-08-29 19:58:48 +10:00
Mordred
2a74f6908e Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2018-08-28 19:07:53 +02:00
Mordred
34c0f74139 Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2018-08-28 19:07:53 +02:00
Mordred
eb5a567730 Simplified actorcontrol creation 2018-08-28 19:05:52 +02:00
Mordred
7f7588ef1f Simplified actorcontrol creation 2018-08-28 19:05:52 +02:00
Mordred
b6d34fde3d Merge pull request #378 from AcedArmy/develop 
Added Wireframe Rendering Actorcontrol type and GM Wireframe command
 2018-08-28 08:30:45 +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
d134f2014e forgot space 2018-08-28 15:09:03 +10:00
Biscuit Boy
aa0857ccad forgot space 2018-08-28 15:09:03 +10:00
Biscuit Boy
3deeaadcef Added wireframe rendering actorcontrol type and gm wireframe command 2018-08-28 15:02:59 +10:00
Biscuit Boy
cf3ad7628f Added wireframe rendering actorcontrol type and gm wireframe command 2018-08-28 15:02:59 +10:00
Mordred
c3e715128f Some cleanups in preperation for bnpcs 2018-08-28 00:17:51 +02:00
Mordred
5302db1fcb Some cleanups in preperation for bnpcs 2018-08-28 00:17:51 +02:00
Mordred
0b08f535c6 Basic class to hold BNpcTemplate information 2018-08-26 23:53:30 +02:00
Mordred
ac68133fa3 Basic class to hold BNpcTemplate information 2018-08-26 23:53:30 +02:00
Mordred
96833753c1 Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2018-08-26 11:47:10 +02:00
Mordred
fffea9014f Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2018-08-26 11:47:10 +02:00
Mordred
a563e4068c Simplistic parser for mobs 2018-08-26 11:46:56 +02:00
Mordred
95b6d3370c Simplistic parser for mobs 2018-08-26 11:46:56 +02:00
Mordred
84393acf15 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
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
ceefd5e531 update submodule 2018-08-26 18:55:21 +10:00
NotAdam
15796c74ff update submodule 2018-08-26 18:55:21 +10:00
NotAdam
abbff07e77 minor fixes 2018-08-26 18:48:45 +10:00
NotAdam
ff43c45f67 minor fixes 2018-08-26 18:48:45 +10:00
NotAdam
e68b302f42 fix db storage for classjobs, improve switching between classes 2018-08-26 16:19:05 +10:00
NotAdam
be1a5d53f3 fix db storage for classjobs, improve switching between classes 2018-08-26 16:19:05 +10:00
NotAdam
78ddbb3672 more consistent enum naming 2018-08-25 22:58:13 +10:00
NotAdam
81de462cbd more consistent enum naming 2018-08-25 22:58:13 +10:00
NotAdam
7131c254ea EquipSlot -> GearSetSlot 2018-08-25 22:56:46 +10:00