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

6210 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mordred
aa0c318494 More cleanup of territoryMgr in preparation of new move logic 2022-01-18 23:47:35 +01:00
Mordred
7bde6c9c00 Merge branch 'ThreePointOh' of https://github.com/SapphireMordred/Sapphire into ThreePointOh 2022-01-18 08:12:08 +01:00
Mordred
9ab636662d Added triggerOwner to bnpc 2022-01-18 08:03:49 +01:00
Adam
d21b2d3ea2
Merge pull request #755 from dude22072/ThreePointOh 
[3.0] Fix ClsArc004
 2022-01-18 14:37:53 +11:00
dude22072
8ff1faf666 Fix ClsArc004 2022-01-17 20:33:05 -06:00
Mordred
00f0c1b431 Clean up of move logic for housing territories, potentially some breakage. Needs to be tested still 2022-01-18 00:21:38 +01:00
Mordred
7402327d26
Merge pull request #754 from Skyliegirl33/gearset-implementation 
[3.x]Implement mount unlocking
 2022-01-16 23:19:48 +01:00
Rushi
c19df0e637 More formatting 2022-01-16 23:19:10 +01:00
Rushi
637fe3614d Remove logging line 2022-01-16 22:56:49 +01:00
Rushi
62dabd571c Fix formatting 2022-01-16 22:53:02 +01:00
Rushi
2f9a56e6a1 Add missing namespace 2022-01-16 22:49:58 +01:00
Rushi
575fb37854 Implement mount unlocking 2022-01-16 22:48:55 +01:00
Rushi
e0398b0dbb Fix Mount struct 2022-01-16 22:45:56 +01:00
Mordred
b9032f551e Fix for quests being added on decline 2022-01-16 22:22:27 +01:00
Mordred
3eb5fbf6fa OnWithin and OnOutside range have been adjusted to include Quest object, minor fix to onEmote function quest updates 2022-01-16 19:40:21 +01:00
Mordred
27b218fd78 Removed old code to further simplify warp mechanics 2022-01-16 11:57:04 +01:00
Mordred
1085403677
Merge pull request #753 from dude22072/ThreePointOh 
[3.0] More ARC cleanup
 2022-01-16 10:57:16 +01:00
dude22072
026059ee15 More ARC cleanup 
Oh hey I have to make the sequence completion text show up myself.
 2022-01-15 22:10:42 -06:00
Mordred
8767991e7a Removal of more territory move logic 2022-01-15 23:28:06 +01:00
Mordred
79981909de Various smaller cleanups 2022-01-15 22:48:27 +01:00
Mordred
3f6f31b848 Hopefully a fix for effects breaking in instanced zones 2022-01-14 23:13:47 +01:00
Mordred
d245dcfd2f
Merge pull request #752 from Skyliegirl33/gearset-implementation 
[3.x] Support for unlocking gear sets, updating job status, fix compile issues and Archer quest
 2022-01-14 20:05:40 +01:00
Rushi
3063174652 Fix unlock quest for Archer 2022-01-14 19:07:38 +01:00
Rushi
d449c97a9f Add support for unlocking gear sets 2022-01-14 19:06:23 +01:00
Rushi
df58683c6f Fix compilation issues on *NIX platforms 2022-01-14 19:02:50 +01:00
Mordred
f093aba377 Fixed event item action, also changed the way the action interrupt grace period works 2022-01-14 12:51:37 +01:00
Mordred
7fa20f2a3a
Merge pull request #751 from dude22072/ThreePointOh 
[3.0] Implement ARC questline
 2022-01-14 08:45:39 +01:00
dude22072
cfcc29acbd More ARC formatting 2022-01-14 01:44:35 -06:00
dude22072
55d212ddf6 ARC quests formatting 2022-01-14 01:26:54 -06:00
Mordred
ad1f1fd45d
Merge pull request #750 from hkAlice/threepointoh 
[3.0] expose playermgr() to nativescript; fix friendlist insert on new character;
 2022-01-14 08:04:55 +01:00
Mordred
c4b7b1e0a0 Fix for eobj struct 2022-01-14 08:02:55 +01:00
dude22072
d78523a072 Implement ARC questline 2022-01-13 23:18:53 -06:00
Alice Ogeda
27a800cc5e expose playermgr() to nativescript; fix friendlist insert on new character; 2022-01-14 01:34:58 -03:00
Mordred
0714a56e56 Fix for setLevelForClass 2022-01-13 23:41:24 +01:00
Mordred
d978197b3d Friendly bnpcs no longer fight eachother 2022-01-13 22:51:47 +01:00
Mordred
c19d4d4b25 Forgot to include quest param in debug print 2022-01-13 21:02:00 +01:00
Mordred
bb0d60966b Merge branch 'ThreePointOh' of https://github.com/SapphireMordred/Sapphire into ThreePointOh 2022-01-13 21:01:04 +01:00
Mordred
549d2adbcb Various small clean ups 2022-01-13 21:00:56 +01:00
Mordred
cefbdb6fac Added quest to EObj hit event 2022-01-13 21:00:47 +01:00
Mordred
daf9ff30d8
Merge pull request #749 from hkAlice/threepointoh 
[3.0] revert sheet check for action and fix combo;
 2022-01-13 15:47:29 +01:00
Alice Ogeda
16ce89cb48 revert sheet check for action and fix combo; 2022-01-13 11:45:40 -03:00
Mordred
be8d885e39 Aethery bools fix and potential action flags. 2022-01-12 23:16:49 +01:00
Mordred
c5c8199bd2 More cleanup and a session removal bug fixed 2022-01-12 22:28:39 +01:00
Mordred
775b1e5641 Cleanup of the server mainloop 2022-01-12 15:10:54 +01:00
Mordred
1472041262 get/setCurrentTerritory now completely removed 2022-01-12 11:11:47 +01:00
Mordred
fda2353e78 Small type conversion warnings fixed 2022-01-11 14:42:45 +01:00
Mordred
eee27910ec Missed one getCurrentTerri call. 2022-01-11 00:22:58 +01:00
Mordred
1f1e761016 Removed old getZoneId function, more detangleing. 2022-01-11 00:18:00 +01:00
Mordred
0c1bbfb8d0 Removing references to getCurrentTerritory in preparation for further detangleing 2022-01-10 23:50:44 +01:00
Mordred
2e66750748
Merge pull request #748 from hkAlice/happy-feet 
[3.0] action combo work; add support for multiple action ct/tg; fix effectpacket inconsistencies; fix infinite loop on aoe no target;
 2022-01-10 23:44:01 +01:00