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

6451 commits

This branch
This branch
All branches
Author SHA1 Message Date
Rushi
6e5d3c5df6 merge 2022-02-13 20:27:09 +01:00
Rushi
080f6ee77a Add onTalk events for instances and some Sastasha work 2022-02-13 20:26:29 +01:00
Mordred
cddac062f1
Merge pull request #772 from Skyliegirl33/feature-impl 
[3.x] Add onLeaveTerritory for instances
 2022-02-12 20:49:47 +01:00
Rushi
1cddf71da3 Remove newline 2022-02-12 20:32:31 +01:00
Rushi
a4cf9fe544 Add onLeaveTerritory for instances 2022-02-12 20:30:27 +01:00
Mordred
1e8eba6ef3
Merge pull request #768 from dude22072/GridaniaMSQWork 
[3.0] Gridania MSQ up through Ifrit
 2022-02-12 20:28:22 +01:00
Mordred
b4639137c7
Merge pull request #769 from dude22072/SidequestWork 
[3.0] Sidequest work
 2022-02-12 20:28:04 +01:00
Mordred
a588fc99ee
Merge pull request #771 from Skyliegirl33/feature-impl 
[3.x] Add flags to FindContent and improve findFirstItemWithId
 2022-02-12 20:27:44 +01:00
Rushi
699b6d31a2
Fix spacing 2022-02-12 19:20:13 +00:00
Rushi
eee3df5bbd Add flags to FindContent struct 2022-02-12 00:59:29 +01:00
Rushi
9644b61ae1 Update findFirstItemWithId to take list of bags 2022-02-12 00:58:52 +01:00
Mordred
dc562bfe61 Added layerset parsing 2022-02-11 10:32:13 +01:00
Mordred
c565dfbd34
Merge pull request #770 from dude22072/FestivalWork 
[3.0] Valentines 2015 quests
 2022-02-11 09:51:37 +01:00
dude22072
8a6a36c6f3 Gridnia MSQ up through Ifrit 2022-02-10 19:42:26 -06:00
dude22072
02322ea5ab Yet More Gridania MSQ 2022-02-10 18:13:54 -06:00
Mordred
2b3bb6297e Basic warptaxi work 2022-02-10 18:50:44 +01:00
dude22072
0ee38811c5 Valentines 2015 quests 2022-02-09 22:36:57 -06:00
dude22072
99708c568e Some South Shroud Sidequests 2022-02-09 00:33:21 -06:00
dude22072
c694256c4e Implements some random sidequests 2022-02-08 21:56:17 -06:00
dude22072
3cc27daabd Fix SubFst013 2022-02-08 18:35:30 -06:00
dude22072
c427df0a51 Gridania MSQ up until Waking Sands 2022-02-08 17:40:03 -06:00
Mordred
a34b8abb80
Merge pull request #767 from dude22072/GridaniaMSQWork 
[3.0] More Gridania msq work
 2022-02-08 23:03:07 +01:00
dude22072
38526e7dba Even more Gridania MSQ; implement warps 2022-02-08 15:55:36 -06:00
Mordred
4ec86cdf81 Implemented onSay event 2022-02-08 12:46:18 +01:00
dude22072
259879f7d8 More Gridania MSQ 2022-02-07 22:15:54 -06:00
Mordred
a29cdf4dfd Gold saucer is now being loaded 2022-02-08 00:24:09 +01:00
Mordred
4317474074 Ordering of service init 2022-02-07 23:18:56 +01:00
Mordred
57a25d7df0 WarpMgr exposed in scripts 2022-02-07 23:08:29 +01:00
dude22072
32027ffae4 Update SubFst053.cpp 2022-02-07 12:23:03 -06:00
Mordred
b337aa2d63 Merge branch 'ThreePointOh' of https://github.com/SapphireMordred/Sapphire into ThreePointOh 2022-02-07 18:42:07 +01:00
Mordred
349476c79f Added BattleTalk definitions 2022-02-07 18:41:59 +01:00
dude22072
4413736ac7 More Gridania MSQ 2022-02-06 19:51:47 -06:00
dude22072
db5dc66254 Update SpiritholdBroken.cpp 2022-02-06 16:51:17 -06:00
Mordred
91787ac92b
Merge pull request #765 from dude22072/GridaniaMSQWork 
[3.0] Implement some Gridania MSQ Quests
 2022-02-06 23:24:07 +01:00
dude22072
90783bf25f Implement some Gridania MSQ Quests 2022-02-06 00:59:01 -06:00
Mordred
efe827416b More cleanups around namespaces 2022-02-05 23:31:35 +01:00
Mordred
735330abc5
Merge pull request #764 from dude22072/SubquestBackports 
[3.0] Subquest backports
 2022-01-31 08:42:49 +01:00
Mordred
a0c5bcc52c Fix nix build 2022-01-31 08:41:49 +01:00
dude22072
dc16463a17 Create SubSea012.cpp 2022-01-31 00:42:22 -06:00
dude22072
166c6e161f More Sidequest Backports 2022-01-31 00:40:35 -06:00
Mordred
bac72c1b76 EventObjectParser is functioning again 2022-01-31 00:15:28 +01:00
Mordred
895d1eb7b1 Fallback to entranceRect if no entrance circle is found in instance 2022-01-30 22:32:03 +01:00
Mordred
cf69e1876a Finish zoning converted aswell 2022-01-30 16:26:44 +01:00
Mordred
bfdf732579 Removed old function for performZoning 2022-01-30 15:37:24 +01:00
Mordred
0838881a5b Overhaul of the queued zoning system 2022-01-30 14:44:17 +01:00
Mordred
abbeb5fe61
Merge pull request #763 from hkAlice/aggro-mul 
bnpc/hatelist aggro value+rate work; action aggroMultiplier; warning cleanups;
 2022-01-28 00:16:15 +01:00
Alice Ogeda
83333690a0 correctly process hatevalues to table; update players with value/rate of their respective table entry; 2022-01-27 20:03:51 -03:00
Alice Ogeda
56545371a3 warning cleanups; less raw pointers; 2022-01-27 18:35:19 -03:00
Mordred
a27bb3e687 Remove Component namespace 2022-01-27 21:24:54 +01:00
Mordred
f5258bfd92 Improving code consistency and readability in manager classes 2022-01-27 21:08:43 +01:00