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

6793 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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