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

6109 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mordred
1ff75d8478
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
629c219b39 formatting 2018-08-23 23:32:44 +10:00
NotAdam
0583459ed2 fix some compile warnings 2018-08-23 23:19:25 +10:00
NotAdam
44fa5e545d 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
4079dd86bf 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
8505f20e02 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
61a6ed7f4f Revert "maybe it doesn't need this" 
This reverts commit 4c89f1b87a.
 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
4c89f1b87a 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
09a89c6b56 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
NotAdam
eae7bba255 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
80e67c2846 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
f1d059f1e7
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
Mordred
6e6223504d 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
05585ac24b 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
4ec63805d7 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
8a2b472554 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
NotAdam
ade63f9170 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
4184736654
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
38960718a5
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
Mordred
ebf44583a3
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
NotAdam
add1725596 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
1f73f477a0
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
Mordred
132a650bf3
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
f1aeddb0e4 fixing 2018-08-04 23:43:08 +02:00
Dantestyle
c5099f564b SubWil028 and Sub029 added 2018-08-04 03:56:46 +02:00
Dantestyle
60c80ca0c4 SubWil028 and Sub029 added 2018-08-04 03:56:46 +02:00
Tahir Akhlaq
88dfbf7e8c fixed discovery legit 2018-08-03 16:54:46 +01:00
Tahir Akhlaq
2a264af7cd fixed discovery legit 2018-08-03 16:54:46 +01:00
Dantestyle
c244f1e07a SubWil004 and SubWil027 added 2018-08-03 01:20:21 +02:00