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
Rushi
85578a5203 Fix itemlvl field
(cherry picked from commit 969c44864c6df1648da995b6a36a759338ac3689)
2022-02-20 19:30:26 +01:00
Rushi
2474a3d285 Fix TP showing as 0
(cherry picked from commit 8aed3c6a958424f4ffdce033b46ef62473b5925b)
2022-02-20 19:30:00 +01:00
Rushi
1ba2fd3150 Merge upstream 2022-02-20 19:28:01 +01:00
Mordred
240f769c85
Merge pull request #793 from dude22072/ClassQuestWork
[3.0] BTN questline
2022-02-20 14:07:58 +01:00
dude22072
de6a3b3128 BTN questline 2022-02-19 21:50:01 -06:00
Alice Ogeda
becbc4d54f remove debug to test rngmgr; 2022-02-19 23:54:21 -03:00
Alice Ogeda
92861799f8 add templated int and real distribution to rngmgr; add func to return amount of random values; support untyped value deduction; use typed min/max ranges for unspecified type; 2022-02-19 23:53:42 -03:00
Alice Ogeda
2f5d5e9d18 more warning cleanups; general styling fixes; 2022-02-19 22:05:30 -03:00
Alice Ogeda
c30f1866ad Merge branch 'ThreePointOh' of https://github.com/SapphireServer/Sapphire into aggro-attempts 2022-02-19 18:08:43 -03:00
Rushi
5c863ba81a Add Map actor controls 2022-02-18 23:35:53 +01:00
Mordred
5288c6b00e
Merge pull request #792 from Skyliegirl33/contentfinder
[3.x] CF commence and undersized implemented
2022-02-18 23:22:10 +01:00
Mordred
0b1ce7662d
Merge pull request #791 from dude22072/GridaniaMSQWork
[3.0] MSQ into Coerthas
2022-02-18 23:20:55 +01:00
Mordred
0258c05050
Merge pull request #790 from Skyliegirl33/feature-impl
[3.x] Add fate actrl, gearset handler (wip) and fix untargeting of client-side NPCs
2022-02-18 23:20:47 +01:00
Mordred
12f0a5472f Added MapMarker packets 2022-02-18 22:55:04 +01:00
Rushi
47411c0e4b CF: Remove unused bool 2022-02-18 19:50:18 +01:00
Rushi
6e6dc43018 CF: Remove unnecessary method 2022-02-18 19:48:39 +01:00
Rushi
3c15b8566a CF: Implement commence and undersized 2022-02-18 19:41:11 +01:00
dude22072
42a20c4dfc MSQ: Start of Coerthas 2022-02-17 20:03:19 -06:00
Rushi
a45d8b9271 Check max stack size 2022-02-18 02:37:04 +01:00
Rushi
d5e964ea4c Map out more actor controls 2022-02-18 02:25:07 +01:00
Rushi
c03968b194 WIP: Implement gearset handler 2022-02-18 02:24:18 +01:00
Rushi
4f90228105 Fix untargeting of client-side npcs 2022-02-18 02:21:25 +01:00
dude22072
b9e5fc11e8 MSQ until Cid remembers himself 2022-02-17 19:15:47 -06:00
Mordred
feaacefc95 Updated EventHandlerTypes 2022-02-18 00:03:04 +01:00
Mordred
6f26d6f9b0
Merge pull request #789 from dude22072/GridaniaMSQWork
[3.0] MSQ up through titan
2022-02-17 23:44:57 +01:00
dude22072
d1421e2fbf MSQ: ABADABADABAH ABADABADABAH ABADABADABAH TITAN 2022-02-17 16:31:45 -06:00
Mordred
c6eaac892c
Merge pull request #788 from Skyliegirl33/feature-impl
[3.x] Add nest event to FcTalk
2022-02-17 10:21:33 +01:00
Mordred
0d1304945c
Merge pull request #787 from collett8192/develop_3.x
[3.0] limsa msq SubSea052, SubSea053.
2022-02-17 10:21:06 +01:00
Rushi
31bd3ffb48 Add nest event to FcTalk 2022-02-17 09:54:17 +01:00
collett
2f40b0d2cc limsa msq SubSea052, SubSea053. 2022-02-17 17:45:45 +09:00
Mordred
70e2019111 Merge branch 'ThreePointOh' of https://github.com/SapphireMordred/Sapphire into ThreePointOh 2022-02-17 09:12:15 +01:00
Mordred
d27c78c1b6 Removed Halfshell script 2022-02-17 09:12:08 +01:00
Mordred
4dac573fd1
Merge pull request #786 from Skyliegirl33/feature-impl
[3.x] Implement FcTalk and SmallTalk, add method to check quest completion
2022-02-17 09:11:24 +01:00
Mordred
784dd7b000 Merge branch 'ThreePointOh' of https://github.com/SapphireMordred/Sapphire into ThreePointOh 2022-02-17 08:32:01 +01:00
Mordred
abd456d2b3 Trying to fix compilation issues related to HaroontheHalfShell 2022-02-17 08:31:57 +01:00
Rushi
b151906f17 Remove unnecessary eventStart and Sastasha seq fix 2022-02-17 08:19:52 +01:00
Mordred
48ceeef9b3
Merge pull request #785 from dude22072/FestivalWork
[3.0] Fix some small errors in Valentines 2015
2022-02-17 08:07:10 +01:00
dude22072
b707a4afee Update FesVlt101.cpp 2022-02-16 21:50:12 -06:00
Rushi
50102e0ff0 Add method for quest completion 2022-02-17 04:26:19 +01:00
Rushi
e7fb339eef Implement SmallTalk (menus not working) 2022-02-17 04:20:25 +01:00
Rushi
4df4d05b5c Fix SwitchTalk exd struct 2022-02-17 03:55:46 +01:00
Rushi
964716d2ee Implement FcTalk 2022-02-17 03:55:21 +01:00
dude22072
3971772d3c Update FesVlt104.cpp 2022-02-16 20:51:28 -06:00
Mordred
18ef9196c1
Merge pull request #784 from dude22072/GridaniaMSQWork
[3.0] MSQ through Brayflox
2022-02-16 23:58:50 +01:00
dude22072
9bbaa199de MSQ through Brayflox's Longstop 2022-02-16 16:45:02 -06:00
Mordred
42adb407dc
Merge pull request #783 from Skyliegirl33/feature-impl
[3.x] Use permissionInvisibilty to modify eobjs & fix states in Sastasha
2022-02-16 23:26:08 +01:00
Rushi
5771795402 Merge 2022-02-16 23:20:22 +01:00
Rushi
f0abb0eb18 Sastasha: Fix eobj states 2022-02-16 23:19:36 +01:00
Rushi
bd635b18c5 EObj: use permissionInvisibilty 2022-02-16 23:18:32 +01:00
Mordred
81fb8108a3 Fixed broken scripts 2022-02-16 22:18:55 +01:00