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

1544 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
NotAdam
479bf32938 correctly preserve hq/lq stacks & cap quantity correctly 2018-08-25 19:27:38 +10:00
NotAdam
86de3d98a2 correctly update items and select slot 2018-08-25 00:37:21 +10:00
NotAdam
901168d810 addItem is way less retarded now, stacks are automagically filled first 2018-08-25 00:15:26 +10:00
Mordred
69f6d868bc
Merge pull request #375 from NotAdam/feature/clang 
change gcc to clang - more verbose code checks
 2018-08-23 15:46:30 +02:00
Mordred
1ff75d8478
Merge pull request #376 from NotAdam/develop 
misc fixes
 2018-08-23 15:34:33 +02:00
NotAdam
629c219b39 formatting 2018-08-23 23:32:44 +10:00
NotAdam
44fa5e545d fix some compile warnings 2018-08-23 23:19:25 +10:00
NotAdam
4079dd86bf fix invalid ontalk case in quest script 2018-08-23 22:59:29 +10:00
NotAdam
8505f20e02 more chara flags 2018-08-23 22:41:11 +10:00
NotAdam
61a6ed7f4f Revert "maybe it doesn't need this" 
This reverts commit 4c89f1b87a.
 2018-08-21 22:50:45 +10:00
NotAdam
4c89f1b87a maybe it doesn't need this 
microsoft has it for some reason tho
 2018-08-21 22:46:16 +10:00
NotAdam
09a89c6b56 maybe this works... 2018-08-21 20:42:06 +10:00
NotAdam
eae7bba255 change gcc to clang - more verbose code checks 2018-08-21 20:36:18 +10:00
Mordred
80e67c2846 Added another field to npcspawn 2018-08-13 21:44:48 +02:00
Mordred
f1d059f1e7
Merge pull request #372 from NotAdam/develop 
misc inventory fixes
 2018-08-13 08:14:55 +02:00
Mordred
6e6223504d Field in npcspawn adjusted 2018-08-12 23:06:12 +02:00
NotAdam
05585ac24b missed a ! during refactoring, oops 2018-08-12 23:04:23 +10:00
NotAdam
4ec63805d7 Merge remote-tracking branch 'origin/develop' into develop 2018-08-12 22:53:29 +10:00
NotAdam
8a2b472554 additem returns an itemptr, handin item container 2018-08-12 22:53:21 +10:00