mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-25 05:57:45 +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
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
NotAdam
30d2ea3ac5 change gcc to clang - more verbose code checks 2018-08-21 20:36:18 +10:00
Mordred
ebc1a7992d Added another field to npcspawn 2018-08-13 21:44:48 +02:00
Mordred
a335e19ee6 Merge pull request #372 from NotAdam/develop 
misc inventory fixes
 2018-08-13 08:14:55 +02:00
Mordred
6601c387fc Field in npcspawn adjusted 2018-08-12 23:06:12 +02:00
NotAdam
f8ee2a73e1 missed a ! during refactoring, oops 2018-08-12 23:04:23 +10:00
NotAdam
6354ff4eb0 Merge remote-tracking branch 'origin/develop' into develop 2018-08-12 22:53:29 +10:00
NotAdam
347ec83ff3 additem returns an itemptr, handin item container 2018-08-12 22:53:21 +10:00
NotAdam
0a0dcf59ae fix item splitting 2018-08-12 22:30:18 +10:00
Mordred
dd25fb2b66 Merge pull request #367 from DantestyleXD/Uldah_quests 
Ul'dah sidequests added + style
 2018-08-10 08:04:16 +02:00
Mordred
9447ef1600 Merge pull request #371 from NotAdam/develop 
update FFXIVIpcNpcSpawn
 2018-08-10 08:03:35 +02:00
Mordred
06df14f41a Changed some fieldnames for consistency 2018-08-10 08:03:16 +02:00
NotAdam
1a95399a7e update FFXIVIpcNpcSpawn 2018-08-08 22:57:16 +10:00
Mordred
1ab679721d Merge pull request #366 from DantestyleXD/DebugCommand 
Debug command for QuestBitFlags
 2018-08-05 12:06:18 +02:00
Mordred
7d7756ca42 Merge pull request #370 from takhlaq/discovery_layers 
halal discovery
 2018-08-05 12:05:42 +02:00
Dantestyle
d17db449c0 fixing 2018-08-04 23:43:08 +02:00
Dantestyle
c5099f564b SubWil028 and Sub029 added 2018-08-04 03:56:46 +02:00