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

[Loadscreen] Display random server rule on loadscreen #198

Open
wants to merge 964 commits into
base: oss
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
964 commits
Select commit Hold shift + click to select a range
56a8347
fix(burrito6): fixed logo with NG instead of bennys
Rigonkmalk May 16, 2023
02cbffa
Updates crimi
Laikker May 14, 2023
0b7bc59
Merge pull request #3695 from SOZ-Faut-etre-Sub/fix/bennys_sticker_bu…
NariieL May 16, 2023
5fedf0d
Merge pull request #3686 from SOZ-Faut-etre-Sub/feat/3673-modificatio…
NariieL May 18, 2023
ca00628
Fix 2 recipies + Display bundle size in UI
Laikker May 19, 2023
198b06e
Add blibs for UPW charger stations
Laikker May 19, 2023
cc24960
Fix speed limiter UI
Laikker May 20, 2023
cfdb93b
Fix ng outfit
Laikker May 20, 2023
81bcc6c
Fix stress unblur grippe effect
Laikker May 20, 2023
b3ee221
Merge pull request #3717 from SOZ-Faut-etre-Sub/fix/3702-speed-limit-…
joelwurtz May 20, 2023
39eab90
Merge pull request #3718 from SOZ-Faut-etre-Sub/fix/3701-ng-outfit
joelwurtz May 20, 2023
25c5057
Remove weapon animation when exiting firetruk
Laikker May 20, 2023
9b2675d
Fix create hierarchy for walkstyle
Laikker May 20, 2023
8b750c5
Rajout HammerPlace
Aurukh May 20, 2023
2be049c
Test
Aurukh May 20, 2023
7e727c3
Delete toto.txt
Aurukh May 20, 2023
ec964f2
fix: Change driving school checkpoint description about Zevent to ZLAN.
Ixelka May 20, 2023
6beea3f
fix(fxmanifest): rename _resource.lua to fxmanifest.lua
Rigonkmalk May 20, 2023
665400b
feat(lodslights): fixed lod lights on hammer place
Rigonkmalk May 20, 2023
6c70158
Prevent using garage after crimi action
Laikker May 20, 2023
725010f
Fix armor bar display
Laikker May 20, 2023
32b4ae1
chore(fitness): moved fitness
Rigonkmalk May 21, 2023
e95e4f7
Changement HammerPlace
Aurukh May 21, 2023
8f2f7fc
feat(cayo): working on bank mlo
Rigonkmalk May 21, 2023
1fd0acc
chore(hammerplace): delete old hammer
Rigonkmalk May 21, 2023
848a111
chore(hammerplace): move occl_04 to int_court mlo
Rigonkmalk May 21, 2023
f08ff90
fix(flatbed) Fixing pnj vehicle stuck in mid air after towing
toshiirox May 21, 2023
97baf9a
feat(hammerplace): add LOD and SLOD1 with hammer
Rigonkmalk May 21, 2023
00f419d
chore(hammerplace): decrease LODdist of the hammer 200 -> 100
Rigonkmalk May 21, 2023
f9da8b9
Rename & Clean le props Hammer
Aurukh May 21, 2023
190c085
Clean hierarchy entity dt1_13_build2
Aurukh May 22, 2023
761407a
Change LOD
Aurukh May 22, 2023
95ecf6e
Move lights
Aurukh May 22, 2023
981c6bc
Add confirm input for house sell
Laikker May 22, 2023
63099c5
feat(hammerplace): optimize texture and meshes; add lproxy
Rigonkmalk May 22, 2023
a2e8cad
chore(hammerplace): move hammerplace to mapping-test
Rigonkmalk May 22, 2023
9772d1d
Merge pull request #3728 from SOZ-Faut-etre-Sub/chore/fitness
NariieL May 22, 2023
dc9a0e4
Merge pull request #3726 from SOZ-Faut-etre-Sub/fix/3691-armor-bar-UI
NariieL May 22, 2023
2229358
Merge pull request #3724 from SOZ-Faut-etre-Sub/fix/3689-change-drivi…
NariieL May 22, 2023
79f99df
Merge pull request #3725 from SOZ-Faut-etre-Sub/feat/3685-block-garag…
NariieL May 22, 2023
f6f94eb
Merge pull request #3714 from SOZ-Faut-etre-Sub/feat/blip-upw-station
NariieL May 22, 2023
1a7067f
Merge pull request #3720 from SOZ-Faut-etre-Sub/fix/3696-weapon-anima…
NariieL May 22, 2023
6cd74b7
Merge pull request #3722 from SOZ-Faut-etre-Sub/fix/3703-walkstyle
NariieL May 22, 2023
86618a8
Merge pull request #3723 from SOZ-Faut-etre-Sub/HammerPlace
NariieL May 22, 2023
d9291f2
Add expiration on bloodbag
Laikker May 22, 2023
5254be4
(panel): add MDR management for investigation lawyers
BernardJeremy May 23, 2023
da7ce02
chore(hammerplace): move hammerplace to mapping-prod
Rigonkmalk May 23, 2023
5615621
Red health bar below 20% Max HP
Laikker May 23, 2023
de1ef0b
feature(MTP) Upgrading Tanker tunks weight
toshiirox May 24, 2023
4c97e40
feature(MTP) Upgrading resell price
toshiirox May 24, 2023
5804141
feature(MTP) Upgrading Oil station capacity
toshiirox May 24, 2023
9734da5
feature(MTP) Upgrading fields production
toshiirox May 24, 2023
7b6af9b
reviews(MTP) Fixing resell duration
toshiirox May 24, 2023
c609926
fix(binoculars): Migrate from lua code to TS. Prevent from using any …
Ixelka May 24, 2023
1964407
Update CarlJr parking position
Laikker May 25, 2023
b59ad78
feat(housing): Appartements version 3.0
Rigonkmalk May 25, 2023
69f8472
Merge pull request #3764 from SOZ-Faut-etre-Sub/fix/3752-parking-cjr
NariieL May 26, 2023
45ea7fd
Merge pull request #3758 from SOZ-Faut-etre-Sub/fix/2905-binoculars-u…
NariieL May 26, 2023
6cf1d3c
Merge pull request #3729 from SOZ-Faut-etre-Sub/3377-pnj-vehicle-stuc…
NariieL May 26, 2023
a5818fb
feat(carpark): delete fence; fix col
Rigonkmalk May 26, 2023
e5ec9c0
Fix watermark on photo
Laikker May 26, 2023
78c9b53
Fix: change refuse invoice control id key
Laikker May 26, 2023
bec0fc5
Fix: Prevent acceleration when using GPB
Laikker May 26, 2023
6913476
Merge pull request #3776 from SOZ-Faut-etre-Sub/fix/3759-acceleration…
NariieL May 26, 2023
8e0e8d6
Merge pull request #3770 from SOZ-Faut-etre-Sub/fix/3768-watermark-photo
NariieL May 26, 2023
b34ce87
Merge pull request #3756 from SOZ-Faut-etre-Sub/3748-mtp-reviews
NariieL May 26, 2023
f8a21d0
Update CarlJr parking
Laikker May 27, 2023
7c865a7
Merge pull request #3664 from SOZ-Faut-etre-Sub/fix/3557-animation-exit
joelwurtz May 27, 2023
8c1827c
Merge pull request #3780 from SOZ-Faut-etre-Sub/fix/3752-parking-cjr
joelwurtz May 27, 2023
765f1f7
Feat Soft pound and federal pound
Laikker May 25, 2023
df41a6f
Fix set Missing state when losing last wehicle life in soft-pound
Laikker May 27, 2023
587df2b
Merge pull request #3760 from SOZ-Faut-etre-Sub/feat/3374-pound-update
NariieL May 28, 2023
c91c624
fix(appts): solved col issue; update position for mid_46
Rigonkmalk May 28, 2023
10fd942
Remove logs.
Ixelka May 28, 2023
d3809b8
feat(appts): add new appts; fixed col and occlusion
Rigonkmalk May 28, 2023
0475f1c
feat(cayo): add bank and 247
Rigonkmalk May 28, 2023
2839744
Merge pull request #3792 from SOZ-Faut-etre-Sub/fix/3785-remove-logs
joelwurtz May 28, 2023
6f1caed
feat(discord): forward FIB message to discord
BernardJeremy May 9, 2023
b8c365f
Update gta-server/resources/[soz]/soz-utils/server/_main.lua
BernardJeremy May 9, 2023
7123a00
feat(discord): use axios to send FIB messages to discord
BernardJeremy May 29, 2023
c9f1faf
feat(infra): add test mode for test server, allowing only staff and m…
joelwurtz May 29, 2023
7fe4076
feat(cayo): add 247 mlo; working on terrain for 247
Rigonkmalk May 29, 2023
33a7e83
fix(warning): fixed interiorproxies.meta warning
Rigonkmalk May 29, 2023
c7f432f
feat(cayo): working on ground; add 247 building col; add extensions f…
Rigonkmalk May 29, 2023
3599eeb
feat(cayo): working on terrain ground
Rigonkmalk May 29, 2023
f24c322
feat(cayo): working on terrain ground2
Rigonkmalk May 29, 2023
671b93c
feat(cayo): cleaning assets
Rigonkmalk May 29, 2023
213d985
Merge pull request #3641 from SOZ-Faut-etre-Sub/feat/redirect_FIB_mes…
joelwurtz May 29, 2023
1d7ff10
feat(panel): add onduty/offduty monitor logs
BernardJeremy May 29, 2023
28b3b98
Add give animation for keys and vehicle trunk
Laikker May 30, 2023
6b03285
feat(cayo): ground; grass; lod
Rigonkmalk May 30, 2023
ee2331b
Merge pull request #3810 from SOZ-Faut-etre-Sub/fix/server_warning
Rigonkmalk May 30, 2023
ccf7b86
fix(col): solved occlusion; remesh col for appartements 05 and related
Rigonkmalk May 30, 2023
44b807a
Merge pull request #3811 from SOZ-Faut-etre-Sub/fix/col_appts_05
joelwurtz May 30, 2023
6b2ecb4
Merge pull request #3800 from SOZ-Faut-etre-Sub/3798/panel_service_hi…
joelwurtz May 30, 2023
72b2523
3784 Update racket
Laikker May 28, 2023
4f7f45d
feat(cayo): lod for bank; lod for 247; assets fixing; 247 ground pain…
Rigonkmalk Jun 1, 2023
35e20a9
feat(cayo): lod for bank (missing file)
Rigonkmalk Jun 1, 2023
d3995ba
fix(panel): add permission management for company panel access
BernardJeremy Jun 2, 2023
d41c72a
Update gta-server/resources/[soz]/soz-jobs/config.lua
BernardJeremy Jun 2, 2023
ed2ec18
feat(cayo): clotheslo; working on LODs; delete grass; add assets
Rigonkmalk Jun 2, 2023
8121760
feat(cayo): add assets; fix clotheslo building
Rigonkmalk Jun 2, 2023
64a5f03
fix(occl): fixed occlusion for appts 39 and fewer
Rigonkmalk Jun 3, 2023
d89acb1
feat(player): remove all state bags for player
joelwurtz May 14, 2023
5311b5c
fix(state): fix some state issues
joelwurtz May 14, 2023
8b71aa5
feat(state): use custom mecanism for global state
joelwurtz May 16, 2023
cc6302c
feat(state): replace vehicle state bag by custom system
joelwurtz May 19, 2023
32a5760
feat(state): remove useless state retrieval in some places
joelwurtz May 22, 2023
c5df7ad
remove state bag from flatbed, heli spotlight, police sirens, and som…
joelwurtz May 22, 2023
a4b639e
feat(state): rework state for radio, migrating from soz-talk to core,…
joelwurtz May 26, 2023
b22b0dd
fix vehicle state sync
joelwurtz May 26, 2023
7d8420e
feat(radio): add vehicle radio
joelwurtz May 26, 2023
36d6afa
remove soz talk
joelwurtz May 26, 2023
273b1d8
fix lua lint
joelwurtz May 26, 2023
b6595c4
feat(state): move mileage to new state management
joelwurtz May 26, 2023
4325e24
feat(global): stop all phone call state change
joelwurtz May 26, 2023
a4ae23a
move set inventory busy for binoculars
joelwurtz May 26, 2023
e4e2aa8
fix(start): fix error at start and missing exports
joelwurtz May 28, 2023
1b69db4
fix(target): fix qb target
joelwurtz May 28, 2023
0ccabd2
fix(vehicle): use network id instead of entity id
joelwurtz May 28, 2023
9cb5c01
fix(inventory): fix bad call to get state for inventory open trunk, f…
joelwurtz May 28, 2023
770e737
fix(state): set state locally to avoid bad previous state
joelwurtz May 28, 2023
f6c60fe
feat(state): add previous value for state, fix radio blip everytime, …
joelwurtz May 28, 2023
8fd5eff
feat(vehicle): remove lock delay when inside vehicle
joelwurtz May 29, 2023
eae0059
feat(vehicle): move condition out of vehicle state, better flow of data
joelwurtz May 29, 2023
673b9e8
feat(vehicle): fix flatbed attach / unattach
joelwurtz May 29, 2023
c38e7e3
lint
joelwurtz May 29, 2023
ad04045
fix(radio): fix mute on death, fix ui on small screen
joelwurtz May 29, 2023
2f142c3
feat(vehicle): fix null in garage, fix error when null owner
joelwurtz May 30, 2023
f2949eb
feat(vehicle): sync needed value which are not sync by fivem / gta
joelwurtz Jun 2, 2023
a5ef5c8
fix(vehicle): fix bad tick for hud, fix fuel consumption, resync stat…
joelwurtz Jun 3, 2023
cfe099e
feat(hud): hud should be available for pilot or copilot only
joelwurtz Jun 4, 2023
2e34099
Fix BCSO division chief decals
Laikker Jun 4, 2023
c90f3ab
Fix pickpocket + hub entry check
Laikker Jun 2, 2023
2994edb
Fix when door missing & seat is not free
poulpito Apr 10, 2023
a54adbf
Update health card bg
Apr 21, 2023
0681485
Add notifications on speed limiter interactions
lucaslg Apr 26, 2023
ad5bd31
Merge pull request #3839 from SOZ-Faut-etre-Sub/merge-pr-184
joelwurtz Jun 4, 2023
6204cc7
Merge pull request #3819 from SOZ-Faut-etre-Sub/feat3784-update-crimi
joelwurtz Jun 4, 2023
1702087
hotfix(vehicle): fix opening vehicle trunk
joelwurtz Jun 5, 2023
426eab4
fix(vehicle): fix vehicle speed
joelwurtz Jun 5, 2023
11a110a
fix oss
joelwurtz Jun 5, 2023
e1994c1
feat(short): add this short
Rigonkmalk Jun 5, 2023
cf280b6
fix(target): avoid too many rpc calls on btarget, should reduce some …
joelwurtz Jun 5, 2023
5196fe8
fix(vehicle): avoid spamming console with vehicle network does not exist
joelwurtz Jun 5, 2023
1ad8735
fix(hud): fix seatbelt for passenger
joelwurtz Jun 5, 2023
7eaf72c
fix(vehicle): fix repair also fixing health, fix trunk state
joelwurtz Jun 5, 2023
5e01a3b
fix(vehicle): use condition for fuel and oil, remove sync of this val…
joelwurtz Jun 5, 2023
28b527a
fix(radio): fix too many sound for radio
joelwurtz Jun 5, 2023
566e7a1
Merge pull request #3841 from SOZ-Faut-etre-Sub/merge-pr-186
joelwurtz Jun 5, 2023
c4d180b
Merge pull request #3848 from SOZ-Faut-etre-Sub/fix/state
joelwurtz Jun 5, 2023
e4b18dd
chore(stungun): range value back to default
Rigonkmalk Jun 6, 2023
0d7fb39
Merge pull request #3829 from SOZ-Faut-etre-Sub/feat/mapping_cayo
Rigonkmalk Jun 6, 2023
9232bc7
fix(short): fixed texture and weight for clipping
Rigonkmalk Jun 6, 2023
1f4d806
fix(log): avoid writing some logs when entity does not exist
joelwurtz Jun 7, 2023
881df6b
fix fuel consumption
joelwurtz Jun 7, 2023
2e2b78a
feat(cayo): lod; assets
Rigonkmalk Jun 7, 2023
66260c0
fix glass broken with vehicle lock
joelwurtz Jun 7, 2023
efb9840
fix(typo): fix lua removing property with null values ....
joelwurtz Jun 7, 2023
8bf4494
Merge pull request #3864 from SOZ-Faut-etre-Sub/fix/state-third
joelwurtz Jun 7, 2023
0cdfece
fix(oil): fix overflow of station
joelwurtz Jun 7, 2023
81b3d94
Merge pull request #3865 from SOZ-Faut-etre-Sub/fix/multiple-refill
joelwurtz Jun 7, 2023
5d65803
fix(short): fix resolution render, uv mapping and shade
Rigonkmalk Jun 8, 2023
d5be878
force server state for inventory
joelwurtz Jun 8, 2023
757e7ec
fix(poly): fixed somes poly edge assets
Rigonkmalk Jun 11, 2023
1e49817
Add event for car theft and money movement
Laikker Jun 11, 2023
d1a3e87
Do not send to soft pound destroyed vehcle
Laikker Jun 11, 2023
497ca62
feat(cinema): add cinema and fixed poly edge error
Rigonkmalk Jun 11, 2023
e21b8e6
Merge pull request #3881 from SOZ-Faut-etre-Sub/fix/3879-destoyed-veh…
NariieL Jun 11, 2023
b3e2616
Merge pull request #3882 from SOZ-Faut-etre-Sub/feat/add_cinema
NariieL Jun 11, 2023
26cf696
Merge pull request #3877 from SOZ-Faut-etre-Sub/fix/poly_edge
NariieL Jun 11, 2023
456219f
feat(upw): exterior; col; LOD; Alpha; Distant Light
Rigonkmalk Jun 12, 2023
886cced
fix(upw): fixed uv mapping for road
Rigonkmalk Jun 12, 2023
f765f06
fix(upw): fixed uv mapping for road
Rigonkmalk Jun 12, 2023
6b8c9dd
fix(mtp): fixed lot of assets; lod; slod; ground; decals
Rigonkmalk Jun 12, 2023
0f5f39f
fix(mtp): add emissive lod light
Rigonkmalk Jun 12, 2023
d3e1a1d
fix(mtp): poly edge
Rigonkmalk Jun 12, 2023
8434247
Fix delete vehicle pole emploi
Laikker Jun 12, 2023
3fff7a1
Update config.lua
NariieL Jun 12, 2023
6e488e5
Merge pull request #3887 from SOZ-Faut-etre-Sub/fic/3886-poleemploi-d…
NariieL Jun 12, 2023
a2ed5f2
Merge pull request #3885 from SOZ-Faut-etre-Sub/fix/ext_global_mtp
NariieL Jun 12, 2023
53c45b3
Merge pull request #3884 from SOZ-Faut-etre-Sub/fix/upw_exterior
NariieL Jun 12, 2023
28dd4b8
Update config.lua
Laikker Jun 13, 2023
35b2904
fix(mtp): global changes and delete assets
Rigonkmalk Jun 13, 2023
7ba5342
fix(upw): global changes and delete assets
Rigonkmalk Jun 13, 2023
b478d52
Crimi updates
Laikker Jun 11, 2023
c12e252
fix(mtp): ground and assets fixing
Rigonkmalk Jun 13, 2023
a52778f
feat(short): rework normal and specular
Rigonkmalk Jun 13, 2023
50e35fc
Merge pull request #3894 from SOZ-Faut-etre-Sub/fix/ext_global_mtp
Rigonkmalk Jun 13, 2023
962a714
fix(vehicle): when a vehicle cannot spawn readd money if necessary
joelwurtz Jun 13, 2023
104031c
Merge pull request #3902 from SOZ-Faut-etre-Sub/feat/readd-money-on-bug
joelwurtz Jun 13, 2023
15768d6
Merge pull request #3878 from SOZ-Faut-etre-Sub/fix/3874-crimi-june-u…
joelwurtz Jun 13, 2023
2a45649
feat(upw): rework alpha road
Rigonkmalk Jun 14, 2023
f76e854
chore(mtp): move streetlight
Rigonkmalk Jun 14, 2023
841b1bc
reviews(CM) Adding animation on ordering
Moustash May 27, 2023
dc0e3b3
reviews(CM) Lunchbox working (Except > 10kg)
Moustash May 29, 2023
6014fe1
Nettoyage
Moustash May 30, 2023
ee21f7c
Formatting
Moustash May 30, 2023
b20649d
Lunchbox checking maxweight
Moustash Jun 7, 2023
ffe64e5
Description
Moustash Jun 7, 2023
4aa7c8f
Item renaming + craft
Moustash Jun 8, 2023
ee7d3ac
Rename notification
Moustash Jun 8, 2023
8a0e15f
Correction
Moustash Jun 8, 2023
6b50075
Lua formatting
Moustash Jun 8, 2023
674e0ee
Superette
Moustash Jun 12, 2023
6d30553
Supermarket operational without buying action
Moustash Jun 13, 2023
7b58ca1
Superette completed
Moustash Jun 14, 2023
b77ae1e
Edit new items prices
Moustash Jun 14, 2023
3d26508
Correcting after reviews
Moustash Jun 14, 2023
5503b93
Reformating
Moustash Jun 14, 2023
f24fa3f
Notification & Animation
Moustash Jun 14, 2023
3a37a90
High resolution
Moustash Jun 14, 2023
6f906fe
feat(oss): create action to append pr to github project
sebastiendeu Jun 16, 2023
0d6f666
Restore zpad in supermarket
Laikker Jun 16, 2023
7e1ebf7
Fix stonk name to Security
Laikker Jun 16, 2023
26f7661
Fix women hair name
Laikker Jun 16, 2023
fbc2833
Fix focus issue when pressing echap in amount input window
Laikker Jun 16, 2023
cb87780
Update non fdo armor
Laikker Jun 16, 2023
b68b1af
Merge pull request #3930 from SOZ-Faut-etre-Sub/fix/3674-echap-nui-focus
NariieL Jun 16, 2023
e726fa0
Merge pull request #3929 from SOZ-Faut-etre-Sub/fix/3858-woman-hair-name
NariieL Jun 16, 2023
80e3aca
Merge pull request #3927 from SOZ-Faut-etre-Sub/fix/3869-typo-stonk
NariieL Jun 16, 2023
6b4ca00
Merge pull request #3925 from SOZ-Faut-etre-Sub/fix/3919-zpad-superma…
NariieL Jun 16, 2023
43bfdc8
Ignore invalide quantity in supermaket shop menu
Laikker Jun 17, 2023
66527c8
Remove false error when transferring money
Laikker Jun 17, 2023
e427893
Cleanup previous taxi mission when starting new one
Laikker Jun 17, 2023
1a383f6
Fix error message with btarget when target no longer valid
Laikker Jun 17, 2023
87254ca
Fix parachute removal when undrawing a weapon
Laikker Jun 17, 2023
0ca6e2a
Merge pull request #3935 from SOZ-Faut-etre-Sub/fix/bank-transfer-inv…
NariieL Jun 17, 2023
28f7f80
Merge pull request #3937 from SOZ-Faut-etre-Sub/fix/3890-enzio-error-…
NariieL Jun 17, 2023
ce05670
Merge pull request #3936 from SOZ-Faut-etre-Sub/fix/3876-taxi-mission
NariieL Jun 17, 2023
9d7baf4
Merge pull request #3938 from SOZ-Faut-etre-Sub/fix/2803-put-away-wea…
NariieL Jun 17, 2023
4939d60
Merge pull request #3838 from SOZ-Faut-etre-Sub/merge-pr-172
NariieL Jun 17, 2023
01196b1
Fix notification when paying society invoice
Laikker Jun 17, 2023
5d6335e
Remove ragdoll in vehicule
Laikker Jun 17, 2023
51930dc
fix(cogfbi): add native col
Rigonkmalk Jun 18, 2023
31ff8b2
fix(rogers): fix rogers col for bruleuse-chan
Rigonkmalk Jun 18, 2023
7dbe371
fix(upw): fix door col & optimize col mesh and poly box
Rigonkmalk Jun 18, 2023
6cac89e
feat(metrics): add a new way to collect profiles
joelwurtz Jun 18, 2023
fd12b28
fix rpc event metadata
joelwurtz Jun 18, 2023
c9f4fd6
fix(mtp): delete hi@ col poly box and delete col from old assets
Rigonkmalk Jun 18, 2023
3aefdb2
feat(phone): remove day js in favor of date fns for performance
joelwurtz Jun 18, 2023
7f0caea
Merge pull request #3924 from SOZ-Faut-etre-Sub/oss-tracking-pr
joelwurtz Jun 18, 2023
a645266
Merge pull request #3954 from SOZ-Faut-etre-Sub/fix/upw_invisible_col
Rigonkmalk Jun 18, 2023
e018d12
Merge pull request #3952 from SOZ-Faut-etre-Sub/fix/upw_hangar
Rigonkmalk Jun 18, 2023
022fa02
Merge pull request #3950 from SOZ-Faut-etre-Sub/fix/octants_cogfbi
joelwurtz Jun 18, 2023
53becbc
Merge pull request #3951 from SOZ-Faut-etre-Sub/fix/rogers_invisibility
joelwurtz Jun 18, 2023
6b847c1
Merge pull request #3953 from SOZ-Faut-etre-Sub/feat/custom-profile
joelwurtz Jun 18, 2023
dc7c7a5
Merge pull request #3955 from SOZ-Faut-etre-Sub/feat/phone-dayhs
joelwurtz Jun 18, 2023
ff382da
fix(oss): fix private mock for oss
joelwurtz Jun 18, 2023
2257e02
OSS - Display random server rule on loadscreen
Maskowh Feb 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: 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.
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