Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[News] Permet d'ajouter une image aux news flash en jeu. #207

Open
wants to merge 2,066 commits into
base: oss
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 250 commits
Commits
Show all changes
2066 commits
Select commit Hold shift + click to select a range
281f466
Modify extension file and optimise gas_pump_1d props
Aurukh Jun 30, 2023
c0c128b
Modify extension file and optimise gas_pump_old2 props
Aurukh Jun 30, 2023
e491413
Modify extension file and optimise gas_pump_old3 props
Aurukh Jun 30, 2023
fbfdde1
Modify extension file and optimise vintage_pump props
Aurukh Jun 30, 2023
98eec00
Update vandalism props dynamically
Laikker Sep 10, 2023
2f86b94
feat(housing): col and occlusion
Rigonkmalk Sep 12, 2023
9c7d302
Merge pull request #4705 from SOZ-Faut-etre-Sub/feat/try-fix-ls-custom
NariieL Sep 12, 2023
07c4270
fix(pump): modified pump col and pos
Rigonkmalk Sep 12, 2023
e199cbc
fix(housing): col
Rigonkmalk Sep 12, 2023
4f7983c
fix(pump): modified pump col
Rigonkmalk Sep 12, 2023
76dc8fa
Revert "Merge pull request #4705 from SOZ-Faut-etre-Sub/feat/try-fix-…
Laikker Sep 12, 2023
7d11f00
Merge pull request #4711 from SOZ-Faut-etre-Sub/feat/appts_new
Rigonkmalk Sep 12, 2023
1e6af0d
Fix UPW vandalism
Laikker Sep 13, 2023
3807f40
Merge pull request #4707 from SOZ-Faut-etre-Sub/feat/4080-vandalism-u…
NariieL Sep 13, 2023
a1ad887
fix(atm): modified atm col
Rigonkmalk Sep 13, 2023
aa24a5f
fix(atm): modified pump 1a col
Rigonkmalk Sep 13, 2023
5831e7d
fix(atm): modified pump 1b col
Rigonkmalk Sep 13, 2023
0a608f9
fix(atm): modified pump old2 col
Rigonkmalk Sep 13, 2023
835699b
Revert "Revert "Merge pull request #4705 from SOZ-Faut-etre-Sub/feat/…
joelwurtz Sep 13, 2023
0368211
fix(atm): modified pump vintage col
Rigonkmalk Sep 13, 2023
340b88b
fix(atm): modified pump old3 col
Rigonkmalk Sep 13, 2023
8723239
fix(atm): modified pump 1b col
Rigonkmalk Sep 13, 2023
b10b1cb
fix(vehicle): set default configuration if not available
joelwurtz Sep 13, 2023
7a32754
fix(pump): modified pump col for old2 old3 vintage
Rigonkmalk Sep 13, 2023
6aa9c7e
fix(pump): deleted inertia and volume
Rigonkmalk Sep 13, 2023
ab3d31a
fix(pump): deleted inertia and volume vintage
Rigonkmalk Sep 13, 2023
dd8cf91
fix(pump): deleted inertia and volume old2
Rigonkmalk Sep 13, 2023
7f6c4ff
fix(pump): deleted inertia and volume 1b
Rigonkmalk Sep 13, 2023
174d4b6
fix(pump): deleted inertia and volume 1a
Rigonkmalk Sep 13, 2023
894f1b2
fix(pump): add static flag in ytyp
Rigonkmalk Sep 13, 2023
30b5cba
Merge pull request #4714 from SOZ-Faut-etre-Sub/fix/vandalism_props
Rigonkmalk Sep 13, 2023
eed8562
feat(cayo): add MLO lod and slod
Rigonkmalk Aug 17, 2023
a1bf788
feat(cayo): add building lod
Rigonkmalk Sep 13, 2023
7568b12
feat(cayo): unembedded texture
Rigonkmalk Sep 13, 2023
e322584
Impove visibility of the controls button for books
Laikker Sep 13, 2023
bc28e6d
Merge pull request #4717 from SOZ-Faut-etre-Sub/fix/book-control-visi…
joelwurtz Sep 13, 2023
55ecd05
feat(repository): implement new sync mecanism for repository
joelwurtz Sep 11, 2023
e00284b
Turn engine off and enable anchor when spawning boat
Laikker Sep 13, 2023
3944d1a
feat(mapper): fix new repository sync
joelwurtz Sep 13, 2023
34b7e17
Merge pull request #4704 from SOZ-Faut-etre-Sub/feat/rework-repository
NariieL Sep 13, 2023
4840719
Disable ragdoll inside house
Laikker Sep 14, 2023
da42ced
Fix estimate and resell price of veh mods
Laikker Sep 14, 2023
26b5868
Fix focus in dead input box
Laikker Sep 14, 2023
c7c376c
fix(sheriffdodge): duplicate bug for bones in the car
Rigonkmalk Sep 14, 2023
40d7642
feat(alerts) Verification du dernier tir dans la zone
Moustash Sep 14, 2023
c2ddecc
Merge pull request #4728 from SOZ-Faut-etre-Sub/feat(alerts)-checking…
NariieL Sep 14, 2023
299d67b
Merge pull request #4726 from SOZ-Faut-etre-Sub/fix/4657-dead-reason-…
NariieL Sep 14, 2023
d4c23a3
Merge pull request #4725 from SOZ-Faut-etre-Sub/fix/estimate-resell-m…
NariieL Sep 14, 2023
1c87b79
Merge pull request #4724 from SOZ-Faut-etre-Sub/feat/disable-ragdoll-…
NariieL Sep 14, 2023
c1d63d1
Update Density Try
NariieL Sep 14, 2023
8c3fa22
Add Yellow Jack for BAUN
Laikker Sep 14, 2023
aed8850
Fix position for shot alert
Laikker Sep 15, 2023
80924cb
Add baun crafting at Yellow Jack
Laikker Sep 15, 2023
2d6f48a
feat(UPW) Adding free station, increasing max capacity and productivity
Moustash Sep 10, 2023
bde729c
Logs and UPW restock is now paid
Moustash Sep 14, 2023
2842cd8
feat(panel): add missing activity in UPW panel
BernardJeremy Sep 15, 2023
cffc537
fix(vehicle): set as mission entity for pnj, better sync of perf on s…
joelwurtz Sep 15, 2023
28ad162
Merge pull request #4737 from SOZ-Faut-etre-Sub/fix/shot-alert-position
joelwurtz Sep 15, 2023
5cfbdb4
Merge pull request #4736 from SOZ-Faut-etre-Sub/feat/baun-yellow-jack
joelwurtz Sep 15, 2023
521d4e6
Fix gloves with patient outfit
Laikker Sep 15, 2023
b7ca871
Improve error message when stockage is full
Laikker Sep 16, 2023
733ee9a
Set trunk zone at the bottom of veh to avoid issue with very height v…
Laikker Sep 16, 2023
ca1855e
Increase freeze duration when TP to avoid mouvements before target lo…
Laikker Sep 16, 2023
27c4b22
fix(vehicle): only apply modification avoid removing other mods
joelwurtz Sep 16, 2023
9cce085
Merge pull request #4743 from SOZ-Faut-etre-Sub/fix/4453-stockage-ful…
joelwurtz Sep 16, 2023
db27c8f
Merge pull request #4747 from SOZ-Faut-etre-Sub/fix/3562-tp-freeze-time
joelwurtz Sep 16, 2023
85a315c
Merge pull request #4749 from SOZ-Faut-etre-Sub/fix/mod-fu
joelwurtz Sep 16, 2023
5f14289
Fix make sure isDead state is correctly initialized
Laikker Sep 16, 2023
18585e0
When reapplying veh performance, only apply modification set
Laikker Sep 16, 2023
972dc99
Merge pull request #4752 from SOZ-Faut-etre-Sub/fix/veh-performance-c…
NariieL Sep 16, 2023
679649d
feat(vehicle): sync condition and configuration from client when a pn…
joelwurtz Sep 16, 2023
4544bd2
fix(housing): fix for route 68 col housing
Rigonkmalk Sep 16, 2023
4438e8a
refactor(housing): moved low_16 from new to root folder
Rigonkmalk Sep 16, 2023
190174a
feat(housing): add new appartements
Rigonkmalk Sep 16, 2023
2a43eb8
fix(housing): solved col for paleto housing
Rigonkmalk Sep 16, 2023
882bbc1
Editing plant
Moustash Sep 16, 2023
2e00ad0
feat(zone): allow to add no stress zones
joelwurtz Sep 16, 2023
d17b729
Merge pull request #4754 from SOZ-Faut-etre-Sub/feat/vehicle-pnj
joelwurtz Sep 16, 2023
9a3ecfc
Merge pull request #4757 from SOZ-Faut-etre-Sub/feat/no-stress-zone
joelwurtz Sep 16, 2023
df5c1d2
remove console log
joelwurtz Sep 16, 2023
9b373d6
Update forced ITT with injuries
Laikker Sep 16, 2023
8f48def
Merge pull request #4758 from SOZ-Faut-etre-Sub/feat/fdo-injury-update
NariieL Sep 17, 2023
8068605
Merge pull request #4700 from SOZ-Faut-etre-Sub/4688-upw-review
NariieL Sep 17, 2023
21ef53a
fix(vehicle), fix errors on stolen car, random oil and fuel in this case
joelwurtz Sep 17, 2023
fa8197a
fix(lsmc): audio and portal work
Rigonkmalk Sep 3, 2023
7fa70e2
fix(lsmc): finalise portal items
Rigonkmalk Sep 3, 2023
b7301af
feat(mapdata): working on LSMC int for portal
Rigonkmalk Sep 17, 2023
89cda26
feat(mapdata): working on a global mapdata
Rigonkmalk Sep 17, 2023
8f7210b
feat(mapdata): working on LSMC scenario
Rigonkmalk Sep 17, 2023
4cf30a7
feat(mapdata): mapdata
Rigonkmalk Sep 17, 2023
cbdbced
feat(mapdata): MTP & Stonk
Rigonkmalk Sep 17, 2023
84b7263
feat(mapdata): housing col
Rigonkmalk Sep 17, 2023
3765bc0
Merge pull request #4763 from SOZ-Faut-etre-Sub/fix/stolen-car
joelwurtz Sep 17, 2023
91d5f00
fix(vehicle): only apply vehicule performance on ls custom, should av…
joelwurtz Sep 17, 2023
f696310
fix(hammer)
Zocaxu Sep 17, 2023
0800252
Delete outfit chef d'atelier, mécano confirmé, mécano novice, respons…
Vincent-Sniteur Jun 14, 2023
ff09dda
oss - phone options - Mutualize contact in DialerHistory
Maskowh May 20, 2023
cfbab11
oss - phone options - Mutualize isContactRegistered in DialerHistory
Maskowh May 20, 2023
d20d229
oss - phone options - Add options in DialerHistory
Maskowh May 20, 2023
5140b85
oss - phone options - Linter in DialerHistory
Maskowh May 20, 2023
776e6ee
chore: improve message icon
sebastiendeu Sep 17, 2023
d032d7d
OSS - Fix hitboxes for Notes buttons
Maskowh May 21, 2023
05f46e3
OSS - Add infos on bank notifications
Maskowh May 20, 2023
10d0ba4
OSS - Notif virements - Lua linting
Maskowh Jun 15, 2023
c8213f9
feat(player): add a anti fall down script
joelwurtz Sep 17, 2023
ebc84d7
Merge pull request #4770 from SOZ-Faut-etre-Sub/merge-pr-201
joelwurtz Sep 17, 2023
f739ee6
Merge pull request #4767 from SOZ-Faut-etre-Sub/merge-pr-254
joelwurtz Sep 17, 2023
380360b
Merge pull request #4768 from SOZ-Faut-etre-Sub/merge-pr-214
joelwurtz Sep 17, 2023
44ee5ac
Merge pull request #4769 from SOZ-Faut-etre-Sub/merge-pr-199
joelwurtz Sep 17, 2023
3f22046
Merge pull request #4772 from SOZ-Faut-etre-Sub/feat/no-fall-down
joelwurtz Sep 17, 2023
5b8c669
Merge pull request #4765 from SOZ-Faut-etre-Sub/feat/mapdata
Rigonkmalk Sep 17, 2023
ebded42
feat(housing): allow to add / remove culling hash to property
joelwurtz Sep 17, 2023
dc2915d
Increase society safe size
Laikker Sep 17, 2023
27808d1
Merge pull request #4777 from SOZ-Faut-etre-Sub/feat/housing-culling
joelwurtz Sep 17, 2023
084b0e9
Merge pull request #4778 from SOZ-Faut-etre-Sub/feat/update-safe-size
joelwurtz Sep 17, 2023
7a4c063
Add 3 fridges for CM
Laikker Sep 17, 2023
6911f96
Merge pull request #4779 from SOZ-Faut-etre-Sub/feat/add-fridge-CM
joelwurtz Sep 17, 2023
b5e36ac
Disable anti falldown as it leads to many issue
Laikker Sep 18, 2023
5e1db72
fix(housing): house_low_23
Rigonkmalk Sep 18, 2023
d5e7065
fix(housing): house_mid_129
Rigonkmalk Sep 18, 2023
861fde7
fix(housing): south_house_mid_124
Rigonkmalk Sep 18, 2023
091dec3
fix(doortuning): add supermodgarage for NG garage door
Rigonkmalk Sep 18, 2023
733e798
fix(housing): south_appartements_110
Rigonkmalk Sep 18, 2023
c2e3378
feat(demetal): MLO
Rigonkmalk Sep 18, 2023
507553a
feat(demetal): vehicles
Rigonkmalk Sep 18, 2023
44197de
Merge pull request #4789 from SOZ-Faut-etre-Sub/feat/demetal
Rigonkmalk Sep 18, 2023
5597495
do not skip null, instead filter a list of properties to update
joelwurtz Sep 18, 2023
c672216
fix(cm): audio scenario
Rigonkmalk Sep 18, 2023
4d690f0
refactor(fxmanifest): update to cerulean fxmanifest
Rigonkmalk Sep 18, 2023
781ef41
Merge pull request #4794 from SOZ-Faut-etre-Sub/fix/fxmanifest
Rigonkmalk Sep 18, 2023
29f7158
chore(cm): delete cm interior scenario
Rigonkmalk Sep 19, 2023
b3b74cb
chore(ymap): delete entites
Rigonkmalk Sep 19, 2023
cc99d7d
chore(buiding): delete fakeint
Rigonkmalk Sep 19, 2023
58f3250
Merge pull request #4808 from SOZ-Faut-etre-Sub/fix/4801_building
Rigonkmalk Sep 19, 2023
2bae32c
Merge pull request #4806 from SOZ-Faut-etre-Sub/chore/cm_scenario
Rigonkmalk Sep 19, 2023
e1ba7f6
Increase private garage to 60 places
Laikker Sep 19, 2023
5ce1537
feat(bound): modified bound for 117 house
Rigonkmalk Sep 19, 2023
de8d0ca
Use craft UI for CM
Laikker Sep 19, 2023
8b015b4
Fix saving outfit in someone else apartement which is not upgraded
Laikker Sep 19, 2023
051609c
Merge pull request #4810 from SOZ-Faut-etre-Sub/feat/increase-private…
NariieL Sep 20, 2023
6c9ccc3
Merge pull request #4819 from SOZ-Faut-etre-Sub/fix/4817-bug-minor-ho…
NariieL Sep 20, 2023
56d6606
Merge pull request #4815 from SOZ-Faut-etre-Sub/fix/117_house_mid
NariieL Sep 20, 2023
07baae4
Fix CM food crafting UI
Laikker Sep 20, 2023
3a14a8a
Fix vandlism state of bin after reboot
Laikker Sep 21, 2023
45def97
feat(cm): delete all audio properties for v_ranch
Rigonkmalk Sep 21, 2023
a1154fa
Update armor metadata every second if changed
Laikker Sep 21, 2023
4b326a1
add dummy bag for FDO outfit which does not have it
Laikker Sep 21, 2023
4ddadf7
Fix hide speedometer when fast exit and enter veh
Laikker Sep 21, 2023
9b8b600
Merge pull request #4830 from SOZ-Faut-etre-Sub/fix/4811-vandalism-bi…
NariieL Sep 21, 2023
04523e5
Merge pull request #4832 from SOZ-Faut-etre-Sub/fix/4797-armor-metada…
NariieL Sep 21, 2023
6734854
Merge pull request #4833 from SOZ-Faut-etre-Sub/fit/4804-fdo-bag-outfit
NariieL Sep 21, 2023
100a341
Merge pull request #4834 from SOZ-Faut-etre-Sub/fix/4824-speedometer-…
NariieL Sep 21, 2023
93d929e
Fix inventory users when exiting storage UI due to external event
Laikker Sep 22, 2023
596e345
Update craft UI for BAUN and FFS
Laikker Sep 19, 2023
2b7d396
Increase new comer ticket duration
Laikker Sep 22, 2023
2a92f5f
Remove Summer housing sales and summer loading screen
Laikker Sep 22, 2023
60369e9
Merge pull request #4839 from SOZ-Faut-etre-Sub/fix/new-comer-ticket-…
NariieL Sep 22, 2023
7608bc1
Merge pull request #4838 from SOZ-Faut-etre-Sub/fix/4407-inventory-us…
NariieL Sep 22, 2023
9eba3df
Merge pull request #4818 from SOZ-Faut-etre-Sub/feat/BAUN-FFS-craft-UI
NariieL Sep 22, 2023
93ab982
Fix craft animation + baun recipes + FFS transform duration
Laikker Sep 23, 2023
342484c
feat(fdf): add dynamic flag for targetable assets
Rigonkmalk Sep 23, 2023
40eabfa
fix(globalmap): add static flag for door
Rigonkmalk Sep 23, 2023
45f3071
fix(globalmap): add dynamic flag
Rigonkmalk Sep 23, 2023
449edf9
fix(globalmap): add dynamic flag replace assets
Rigonkmalk Sep 23, 2023
0fef372
Merge pull request #4845 from SOZ-Faut-etre-Sub/fix/4825_col
Rigonkmalk Sep 23, 2023
f22db1c
Restore craft event names for job panels
Laikker Sep 23, 2023
43f017a
Disable cayo map always present as it causes lag when opening map
Laikker Sep 23, 2023
7fb8d31
Merge pull request #4843 from SOZ-Faut-etre-Sub/fix/craft-job-animation
NariieL Sep 24, 2023
7f3621e
Merge pull request #4848 from SOZ-Faut-etre-Sub/fix/remove-alweays-pr…
NariieL Sep 24, 2023
c53103b
Demandes 1 à 6 + Tronçonneuse
Moustash Sep 19, 2023
e9ef69a
Craft
Moustash Sep 22, 2023
7076b8f
feat(forest): update forest north and south
Rigonkmalk Sep 19, 2023
f5d5566
feat(forest): update forest north and south
Rigonkmalk Sep 22, 2023
864976b
feat(forest): north forest col
Rigonkmalk Sep 23, 2023
8226981
feat(forest): south forest col
Rigonkmalk Sep 23, 2023
98b8138
feat(trees): add data_file on fxmanifest; moved tree into propsexterieur
Rigonkmalk Sep 24, 2023
b873c19
New zones
Moustash Sep 24, 2023
959517c
Craft with animation
Moustash Sep 24, 2023
33dd2dc
Add sampling profiler command
Laikker Sep 24, 2023
6a65042
Reviews : Storages, LSMC, chainsaw
Moustash Sep 24, 2023
a5c5bb6
ClearWeapon
Moustash Sep 25, 2023
f993511
Fix new generation repository synchro to return recoed instead of array
Laikker Sep 25, 2023
c5047dc
Merge pull request #4856 from SOZ-Faut-etre-Sub/feat/sampling-profiler
joelwurtz Sep 25, 2023
e5483fa
feat(trees): increase LodDist in ytyp
Rigonkmalk Sep 25, 2023
5b7155a
Update PNJ Density Testing
NariieL Sep 25, 2023
57cdd31
Add information about anchor in boat driving school
Laikker Sep 25, 2023
d0cce58
Update gta-server/resources/[soz]/soz-pawl/client/field.lua
NariieL Sep 26, 2023
74ac49b
Update gta-server/resources/[soz]/soz-pawl/client/field.lua
NariieL Sep 26, 2023
1fc4a96
Merge pull request #4855 from SOZ-Faut-etre-Sub/4796-pawl-review
NariieL Sep 26, 2023
911ad9b
Fix infinite loading of undefined animset
Laikker Sep 26, 2023
002c5ce
fix(trees): optimize ytyp
Rigonkmalk Sep 26, 2023
80ccbf5
fix(trees): north forest
Rigonkmalk Sep 26, 2023
b4e78a9
fix(trees): south forest
Rigonkmalk Sep 26, 2023
d538bda
Merge pull request #4863 from SOZ-Faut-etre-Sub/fix/invalid-animset-load
joelwurtz Sep 26, 2023
7c3bf5a
Fix SQL request to find houses to clean due to inactivity or reroll
Laikker Sep 26, 2023
f40b8ae
Fix transfer notif when it comes from an society
Laikker Sep 26, 2023
9a75dd8
Merge pull request #4868 from SOZ-Faut-etre-Sub/fix/4823-society-tran…
NariieL Sep 27, 2023
4a44a08
delete collision
Aurukh Sep 27, 2023
1f8c03a
Delete car generator
Aurukh Sep 27, 2023
93d7d85
Delete armed vehicles
Aurukh Sep 27, 2023
22c80cd
Add HTTP entry point to set player outside and TP airport
Laikker Sep 27, 2023
cc8e721
feat(grant): add grant house
Rigonkmalk Sep 27, 2023
dc0bdfa
Create Grant house in DB directly with owner and zone
Laikker Sep 27, 2023
1a1918a
Merge pull request #4874 from SOZ-Faut-etre-Sub/feat/grant_house
joelwurtz Sep 27, 2023
e9ecf68
Merge pull request #4873 from SOZ-Faut-etre-Sub/feat/api-command-TP-o…
joelwurtz Sep 27, 2023
ea410bc
feat(col): delete col for trees in mdr heliport
Rigonkmalk Sep 28, 2023
2d394d8
Check model is correct before deleting entity
Laikker Sep 29, 2023
ea63fc9
For metrics for unemployed crimi player, set job as crimi
Laikker Sep 29, 2023
b7a288b
feat(fdf): add corn with col
Rigonkmalk Sep 29, 2023
b3565ac
feat(fdf): add dynamic flag
Rigonkmalk Sep 29, 2023
e163ee7
fix(trees): poly edge fixing
Rigonkmalk Sep 29, 2023
abe38a6
fix(feat/housing_marina): delete portique
Rigonkmalk Sep 29, 2023
561c6ef
Fix clear house stash on house clean
Laikker Sep 29, 2023
f82e2b7
Use different metric for transform and craft for FFS
Laikker Sep 30, 2023
8f77e32
fix(fdf): tree and col
Rigonkmalk Sep 30, 2023
1c8c25f
fix(fix/pencil_lsmc): delete assets pencil
Rigonkmalk Sep 30, 2023
d062ef4
Loop correctly on all seats when search dead to extract
Laikker Oct 1, 2023
42ce018
Fix launch end call sound on missing call only if phone available
Laikker Oct 1, 2023
6c50a72
Merge pull request #4881 from SOZ-Faut-etre-Sub/feat/crimi-job-metrics
joelwurtz Oct 1, 2023
39ee581
Merge pull request #4907 from SOZ-Faut-etre-Sub/fix/4901-extract-dead…
joelwurtz Oct 1, 2023
48ee567
Merge pull request #4890 from SOZ-Faut-etre-Sub/fix/job-craft-event-p…
joelwurtz Oct 1, 2023
95012cb
Merge pull request #4889 from SOZ-Faut-etre-Sub/fix/clear-house-stash…
joelwurtz Oct 1, 2023
6f58b44
feat(vehicle): put hard limit on boat to not explode when coming out …
joelwurtz Oct 1, 2023
b39f6a0
Merge pull request #4911 from SOZ-Faut-etre-Sub/fix/4903-end-call-sou…
joelwurtz Oct 1, 2023
9e37303
Merge pull request #4914 from SOZ-Faut-etre-Sub/feat/do-not-explode-boat
joelwurtz Oct 2, 2023
260f0fc
fix(vehicle): apply perf after condition, avoid over repair
joelwurtz Oct 2, 2023
392c3b2
Merge pull request #4915 from SOZ-Faut-etre-Sub/fix/try-to-fix-perf
joelwurtz Oct 2, 2023
79c71d8
fix(vehicle): fix having to repair with hands
joelwurtz Oct 2, 2023
f1c17d0
Ajoutr de Ferme de Fou
Laikker Sep 23, 2023
2bc97d7
feat(fdf): tree, col, refactor folder
Rigonkmalk Sep 30, 2023
6a0f7f9
feat(fdf): add intercom
Rigonkmalk Sep 30, 2023
a07c68f
Update Ferme de Fou
Laikker Sep 30, 2023
cc751b7
feat(discord): update rich presence text to 350 players max
BernardJeremy Oct 2, 2023
187111c
feat(vehicle): sync when entering / leaving the vehicle
joelwurtz Oct 2, 2023
2449d51
Update Ferme de Fou
Laikker Oct 2, 2023
3c705d0
remove get network id
joelwurtz Oct 2, 2023
aba5ff7
Merge pull request #4919 from SOZ-Faut-etre-Sub/feat/update_rich_inte…
joelwurtz Oct 2, 2023
8d11f5f
feat(prop): use latent event to decrease network load
joelwurtz Oct 2, 2023
f49dfe4
Merge pull request #4887 from SOZ-Faut-etre-Sub/feat/fdf
NariieL Oct 3, 2023
01e9a6d
Icones manquantes salle de sport
Moustash Oct 3, 2023
9b1db84
Icones muscle peach
Moustash Oct 3, 2023
5c92bfa
fix(LSMC) Icones manquantes
Moustash Oct 3, 2023
54d7798
Fix(weather) Weather app and weather are now sync
Moustash Oct 3, 2023
e6a5d5f
Fix FDF society phone page
Laikker Oct 3, 2023
4929aca
Overloaded state when inventory.weigth > inventory.maxweight
Laikker Oct 3, 2023
9f78379
Merge pull request #4929 from SOZ-Faut-etre-Sub/fix(lsmc)-icons
joelwurtz Oct 3, 2023
72a198f
Merge pull request #4931 from SOZ-Faut-etre-Sub/fix(weather)-weather-app
joelwurtz Oct 3, 2023
3ecb482
Merge pull request #4932 from SOZ-Faut-etre-Sub/feat/fdf
joelwurtz Oct 3, 2023
d8db879
Merge pull request #4933 from SOZ-Faut-etre-Sub/feat/4119-backpain
joelwurtz Oct 3, 2023
df35f08
Merge branch 'oss' into 206-peugeot-but-also-image-for-news
Mcfloy Oct 7, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
17 changes: 17 additions & 0 deletions .github/workflows/pull-request-tracking.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: "Automatic Pull Request tracking"

on:
pull_request:
types:
- opened

jobs:
add-to-project:
runs-on: ubuntu-latest

name: Add pull request to project
steps:
- uses: actions/[email protected]
with:
project-url: https://github.com/orgs/SOZ-Faut-etre-Sub/projects/3
github-token: ${{ secrets.GH_ADD_TO_PROJECT_TOKEN }}
1 change: 1 addition & 0 deletions env.cfg-dist
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ set mysql_debug true
# Disable steam login for development usage
# This will allow you to connect to the server without having a steam account and use the rockstar license field instead
#set soz_disable_steam_credential true
#set soz_enable_test_auth true

# Mumble configuration
# Allow to use an external mumble server
Expand Down
3 changes: 0 additions & 3 deletions modules-prod.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ start [lib]
# Mysql
start oxmysql

# Tooling
start soz-monitor

# SOZ
start [qb]
start [soz]
Expand Down
9 changes: 0 additions & 9 deletions modules-test.cfg
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
# Use production settings
exec modules-prod.cfg

# Test specific settings under this line
# Mapping
start [mapping-test]

# Vehicles
start [vehicles-test]

# Features

# Environment
setr soz_core_environment test
9 changes: 0 additions & 9 deletions modules.cfg
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
# Use test settings
exec modules-test.cfg

# Dev specific settings under this line
# Mapping
start [mapping-dev]

# Vehicles
start [vehicles-dev]

# Features

# Environment
setr soz_core_environment development
3 changes: 3 additions & 0 deletions resources/[clothes]/soz_clothes/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@
0 stétho //same as vanilla?
1 pistol
2 badge LSPD/BCSO
3 harnais holster
4 holster ceinture

bag
0 LSPD badge pectoraux
Expand All @@ -64,6 +66,7 @@
2 chapeau BCSO
3 casque pompier //same as vanilla?
4 casque pilote LSPD/BCSO //logo LSPD manquant
5 oreille lapin



Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<ShopPedApparel>
<pedName>mp_f_freemode_01</pedName>
<dlcName>soz_custom</dlcName>
<fullDlcName>mp_f_freemode_01_soz_custom</fullDlcName>
<eCharacter>SCR_CHAR_MULTIPLAYER_F</eCharacter>
<creatureMetaData>MP_CreatureMetadata_soz_bcso</creatureMetaData>
<pedOutfits/>
<pedComponents/>
<pedProps/>
</ShopPedApparel>
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<ShopPedApparel>
<pedName>mp_m_freemode_01</pedName>
<dlcName>soz_custom</dlcName>
<fullDlcName>mp_m_freemode_01_soz_custom</fullDlcName>
<eCharacter>SCR_CHAR_MULTIPLAYER</eCharacter>
<creatureMetaData>MP_CreatureMetadata_soz_bcso</creatureMetaData>
<pedOutfits/>
<pedComponents/>
<pedProps/>
</ShopPedApparel>
2 changes: 2 additions & 0 deletions resources/[clothes]/soz_clothes/fxmanifest.lua
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,5 @@ files {

data_file 'SHOP_PED_APPAREL_META_FILE' 'data/mp_f_freemode_01_soz_bcso.meta'
data_file 'SHOP_PED_APPAREL_META_FILE' 'data/mp_m_freemode_01_soz_bcso.meta'
data_file 'SHOP_PED_APPAREL_META_FILE' 'data/mp_f_freemode_01_soz_custom.meta'
data_file 'SHOP_PED_APPAREL_META_FILE' 'data/mp_m_freemode_01_soz_custom.meta'
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion resources/[default]/[gameplay]/chat/dist/ui.html

Large diffs are not rendered by default.

26 changes: 14 additions & 12 deletions resources/[default]/[system]/baseevents/vehiclechecker.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
local isInVehicle = false
local isEnteringVehicle = false
local currentVehicle = 0
local currentVehicleNetId = 0
local currentSeat = 0

Citizen.CreateThread(function()
Expand Down Expand Up @@ -28,24 +29,25 @@ Citizen.CreateThread(function()
isInVehicle = true
currentVehicle = GetVehiclePedIsUsing(ped)
currentSeat = GetPedVehicleSeat(ped)
local model = GetEntityModel(currentVehicle)
local name = GetDisplayNameFromVehicleModel()
local netId = VehToNet(currentVehicle)
TriggerEvent('baseevents:enteredVehicle', currentVehicle, currentSeat, GetDisplayNameFromVehicleModel(GetEntityModel(currentVehicle)), netId)
TriggerServerEvent('baseevents:enteredVehicle', currentVehicle, currentSeat, GetDisplayNameFromVehicleModel(GetEntityModel(currentVehicle)), netId)
currentVehicleNetId = VehToNet(currentVehicle)
TriggerEvent('baseevents:enteredVehicle', currentVehicle, currentSeat)
TriggerServerEvent('baseevents:enteredVehicle', currentVehicleNetId, currentSeat)
end
elseif isInVehicle then
local pedInSeat = GetPedInVehicleSeat(currentVehicle, currentSeat)

if not IsPedInAnyVehicle(ped, false) or IsPlayerDead(PlayerId()) then
-- bye, vehicle
local model = GetEntityModel(currentVehicle)
local name = GetDisplayNameFromVehicleModel()
local netId = VehToNet(currentVehicle)
TriggerEvent('baseevents:leftVehicle', currentVehicle, currentSeat, GetDisplayNameFromVehicleModel(GetEntityModel(currentVehicle)), netId)
TriggerServerEvent('baseevents:leftVehicle', currentVehicle, currentSeat, GetDisplayNameFromVehicleModel(GetEntityModel(currentVehicle)), netId)
TriggerEvent('baseevents:leftVehicle', currentVehicle, currentSeat)
TriggerServerEvent('baseevents:leftVehicle', currentVehicleNetId, currentSeat)
isInVehicle = false
currentVehicle = 0
currentSeat = 0
end
elseif pedInSeat ~= ped then
currentSeat = GetPedVehicleSeat(ped)
local netId = VehToNet(currentVehicle)
TriggerEvent('baseevents:changedVehicleSeat', currentVehicle, currentSeat)
TriggerServerEvent('baseevents:changedVehicleSeat', netId, currentSeat)
end
end
Citizen.Wait(50)
end
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
3 changes: 0 additions & 3 deletions resources/[lib]/screenshot-basic/.gitignore

This file was deleted.

7 changes: 0 additions & 7 deletions resources/[lib]/screenshot-basic/LICENSE

This file was deleted.

91 changes: 0 additions & 91 deletions resources/[lib]/screenshot-basic/README.md

This file was deleted.

22 changes: 0 additions & 22 deletions resources/[lib]/screenshot-basic/client.config.js

This file was deleted.

1 change: 0 additions & 1 deletion resources/[lib]/screenshot-basic/dist/client.js

This file was deleted.

Loading