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

1601 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
b3fd4c7e64 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
Mordred
2a74f6908e 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
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
Biscuit Boy
d134f2014e 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
Mordred
c3e715128f 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
96833753c1 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
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
NotAdam
ceefd5e531 update submodule 2018-08-26 18:55:21 +10:00
NotAdam
abbff07e77 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
78ddbb3672 more consistent enum naming 2018-08-25 22:58:13 +10:00
NotAdam
7131c254ea EquipSlot -> GearSetSlot 2018-08-25 22:56:46 +10:00
NotAdam
8a3b63d276 cleanup unnecessary debug output 2018-08-25 22:41:03 +10:00
NotAdam
4cab50f77c correctly store items in armory/inventory based on client flag 2018-08-25 22:38:07 +10:00
NotAdam
a86fc2794b cleanup stack calc code 2018-08-25 20:52:20 +10:00
NotAdam
d1568c75f9 update submodule 2018-08-25 20:48:27 +10:00
NotAdam
ae282c7030 correctly preserve hq/lq stacks & cap quantity correctly 2018-08-25 19:27:38 +10:00
NotAdam
84c5191377 correctly update items and select slot 2018-08-25 00:37:21 +10:00
NotAdam
1b7d11bb43 addItem is way less retarded now, stacks are automagically filled first 2018-08-25 00:15:26 +10:00
Mordred
7caa2121b5 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
cc07b4421e Merge pull request #376 from NotAdam/develop 
misc fixes
 2018-08-23 15:34:33 +02:00
NotAdam
3396645e3c formatting 2018-08-23 23:32:44 +10:00
NotAdam
0583459ed2 fix some compile warnings 2018-08-23 23:19:25 +10:00
NotAdam
ae89163140 fix invalid ontalk case in quest script 2018-08-23 22:59:29 +10:00
NotAdam
946d7a37eb more chara flags 2018-08-23 22:41:11 +10:00
NotAdam
f879262fff Revert "maybe it doesn't need this" 
This reverts commit 2425cdc734.
 2018-08-21 22:50:45 +10:00
NotAdam
2425cdc734 maybe it doesn't need this 
microsoft has it for some reason tho
 2018-08-21 22:46:16 +10:00
NotAdam
194801e776 maybe this works... 2018-08-21 20:42:06 +10:00