1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-25 14:07:46 +00:00
Commit graph

6588 commits

Author SHA1 Message Date
Lucy
0cddd14936 [3.3] Fix Emote exd struct 2023-01-21 02:58:26 +01:00
Adam
e768442f00
Merge pull request #843 from hkAlice/over-achievers
[3.x] better comments on achievement usage; get level from player object for classjob achievements;
2023-01-21 11:42:31 +11:00
Mordred
2f39f3d4a2 Adjusted structs for 3.3, might still be more to fix. 2023-01-20 21:50:08 +01:00
Alice Ogeda
15ef8c24a5 better comments on achievement usage; directly get level from player object for classjob achievements; 2023-01-20 10:43:45 -03:00
Mordred
db94a098a2 Player state enum adjusted 2023-01-20 12:49:20 +01:00
Mordred
258dc8d69b Fixed effectpacket flags. 2023-01-20 11:40:35 +01:00
Mordred
ba3f091a69 Merge remote-tracking branch 'origin/ThreePointOh' into ThreePointThree 2023-01-20 07:33:34 +01:00
Mordred
239fdf0645
Merge pull request #842 from Skyliegirl33/ThreePointThree
[3.3] Fix QuestData struct
2023-01-20 07:31:59 +01:00
Mordred
453051395c
Merge pull request #841 from Skyliegirl33/feature-impl
[3.0] Add missing header for Linux and fix quest bitflags
2023-01-20 07:30:17 +01:00
Lucy
d24b711163 Rename QuestData field to be more accurate 2023-01-20 07:29:37 +01:00
Adam
7c1369dc84
Merge pull request #840 from takhlaq/quest_parser
quest parser improvements
2023-01-20 17:00:42 +11:00
Lucy
acf61a4794 Fix QuestData struct
(cherry picked from commit be59f1f7ce698dfd8fb0f0945b424c45aa14e0d2)
2023-01-20 06:58:04 +01:00
Lucy
2fdbf2ef5b Fix quest bitflag mistake
(cherry picked from commit c4dcbc10f152e056a4330ec83457cebf538ae2cd)
2023-01-20 06:55:03 +01:00
Lucy
fce3397b92 Add missing includes for *nix
(cherry picked from commit 769edce0c883960ca9eac69a8e05e89760dafafd)
2023-01-20 06:54:51 +01:00
Adam
5a189bfbd0
Merge pull request #839 from dude22072/SidequestWork
[3.0] Central Shroud sidequests
2023-01-20 16:31:11 +11:00
Tahir
446228cc0d quest parser improvements
- add actor and item names as comments
- add actor positions as comments (bnpc/eobj teris may be inaccurate)
- sort script entities properly with shameless natural sort steal
2023-01-20 05:16:00 +00:00
Adam
9674cd83e9
Merge pull request #838 from dude22072/ThreePointOh
[3.0] Hunting log crash fix
2023-01-20 11:04:44 +11:00
dude22072
1267a66f81 Some Central Shroud quests 2023-01-19 18:00:27 -06:00
Mordred
52c61817f3 fixed questcomplete array sizes 2023-01-19 22:59:08 +01:00
Mordred
89b2a8470d Adjust complete quest list 2023-01-19 22:38:55 +01:00
dude22072
bd08532f1f Cleanup an old quest that was acting weird 2023-01-19 15:12:28 -06:00
dude22072
601cf81353 Hunting log crash fix 2023-01-19 14:34:53 -06:00
Mordred
f1e7752515 Merge remote-tracking branch 'origin/ThreePointOh' into ThreePointThree 2023-01-19 21:20:33 +01:00
Mordred
96249275f7
Merge pull request #837 from Skyliegirl33/feature-impl
[3.x] Fix a few issues, add SubSea005 QB
2023-01-19 21:16:11 +01:00
Mordred
34b44db58a
Merge pull request #836 from hkAlice/over-achievers
[3.x] achievement implementation; partial achievementsubtype mapping; styling fixes;
2023-01-19 21:12:35 +01:00
Lucy
347141f1cd Use discardItem instead of dropInventoryItem 2023-01-19 20:18:14 +01:00
Lucy
36554bf1f3 Fix player not being removed upon leaving territory
(cherry picked from commit 1713523e197a225fc5ff5c61a7143dcec091ad59)
2023-01-19 19:52:58 +01:00
Lucy
49aeb1ec43 Implement Lurkers in the Grotto QB
(cherry picked from commit 4b2affb341e613bd99ccca54e0e0132a2bdb19e7)
2023-01-19 19:52:38 +01:00
Lucy
5837b1b8b6 Add quest event callbacks to yieldeventstring handler
(cherry picked from commit aae05b9f6ecb3af20caa547f58bff2b465957b76)
2023-01-19 19:51:55 +01:00
Lucy
6580fe1721 Finally fix TP being stuck at 0 2023-01-19 19:51:31 +01:00
Lucy
2ac2ec1ea2 Fix quest bitflags to be retrieved in ascending order
(cherry picked from commit 525c76dbf2bded510e6939fe7cf1dee561e2c903)
2023-01-19 19:49:50 +01:00
Alice Ogeda
87a92eed4d fick linux build; 2023-01-19 13:38:00 -03:00
Alice Ogeda
99e2fb117e myerge agen; 2023-01-19 13:06:51 -03:00
Alice Ogeda
423af6f9bc myerge; 2023-01-19 13:05:27 -03:00
Alice Ogeda
34213990bc AchievementMgr framework; styling fixes; 2023-01-19 13:03:54 -03:00
Mordred
a7763366ee Fixed PlayerStatusUpdate 2023-01-19 09:57:08 +01:00
Mordred
05a99c4aa3 More PlayerStatus fixes 2023-01-19 08:38:55 +01:00
Adam
9ae27baf03 fix compile warning - missing return 2023-01-19 14:45:48 +11:00
Adam
394f9ed9d6
Merge pull request #829 from T00fy/uldah_quest_fix2
Fixing the starting Ul'dah quest (ManWil004) by using the new bindSceneReturn API
2023-01-19 13:33:19 +11:00
Adam
297a536951
Merge pull request #834 from dude22072/ClassQuestWork
[3.0] Fix some WHM Questline stuff
2023-01-19 13:33:05 +11:00
Adam
c2a65c0a52
Merge pull request #835 from dude22072/SidequestWork
[3.0] Gridania Sidequests
2023-01-19 13:32:58 +11:00
Mordred
bb22495ae1 Initial fixes for playerstatus packet for 3.3 2023-01-18 23:18:06 +01:00
Mordred
920da4de3b Tiny cleanup 2023-01-18 21:44:26 +01:00
dude22072
4c8724cff9 Harvest Dance quest 2023-01-17 20:08:32 -06:00
dude22072
0926f25fc5 linux please 2023-01-17 17:48:01 -06:00
dude22072
83428a56d0 linux are you happy yet 2023-01-17 17:34:04 -06:00
dude22072
ca8c40672c Fix White Wolf Gate unlock 2023-01-17 17:21:52 -06:00
dude22072
1db2c0a14e Fix semicolon that made linux build unhappy 2023-01-17 17:03:55 -06:00
dude22072
4f954ba328 Fix LogMessage stuff 2023-01-17 17:03:24 -06:00
dude22072
b3bd756946 Gridania Sidequests 2023-01-17 16:56:30 -06:00