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

6875 commits

This branch
This branch
All branches
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
Mordred
9eaa423c23
Merge pull request #873 from T00fy/clsthm020 
Implementing quest ClsThm020
 2023-02-05 18:24: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
Adam
78d00b6088 update checkout action 2023-02-05 13:31:00 +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
Adam
2905fd9a4e
Merge pull request #868 from takhlaq/patch-1 
update readme build badge to use github actions
 2023-02-05 11:49:28 +11:00
Toofy
ad15ff5a0a Implementing subwil013 quest 2023-02-05 00:43:15 +00:00
Tahir
27cdc65b2e
update readme build badge to use github actions 2023-02-05 00:05:26 +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
4aac8d87c2
Merge pull request #863 from hkAlice/3.3 
[3.x] add wiki, game ver, patch info to readme; update readme;
 2023-02-04 21:46:03 +01: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
Alice Ogeda
29f8a8673a add wiki to readme; update readme; 2023-02-04 17:13:35 -03: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
587844f9fd Update CONTRIBUTING.md 2023-02-04 15:20:14 +01: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
Maru
7720bb6d68 Contributing.md 2023-02-04 14:59:19 +01:00
Mordred
6c209ccaff Merge remote-tracking branch 'origin/ThreePointThree' 2023-02-04 14:53:35 +01:00
Mordred
6669300124 Changed information in readme in merged develop into master 2023-02-04 14:25:46 +01:00
Mordred
8afaa0a42d Merge remote-tracking branch 'origin/develop' 2023-02-04 14:24:31 +01:00
Adam
fe26d3ba84
Merge pull request #860 from T00fy/levelfix 
Fixing bug where player info is not updated on level up
 2023-02-05 00:13:18 +11:00
Toofy
38665cb4a8 Fixing bug where player info is not updated on level up 2023-02-04 12:43:14 +00:00
Adam
d5c784f325
Merge pull request #858 from Skyliegirl33/ThreePointThree 
[3.x] Minor fixes (gil shops, findcontent struct)
 2023-02-04 12:23:57 +11:00
Adam
5fa64e96e4
Merge pull request #859 from T00fy/sql_fix 
Fixing error Table 'sapphire.freecompany' doesn't exist
 2023-02-04 12:23:31 +11:00
Toofy
d9192a655e Fixing error Table 'sapphire.freecompany' doesn't exist 2023-02-03 23:06:56 +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