1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-27 22:57:45 +00:00
Commit graph

6624 commits

Author SHA1 Message Date
Tahir
d2d451e670 fix typo in scripts cmake 2023-02-04 20:51:21 +00:00
Tahir
835ba3889e attempt to fix ci for scripts cmake 2023-02-04 20:33:11 +00:00
Tahir
f9b5e0e874 more watchdog shenanigans 2023-02-04 20:10:14 +00:00
Tahir
6f457a4e7e scripts: write a temp file when building modules so watchdog waits 2023-02-04 19:24:43 +00:00
Tahir
e5fd01baaf fix build cause extra slash in scripts cmake 2023-02-04 18:42:38 +00:00
Tahir
bd8c620e73 scripts: build modules to tmp directory before copying over to reload 2023-02-04 17:50:44 +00:00
Mordred
1406549ced
Merge pull request #857 from takhlaq/ThreePointThree
db: remove extraneous comma from fc prepared statement
2023-02-03 14:42:07 +01:00
Tahir
c7b1a2f29b db: remove extraneous comma from fc prepared statement
- log the failing query
2023-02-03 13:40:25 +00:00
Mordred
83e7502b8b fix issue with instance content map 2023-02-03 14:36:08 +01:00
Mordred
f65fb8fba1 fix sql statement 2023-02-03 14:23:39 +01:00
Mordred
748a557156 Use std::array instead of plain pointers 2023-02-03 08:43:16 +01:00
Mordred
4bb35c8bb8 Basic db statements for main fc table 2023-02-02 22:46:51 +01:00
Mordred
a4a2423b84 changed list fields to binary, reduced fields overall 2023-02-02 22:46:51 +01:00
Mordred
b6ce7f5177 added more db tables in regards of fcs 2023-02-02 22:46:51 +01:00
Mordred
68a5040fb9 Class and db table for basic FC representation 2023-02-02 22:46:51 +01:00
Mordred
0929726ea5
Merge pull request #856 from hkAlice/3.3
[3.x] chatchannel fetch by player id; general cleanup;
2023-02-02 06:48:36 +01:00
Alice Ogeda
9655b4a0dd remove unnecessary imports; 2023-02-02 02:39:34 -03:00
Alice Ogeda
0f995cd934 chatchannel fetch by player id; general cleanup; 2023-02-02 02:30:31 -03:00
Mordred
00d62fbc6c Major rework of yield events. 2023-02-01 13:34:21 +01:00
Mordred
9491b549a1 Some more work on FC related packets and custom scripts. 2023-01-30 13:11:05 +01:00
Mordred
9da58c61aa added parser for custom talk 2023-01-30 11:58:02 +01:00
Mordred
ee942b36b7 Added FC related packet structs 2023-01-29 21:57:57 +01:00
Mordred
a1b3c3acf6 Removal/Replacement of old packet opcodes and structs 2023-01-29 21:31:55 +01:00
Mordred
ebcce49448 Forgot to remove a debug print 2023-01-29 21:09:09 +01:00
Mordred
320ed48c33
Merge pull request #855 from Skyliegirl33/ThreePointThree
[3.x] Map out modifiers for lut and handle json deserializing
2023-01-29 12:36:54 +01:00
Mordred
96b61dc3ed
Merge pull request #854 from hkAlice/3.3
[3.x] achievement code cleanup;
2023-01-29 12:36:03 +01:00
Mordred
f303cb3ebc Fixing placement and storage of yard items 2023-01-29 12:35:43 +01:00
Mordred
5839d12980 Placing of yard and interior items works... until you rezone... 2023-01-28 23:27:36 +01:00
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
Alice Ogeda
3c4b55859f achievement code cleanup; 2023-01-27 18:54:54 -03: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