1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-04 01:37:47 +00:00
Commit graph

5395 commits

Author SHA1 Message Date
Mordred
6e9d47b6a3 Added dynamic event notice function which takes a vector for its params. Supports up to 32 params. Can be omitted. 2023-02-05 21:30:02 +01:00
Toofy
ca036db5c9 Implementing quest ClsThm020 2023-02-05 15:29:04 +00:00
Adam
2d86fe3bbe
Merge pull request #871 from T00fy/subwil020
Fixing subwil020 quest
2023-02-05 14:00:16 +11:00
Adam
198969b80f
Merge pull request #870 from hkAlice/3.3
[3.x] add wiki_parser;
2023-02-05 13:57:36 +11:00
Toofy
11fb11bb32 Fixing subwil020 quest 2023-02-05 02:28:41 +00:00
Alice Ogeda
3ab3aa3c3b styling; 2023-02-04 22:59:03 -03:00
Alice Ogeda
a093ae9864 add wiki_parser; 2023-02-04 22:58:00 -03:00
Adam
1291d27a98
Merge pull request #869 from T00fy/subwil013
Implementing subwil013 quest
2023-02-05 12:45:20 +11:00
Adam
9ab126fc07
Merge pull request #866 from T00fy/subwil014
Implementing subwil014 quest
2023-02-05 11:50:21 +11:00
Toofy
ad15ff5a0a Implementing subwil013 quest 2023-02-05 00:43:15 +00:00
Toofy
6e210914aa Implementing subwil014 quest 2023-02-04 23:14:16 +00:00
Mordred
28e0d33921 Some more Fc testing code. 2023-02-04 23:41:04 +01:00
Mordred
54f3ffa063
Merge pull request #864 from takhlaq/ThreePointThree
[draft] fix typo in scripts cmake
2023-02-04 23:38:51 +01:00
Tahir
451f059bb7 have watchdog remove the lock file when finished loading the module
should be fixed fr fr this time ong
2023-02-04 22:01:13 +00:00
Mordred
7f48101dcd removed merge errors 2023-02-04 22:42:11 +01:00
Tahir
d2d451e670 fix typo in scripts cmake 2023-02-04 20:51:21 +00:00
Mordred
cb1408264c
Merge pull request #862 from T00fy/subwil015
Subwil015
2023-02-04 21:45:52 +01:00
Mordred
d52fac9e35
Merge pull request #861 from takhlaq/ThreePointThree
scripts: build modules to tmp directory before copying over to reload
2023-02-04 21:45:28 +01: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
Toofy
05b88a3038 Finish subwil015 quest 2023-02-04 19:39:10 +00:00
Toofy
5fd4ebab0e wip 2023-02-04 19:39:10 +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
11660773c2 Removed extra qualifier 2023-02-04 15:14:23 +01:00
Mordred
d10cb2e3e3 Fixed a merge error. 2023-02-04 15:13:42 +01:00
Mordred
b82ba38bc2 Merge branch 'master' of https://github.com/SapphireMordred/Sapphire into HEAD
# Conflicts:
#	src/common/Common.h
#	src/common/Network/PacketDef/Zone/ServerZoneDef.h
#	src/world/Event/Director.cpp
#	src/world/Event/Director.h
#	src/world/Event/EventHandler.cpp
#	src/world/Event/EventHandler.h
2023-02-04 15:03:20 +01:00
Mordred
bd5fe6f699 Another approach at event improvements 2023-02-04 15:00:00 +01:00
Mordred
6c209ccaff Merge remote-tracking branch 'origin/ThreePointThree' 2023-02-04 14:53:35 +01:00
Toofy
38665cb4a8 Fixing bug where player info is not updated on level up 2023-02-04 12:43:14 +00:00
Lucy
dbbc45d924 Fix FindContent struct 2023-02-03 23:40:24 +01:00
Lucy
9de70852cc Fix gil shops(?) 2023-02-03 23:39:41 +01:00
Mordred
47e6fe8562 More preparation work for free companies. 2023-02-03 22:52:59 +01: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
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
68a5040fb9 Class and db table for basic FC representation 2023-02-02 22:46:51 +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