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

5262 commits

Author SHA1 Message Date
Lucy
de31ef68ca Fix splitItem 2023-02-10 04:37:27 +01:00
collett
add5c215d4 gold saucer intro quest 2023-02-10 09:33:00 +09:00
Toofy
ea2705165a Reimplemented EventItem. Fixed bug with onDeath not triggering when bnpc kills player. Fixed EventItem struct. Implemented ClsThm050 quest. Fixed some wrong param names 2023-02-09 22:57:21 +00:00
Mordred
6a9f5b683f Fixed an issue with a missing lookup table update. Removed unneeded functions. 2023-02-09 17:58:25 +01:00
Mordred
9d647e2bde failing nullptr check should abort the function. 2023-02-09 12:55:45 +01:00
Mordred
07f0bd31bd Big refactoring of Freecompany code in preparation of further progress. 2023-02-09 12:19:10 +01:00
Mordred
81b4f8ac72 Fix linux build, properly display fc petition page based on member hierarchy. 2023-02-09 07:55:18 +01:00
Mordred
9c4eddce4a Sign petition work, member gets added to db, but not much else yet. 2023-02-08 23:27:12 +01:00
Mordred
ded211a6b5 getPlayerFreeCompany now returning the real result 2023-02-08 15:43:11 +01:00
Mordred
38b92fafa9 Create and load member lists of fcs. 2023-02-08 15:22:33 +01:00
Pinapelz
79bfbfb0c6 Implemented FesNyr201 (Heavensturn 2016) 2023-02-07 23:44:07 -08:00
Mordred
7af6846395 Fc is being loaded and sent to the master character. Member lists not maintained yet. 2023-02-07 14:13:47 +01:00
Mordred
8d46426599 Added functions for queueing packets for entire an entire ls or fc. 2023-02-07 09:26:41 +01:00
Mordred
75a66ac532 fixed a few typos in freecompanyMgr enum 2023-02-07 07:25:38 +01:00
Mordred
6a36433235 Another batch of FC boilerplate 2023-02-06 15:49:47 +01:00
Mordred
a36f53e5de Renamed the new sendEventNotice to sendNotice 2023-02-06 07:01:32 +01:00
Mordred
0df9fca281 Beginnings of FC. FC can be created in petition mode. 2023-02-05 22:46:46 +01:00
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