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

6595 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lucy
e036a69cf9 Make sure modifiers exist before deserializing 2023-01-28 21:17:35 +01:00
Lucy
419012f6e5 Merge branch 'ThreePointThree' of https://github.com/SapphireServer/Sapphire into ThreePointThree 2023-01-28 20:03:21 +01:00
Lucy
5b225de6f7 Map out modifiers for lut and handle deserializing 2023-01-28 20:02:34 +01:00
Mordred
233bef1886 Fixed large house zoning 2023-01-28 17:44:01 +01:00
Mordred
f3e8ecee15 you can now relinquish the land directly after removing the house without relogging 2023-01-28 17:43:46 +01:00
Mordred
78b66b9c92 Use proper exit position for house. 2023-01-28 17:26:48 +01:00
Mordred
01b262edc1 Entrances are being placed based on placard position 2023-01-27 22:33:30 +01:00
Mordred
102aeb7692
Merge pull request #853 from Skyliegirl33/ThreePointThree 
[3.3] Convert action lut to JSON
 2023-01-27 22:01:07 +01:00
Lucy
637c786ebc Fix action parser formatting 2023-01-27 21:52:29 +01:00
Lucy
fe82d50288 Merge branch 'ThreePointThree' of https://github.com/SapphireServer/Sapphire into ThreePointThree 2023-01-27 21:32:22 +01:00
Lucy
f3627a9566 Convert action lut to JSON 2023-01-27 21:25:26 +01:00
Mordred
6cde08d073 Cleanup inside the player class. 2023-01-27 11:13:57 +01:00
Mordred
cc0a7aa70a WiP Fixed exiting house 2023-01-26 22:39:50 +01:00
Mordred
1af0b33807 WiP fixed code redundancy 2023-01-26 22:04:23 +01:00
Mordred
32d9fdb818 WiP fixed code redundancy 2023-01-26 15:33:53 +01:00
Mordred
47f449f4e1 WiP check permissions before removing the estate hall. 2023-01-26 15:30:57 +01:00
Mordred
6ef3c0b071 WiP Added house removal, taken from collets commit. 2023-01-26 14:46:39 +01:00
Mordred
a280f9c3b8 WiP Fix house inventory not working 2023-01-26 10:15:36 +01:00
Mordred
8565ad1cd5 WiP Fix house inventory not working, added debug print for item inventory size mismatch. 2023-01-25 22:03:29 +01:00
Mordred
e7bc21a1f2 WiP Fix houses not being loaded after restart 2023-01-25 17:11:23 +01:00
Mordred
fb425c3213 WiP Fix houses not building right. 2023-01-25 12:46:19 +01:00
Mordred
0cfde3d9e8 WiP Land purchase does now directly update and building somewhat works. Still needs work. 2023-01-25 12:07:23 +01:00
Mordred
94929caf96 WiP more housing. 2023-01-24 21:50:09 +01:00
Mordred
11a1b46664
Merge pull request #851 from Skyliegirl33/ThreePointThree 
[3.3] Fix spawn issues, players being invisible, battle state not being removed
 2023-01-24 20:50:14 +01:00
Lucy
880ec9af36 Fix playerspawn again, weird memory issue 2023-01-24 18:52:29 +01:00
Lucy
9ea3aeac0f Clear zoning type when finishing warp 2023-01-24 18:52:05 +01:00
Lucy
7aa18548f0 Fix battle actor control 2023-01-24 18:51:53 +01:00
Mordred
f5d16ee916 Merge remote-tracking branch 'origin/ThreePointOh' into ThreePointThree 2023-01-24 08:32:36 +01:00
Mordred
480f3fb3d0 WiP Buying More packet adjustments for housing. 2023-01-24 08:30:50 +01:00
Mordred
b2f87c2f68
Merge pull request #848 from Skyliegirl33/ThreePointThree 
[3.3] Some fixes and add companions and persistent emote cancel
 2023-01-24 08:07:34 +01:00
Mordred
bf14348e13
Merge pull request #849 from dude22072/ClassQuestWork 
[3.0] Miner Questline (ARR+HW)
 2023-01-24 08:05:45 +01:00
Mordred
30ed230187
Merge pull request #850 from hkAlice/3.3 
[3.x] quest achievement implementation; prototype history; fix achv exd for 3.3; fix issue with achv list range;
 2023-01-24 08:05:35 +01:00
Alice Ogeda
e36cdadb58 prototype achievement history; 2023-01-23 22:58:07 -03:00
dude22072
e8068164d3 Miner Questline (ARR+HW) 2023-01-23 17:39:13 -06:00
Alice Ogeda
9b6d24d610 add quest achievement type handler; fix achv exd struct for 3.3; 2023-01-23 20:16:08 -03:00
Mordred
850509f8bd WiP Buying plots reenabled. 2023-01-23 22:58:25 +01:00
Lucy
4abe2532c3 [wip] Implement persistent emote cancelling 2023-01-23 21:54:22 +01:00
Lucy
ac4c8ec8a6 Add sprint costtype 2023-01-23 21:51:22 +01:00
Lucy
8f0c517514 [wip] Implement minions 2023-01-23 21:51:02 +01:00
Lucy
0a5a556186 Fix oob memory access 2023-01-23 21:49:59 +01:00
Mordred
597c0e9bd2 WiP reenable housing zones. 2023-01-23 14:28:00 +01:00
Mordred
7ea6d4f44d
Merge pull request #847 from Skyliegirl33/ThreePointThree 
[3.3] PlayerSpawn changes to fix equip flags & TP, prevent bed scene from playing
 2023-01-23 07:51:46 +01:00
Lucy
98b5e1694f Prevent bed animation playing on zonein to inn 
(cherry picked from commit 380c0f7cc6c028c868eff54e56f6bf6ff96e9883)
 2023-01-23 06:03:33 +01:00
Lucy
a35455a4f4 Remove status updates in unnecessary places 
(cherry picked from commit 12f68b62690861675daa2436630f33518c39b7f7)
 2023-01-23 06:02:55 +01:00
Lucy
7166526341 PlayerSpawn fixup 
(cherry picked from commit 17f5a5ae2bb7ee2342f6a50d5eb4f3835f80bb9b)
 2023-01-23 06:02:43 +01:00
Mordred
62d04d58ca Forgot some GC clean up 2023-01-22 21:54:23 +01:00
Mordred
76aca82da7 GC fixed. 2023-01-22 21:53:27 +01:00
Mordred
9872acf4a8 WIP fixing contentfinder, id usage reworked. 2023-01-22 16:53:21 +01:00
Mordred
5b040405ce WIP fixing contentfinder, packet structs updated to the best of my knowledge. 
Still quite a few fields to map.
 2023-01-22 10:06:21 +01:00
Mordred
b1ecbb7446 WIP fixing contentfinder 2023-01-21 23:46:03 +01:00