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

[SOZ-Phone] Ajout d'une catégorie avec les logos des entreprise dans la liste des Emojis #259

Open
wants to merge 2,977 commits into
base: oss
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2977 commits
Select commit Hold shift + click to select a range
64be8ce
Update zones for LSMC v2
Laikker Nov 18, 2023
b1be260
Merge pull request #5451 from SOZ-Faut-etre-Sub/feat/lmsc-v2-zone
NariieL Nov 18, 2023
cba155f
Merge pull request #5427 from SOZ-Faut-etre-Sub/fix/5398-november-crimi
NariieL Nov 18, 2023
2042c15
Fix LSMC v2 zones
Laikker Nov 18, 2023
4656b76
Fix crimi veh siphon
Laikker Nov 18, 2023
b53f50b
Merge pull request #5456 from SOZ-Faut-etre-Sub/fix/5454-criminel-meg…
NariieL Nov 18, 2023
82fa905
chore(lsmc): delete audio glitch
Rigonkmalk Nov 18, 2023
44621e8
Fix some ZeraGirl inversion + small racket issues
Laikker Nov 18, 2023
e6344ea
fix default grade when recruiting
joelwurtz Nov 19, 2023
8f02746
Fix binoculars can't ptt
AurelienFT Nov 19, 2023
de1f1a3
Change banner on promote
AurelienFT Nov 19, 2023
d3cdc61
Do not display grades that are not possible to promote to
AurelienFT Nov 19, 2023
ea78430
Move FDO equipement only to decal to keep undershirt free for players
Laikker Nov 19, 2023
757c59c
Fix banner jobs.
AurelienFT Nov 19, 2023
c2ada4e
Store stonk bag collect history with citizenId and not source
Laikker Nov 19, 2023
d082213
Merge pull request #5475 from SOZ-Faut-etre-Sub/fix/promote_too_high
joelwurtz Nov 19, 2023
2ec1431
Merge pull request #5474 from SOZ-Faut-etre-Sub/fix/banner_job
joelwurtz Nov 19, 2023
f656007
Merge pull request #5473 from SOZ-Faut-etre-Sub/fix/ptt_binoculars
joelwurtz Nov 19, 2023
059f4a5
Merge pull request #5479 from SOZ-Faut-etre-Sub/fix/5422-stonk-jewel-…
joelwurtz Nov 19, 2023
672496e
Remove money after stock check for clohtes
Laikker Nov 19, 2023
af8f5ad
Resize ZeraGirl illustration to 500x500 ti gain size
Laikker Nov 19, 2023
6f20991
Merge pull request #5482 from SOZ-Faut-etre-Sub/fix/zeragirl-resize
joelwurtz Nov 19, 2023
2b6d1d5
Merge pull request #5352 from SOZ-Faut-etre-Sub/fix/appart_position_s…
joelwurtz Nov 19, 2023
4bfb94d
Merge pull request #5351 from SOZ-Faut-etre-Sub/feat/appart_forum
joelwurtz Nov 19, 2023
79a80bd
Merge pull request #5145 from SOZ-Faut-etre-Sub/fix/pixelized_txd
joelwurtz Nov 19, 2023
fbc45ff
Remove veh from currentFilling list in case of error
Laikker Nov 19, 2023
5d3ee10
chore(repository): add a way to listen on repository change
joelwurtz Oct 31, 2023
a972ca8
feat(housing): init migrate to core
joelwurtz Oct 31, 2023
177118c
feat(housing): migrate housing to core
joelwurtz Nov 15, 2023
2e27a92
feat(housing): fix repository listener, allow apartment zone to be null
joelwurtz Nov 15, 2023
dde7512
feat(housing): fix blip system, better notification and some housing …
joelwurtz Nov 16, 2023
ec57895
feat(core): use automatic patch system to sync data
joelwurtz Nov 16, 2023
8d9e1b3
feat(housing): add temporary access
joelwurtz Nov 16, 2023
c4dd8d8
feat(housing): use classic teleport for admin teleport apartment
joelwurtz Nov 17, 2023
91d7d18
feat(housing): add senate tables and relations
joelwurtz Nov 17, 2023
68cf9c8
feat(housing): add temporary access for senate apartment
joelwurtz Nov 17, 2023
dfdee33
feat(housing): add senate management, support temporary access to ent…
joelwurtz Nov 18, 2023
9b6e4a9
feat(housing): use apartment id for house garage
joelwurtz Nov 19, 2023
5edf161
feat(housing): allow to set senate for housing and player in game
joelwurtz Nov 19, 2023
91bd8b6
fix(housing): better blips, fix inside with senate, fix admin house
joelwurtz Nov 19, 2023
1d80f7e
fix(housing): fix adding roomate
joelwurtz Nov 19, 2023
fbc6199
feat(housing): add senate party member to player
joelwurtz Nov 19, 2023
7f4ab45
fix(housing): fix access for senate party id
joelwurtz Nov 19, 2023
9fd967f
feat(housing): allow to set apartment tier from admin
joelwurtz Nov 19, 2023
c49d793
feat(housing): be nice with culling
joelwurtz Nov 19, 2023
74141aa
feat(housing): close menu when too far
joelwurtz Nov 19, 2023
751bed4
feat(housing): fix give keys to player
joelwurtz Nov 19, 2023
82bb0ee
Fix police remove license point
Laikker Nov 19, 2023
abd452f
feat(housing): fix removing house from senat party
joelwurtz Nov 19, 2023
3c19428
Merge pull request #5487 from SOZ-Faut-etre-Sub/fix/remove-license-point
joelwurtz Nov 19, 2023
71a3cf9
Job boss see all grades in promotion menu
Laikker Nov 20, 2023
45f97d2
Fix store veh in private/job garage
Laikker Nov 20, 2023
576199f
lint
Laikker Nov 20, 2023
269d8d2
Fix Bank module included twice
Laikker Nov 20, 2023
c46d8a9
Fix only one place in trailer garage
Laikker Nov 20, 2023
04fc4e5
Fix garage
Laikker Nov 20, 2023
a026b39
Merge pull request #5498 from SOZ-Faut-etre-Sub/fix/tailer-garage-max…
joelwurtz Nov 20, 2023
17f42bb
Fix spawn of drug props in apartment
Laikker Nov 20, 2023
ec50845
Update housing.provider.ts
Laikker Nov 20, 2023
4da8aae
Housing check entry zone
Laikker Nov 20, 2023
2fb8bbf
Merge pull request #5500 from SOZ-Faut-etre-Sub/fix/drugs-props-apart…
NariieL Nov 20, 2023
e17ce06
Set core blips default range to 0.8 as in QB
Laikker Nov 20, 2023
fbc6a61
fix(party): fix party member not correctly set, reduce patch tick to …
joelwurtz Nov 20, 2023
6fa2e62
fix(housing): do not allow to bell if access
joelwurtz Nov 20, 2023
3aaaec9
fix blips for upw
joelwurtz Nov 20, 2023
6a45737
add animation for house
joelwurtz Nov 20, 2023
2294de8
Merge pull request #5525 from SOZ-Faut-etre-Sub/fix/party
joelwurtz Nov 20, 2023
50855c2
Revert "feat(clothes): optimized mipmas; color"
Rigonkmalk Nov 20, 2023
462cb5d
Do flag veh as missing when in destroyed state
Laikker Nov 20, 2023
d323354
Prevent reactivate inventory focus after asking input in case of exte…
Laikker Nov 20, 2023
eea52f2
Better display of remaning time before next car purchase
Laikker Nov 21, 2023
4f9c08b
Fix marina boat spawn location for long boats
Laikker Nov 21, 2023
ce7f7cb
Fetch spike list on startup
Laikker Nov 21, 2023
1115c35
Fix Zkea upgrade by passing property and apartement in correct order …
Laikker Nov 21, 2023
7ca6af6
Merge pull request #5531 from SOZ-Faut-etre-Sub/fix/5503-load-spike-s…
NariieL Nov 21, 2023
5440cc3
Merge pull request #5530 from SOZ-Faut-etre-Sub/fix/5505-marina-boat-…
NariieL Nov 21, 2023
a4a7f17
Merge pull request #5529 from SOZ-Faut-etre-Sub/fix/5507-display-time…
NariieL Nov 21, 2023
4445c42
Merge pull request #5528 from SOZ-Faut-etre-Sub/fix/5098-focus-extern…
NariieL Nov 21, 2023
c627820
Merge pull request #5527 from SOZ-Faut-etre-Sub/fix/5333-missing-state
NariieL Nov 21, 2023
8eb9ffa
Fix Zkea add parking place
Laikker Nov 21, 2023
324180a
Delete aircon prop
Aurukh Nov 21, 2023
77040f0
feat(housing): fix bell, catch error on patch
joelwurtz Nov 21, 2023
796e90c
Merge pull request #5537 from SOZ-Faut-etre-Sub/fix/5536-buy-parking-…
joelwurtz Nov 21, 2023
2db4c2d
Merge pull request #5540 from SOZ-Faut-etre-Sub/fix/bell-patch
joelwurtz Nov 21, 2023
7058365
Add try catch to avoid soft lock
AurelienFT Nov 22, 2023
653655b
Add option to show all lantern on maps in admin menu
Laikker Nov 21, 2023
61edc13
[DEV] MTP - Tenues / Puits
Moustash Nov 22, 2023
ac363c1
[DEV] MTP - Tenues / Puits
Moustash Nov 22, 2023
bfae9fa
fix(hammerplace): rebuild hammer place
Aurukh Nov 22, 2023
f856edc
feat(stream): readd cinema
joelwurtz Nov 22, 2023
43bd29f
Fix btarget player for job without bosszone
Laikker Nov 22, 2023
c3f9d34
Merge pull request #5556 from SOZ-Faut-etre-Sub/fix/fib-btarget-player
joelwurtz Nov 22, 2023
1dc63ce
Merge pull request #5553 from SOZ-Faut-etre-Sub/fix/hammer_place
joelwurtz Nov 22, 2023
0791427
Merge pull request #5547 from SOZ-Faut-etre-Sub/feat/hub-entry-all-blip
joelwurtz Nov 22, 2023
c54afb9
Add paparazzi animation
Laikker Nov 22, 2023
232b2aa
Remove Naked Config when changing clothe in house closet
Laikker Nov 22, 2023
e0aeec5
Fix marked money checker
Laikker Nov 22, 2023
00df250
Merge pull request #5559 from SOZ-Faut-etre-Sub/fix/remove-naked-closet
NariieL Nov 23, 2023
d8b06b2
Merge pull request #5558 from SOZ-Faut-etre-Sub/feat/paparazzi-animation
NariieL Nov 23, 2023
4728874
Fix try catch on rope service
AurelienFT Nov 23, 2023
5e782e4
fix(pdm): fix pdm display when veh stock is < 0
BernardJeremy Nov 23, 2023
c1fd322
fix(model): correctly unload model when it's not needed anymore
joelwurtz Nov 23, 2023
c5d0274
Merge pull request #5568 from SOZ-Faut-etre-Sub/fix/unload-model
NariieL Nov 23, 2023
010b0ab
Merge pull request #5567 from SOZ-Faut-etre-Sub/fix/display_no_stock_…
NariieL Nov 23, 2023
f77acdf
Merge pull request #5564 from SOZ-Faut-etre-Sub/fix/marked-money-checker
NariieL Nov 23, 2023
d803bdb
Merge pull request #5548 from SOZ-Faut-etre-Sub/fix/add_try_catch_rope
NariieL Nov 23, 2023
43311de
Temporary remove delay between vehicle buy
Laikker Nov 23, 2023
0e3a9b6
Revert some logic in Dealership show veh to fix veh not cleanup
Laikker Nov 24, 2023
226d8e6
fix(speedbump): fixed height of somes speedbump
Rigonkmalk Nov 24, 2023
a141694
Migrate utils to core
Laikker Nov 7, 2023
f7e67d5
fix(cabin): moved cabin for chantier in disabled
Rigonkmalk Nov 24, 2023
fdaed72
fix(globalmap): add static flags
Rigonkmalk Nov 24, 2023
d221ac2
chore(mapping): moved barrier
Rigonkmalk Nov 24, 2023
498297c
chore(mapping): moved barrier
Rigonkmalk Nov 24, 2023
fc72733
fix(dealership): remove blocking vehicle if not network in dealership
joelwurtz Nov 24, 2023
6f22985
Merge pull request #5583 from SOZ-Faut-etre-Sub/fix/5272_globalmap
joelwurtz Nov 24, 2023
fa38176
Merge pull request #5582 from SOZ-Faut-etre-Sub/fix/0_0_0_col
joelwurtz Nov 24, 2023
dcc3586
Merge pull request #5581 from SOZ-Faut-etre-Sub/fix/speedbump
joelwurtz Nov 24, 2023
06a0bea
Merge pull request #5579 from SOZ-Faut-etre-Sub/fix/small-revert-deal…
joelwurtz Nov 24, 2023
cfbf7c3
fix(dealership): unload model if not needed
joelwurtz Nov 24, 2023
725a601
Merge pull request #5493 from SOZ-Faut-etre-Sub/feat/migrate-utils-to…
joelwurtz Nov 24, 2023
5624876
feat(mtp): working on interior and exterior
Rigonkmalk Nov 24, 2023
2e1bb87
feat(mtp): working on interior and exterior
Rigonkmalk Nov 24, 2023
7dd1c73
fix(blip): fix heading for blips
joelwurtz Nov 24, 2023
5602fc7
fix(blip): fix heading for blips
joelwurtz Nov 24, 2023
0dfc90d
Increase max bank refill per day
Laikker Nov 25, 2023
2533131
Increase max bank refill per day
Laikker Nov 25, 2023
977d3d1
Fix noclip deleting non mission entity
Laikker Nov 25, 2023
5fb8446
Fix noclip deleting non mission entity
Laikker Nov 25, 2023
f7aca8b
Merge pull request #5587 from SOZ-Faut-etre-Sub/fix/bank-refill-limit
NariieL Nov 25, 2023
cde703e
Merge pull request #5587 from SOZ-Faut-etre-Sub/fix/bank-refill-limit
NariieL Nov 25, 2023
33bf1ce
Merge pull request #5585 from SOZ-Faut-etre-Sub/fix/blip-heading
NariieL Nov 25, 2023
4d8ecdf
Merge pull request #5585 from SOZ-Faut-etre-Sub/fix/blip-heading
NariieL Nov 25, 2023
c401ea1
Fix buying underderwear
Laikker Nov 25, 2023
c300b93
Fix buying underderwear
Laikker Nov 25, 2023
53e7600
Fix house clothset typo
Laikker Nov 25, 2023
b50f198
Fix house clothset typo
Laikker Nov 25, 2023
6718efa
feat(vehicle): disallow upgrading vehicle if bad condition or dirty
joelwurtz Nov 25, 2023
003f161
feat(vehicle): disallow upgrading vehicle if bad condition or dirty
joelwurtz Nov 25, 2023
f80c306
Merge pull request #5597 from SOZ-Faut-etre-Sub/fix/5594-house-cloths…
joelwurtz Nov 25, 2023
2ab5c69
Merge pull request #5597 from SOZ-Faut-etre-Sub/fix/5594-house-cloths…
joelwurtz Nov 25, 2023
5f46002
Merge pull request #5601 from SOZ-Faut-etre-Sub/feat/vehicle-no-custo…
joelwurtz Nov 25, 2023
1e48bc5
Merge pull request #5601 from SOZ-Faut-etre-Sub/feat/vehicle-no-custo…
joelwurtz Nov 25, 2023
351028f
feat(lsmc): add complete audio occlusion
Rigonkmalk Nov 25, 2023
f44c2e1
feat(lsmc): add complete audio occlusion
Rigonkmalk Nov 25, 2023
996a282
Items and Tug
Moustash Nov 25, 2023
95cbe85
Items and Tug
Moustash Nov 25, 2023
46e6d05
feat(luxury): do not count vehicle in luxury into stock
joelwurtz Nov 25, 2023
7885190
feat(luxury): do not count vehicle in luxury into stock
joelwurtz Nov 25, 2023
b441d38
Merge pull request #5604 from SOZ-Faut-etre-Sub/feat/luxury-stock
joelwurtz Nov 25, 2023
bbc23fc
Merge pull request #5604 from SOZ-Faut-etre-Sub/feat/luxury-stock
joelwurtz Nov 25, 2023
23f8c89
Allow staff to operate stream screen
Laikker Nov 25, 2023
8528e90
Allow staff to operate stream screen
Laikker Nov 25, 2023
3c3db67
Fix moneycheck id server
AurelienFT Nov 26, 2023
9f58392
Fix moneycheck id server
AurelienFT Nov 26, 2023
4d6198e
feat(custom): be nicer when checking dirt level / windows broken
joelwurtz Nov 26, 2023
9c1a666
feat(custom): be nicer when checking dirt level / windows broken
joelwurtz Nov 26, 2023
5d0116b
Fix money checker server
AurelienFT Nov 26, 2023
92ea7e5
Fix money checker server
AurelienFT Nov 26, 2023
ac02576
Revert "feat(lsmc): add complete audio occlusion"
Rigonkmalk Nov 26, 2023
7f0c02b
Revert "feat(lsmc): add complete audio occlusion"
Rigonkmalk Nov 26, 2023
f66fa8e
Merge pull request #5622 from SOZ-Faut-etre-Sub/feat/lsmc_audio_occlu…
NariieL Nov 26, 2023
8183549
Merge pull request #5622 from SOZ-Faut-etre-Sub/feat/lsmc_audio_occlu…
NariieL Nov 26, 2023
565f4ad
Merge pull request #5620 from SOZ-Faut-etre-Sub/feat/custom-bad-condi…
NariieL Nov 26, 2023
86dbacd
Merge pull request #5620 from SOZ-Faut-etre-Sub/feat/custom-bad-condi…
NariieL Nov 26, 2023
28343f8
Fix notif
AurelienFT Nov 26, 2023
4e5825d
Fix notif
AurelienFT Nov 26, 2023
aa1d10b
Merge pull request #5621 from SOZ-Faut-etre-Sub/fix/money-checker
NariieL Nov 26, 2023
8edb2f6
Merge pull request #5621 from SOZ-Faut-etre-Sub/fix/money-checker
NariieL Nov 26, 2023
fc5b1fe
Items and Images
Moustash Nov 26, 2023
97e58d1
Items and Images
Moustash Nov 26, 2023
e5af5cf
fix(housing): fix resell price, fix clean house
joelwurtz Nov 26, 2023
a23517d
fix(housing): fix resell price, fix clean house
joelwurtz Nov 26, 2023
90747b2
Merge pull request #5626 from SOZ-Faut-etre-Sub/fishing-dlc-2-tug-del…
joelwurtz Nov 26, 2023
b135ebd
Merge pull request #5626 from SOZ-Faut-etre-Sub/fishing-dlc-2-tug-del…
joelwurtz Nov 26, 2023
03ad9a7
Merge pull request #5629 from SOZ-Faut-etre-Sub/fix/housing-resell
joelwurtz Nov 26, 2023
509c024
Merge pull request #5629 from SOZ-Faut-etre-Sub/fix/housing-resell
joelwurtz Nov 26, 2023
98056f0
Rework vandalism props
Laikker Nov 26, 2023
e4eec07
Rework vandalism props
Laikker Nov 26, 2023
dc27682
Merge pull request #5631 from SOZ-Faut-etre-Sub/fix/4927-vandalisme-k…
NariieL Nov 27, 2023
e01de50
Merge pull request #5631 from SOZ-Faut-etre-Sub/fix/4927-vandalisme-k…
NariieL Nov 27, 2023
661226f
Fix cinematic view
Laikker Nov 27, 2023
390d7b3
Fix cinematic view
Laikker Nov 27, 2023
a5cc63a
mtp: add new wall
Rigonkmalk Nov 27, 2023
debe3dc
mtp: add new wall
Rigonkmalk Nov 27, 2023
b9b8c26
mtp: mirror logo
Rigonkmalk Nov 27, 2023
986ab0b
mtp: mirror logo
Rigonkmalk Nov 27, 2023
537752c
[FIX] Sozedex fish infos
Moustash Nov 28, 2023
fad0b02
[FIX] Sozedex fish infos
Moustash Nov 28, 2023
2548007
feat(housing): publish event on house upgrade
joelwurtz Nov 28, 2023
93b8e65
feat(housing): publish event on house upgrade
joelwurtz Nov 28, 2023
e7ff479
Merge pull request #5640 from SOZ-Faut-etre-Sub/fix-sozedex-fish-weather
joelwurtz Nov 28, 2023
0699445
Merge pull request #5640 from SOZ-Faut-etre-Sub/fix-sozedex-fish-weather
joelwurtz Nov 28, 2023
46f95c7
Augmentation délai production puits
Moustash Nov 28, 2023
d5e0800
Augmentation délai production puits
Moustash Nov 28, 2023
85a961a
Merge pull request #5549 from SOZ-Faut-etre-Sub/5516-MTP-folder
joelwurtz Nov 28, 2023
1f48cbc
Merge pull request #5549 from SOZ-Faut-etre-Sub/5516-MTP-folder
joelwurtz Nov 28, 2023
ff717d4
FIX - fish id 190 name
Moustash Nov 29, 2023
b2b7cb1
FIX - fish id 190 name
Moustash Nov 29, 2023
a233463
mtp: multiple fix sur retour
Rigonkmalk Nov 29, 2023
499759b
mtp: multiple fix sur retour
Rigonkmalk Nov 29, 2023
a7023db
Merge pull request #5648 from SOZ-Faut-etre-Sub/5647-fix-fish-illustr…
NariieL Nov 30, 2023
f7317ac
Merge pull request #5648 from SOZ-Faut-etre-Sub/5647-fix-fish-illustr…
NariieL Nov 30, 2023
f249d86
mtp: fixed ground and holes
Rigonkmalk Nov 30, 2023
3fe5d84
mtp: fixed ground and holes
Rigonkmalk Nov 30, 2023
b4f41a7
Add monitoring event at start of store vehicule
Laikker Nov 30, 2023
00baaf6
Add monitoring event at start of store vehicule
Laikker Nov 30, 2023
59cc822
feat(bennys): lower constraint on bad condition for custom
joelwurtz Nov 30, 2023
c5925fe
feat(bennys): lower constraint on bad condition for custom
joelwurtz Nov 30, 2023
6c811f6
[AJOUT] Hameçon détritus
Moustash Nov 30, 2023
4e4f9a3
[AJOUT] Hameçon détritus
Moustash Nov 30, 2023
96f5716
[FIX] ELectric vehicle
Moustash Nov 30, 2023
b1267dd
[FIX] ELectric vehicle
Moustash Nov 30, 2023
8652624
Typo
Moustash Nov 30, 2023
6e7d6e4
Typo
Moustash Nov 30, 2023
b26e9a1
Merge pull request #5652 from SOZ-Faut-etre-Sub/fix/mtp_last_return
joelwurtz Dec 1, 2023
958d0cc
Merge pull request #5652 from SOZ-Faut-etre-Sub/fix/mtp_last_return
joelwurtz Dec 1, 2023
21c59ba
Merge pull request #5654 from SOZ-Faut-etre-Sub/feat/event-start-stor…
joelwurtz Dec 1, 2023
658293d
Merge pull request #5654 from SOZ-Faut-etre-Sub/feat/event-start-stor…
joelwurtz Dec 1, 2023
0b6948d
Merge pull request #5656 from SOZ-Faut-etre-Sub/fix/bad-condition
joelwurtz Dec 1, 2023
927a45c
Merge pull request #5656 from SOZ-Faut-etre-Sub/fix/bad-condition
joelwurtz Dec 1, 2023
ea27231
Merge pull request #5659 from SOZ-Faut-etre-Sub/5658-fishing
joelwurtz Dec 1, 2023
31c5086
Merge pull request #5659 from SOZ-Faut-etre-Sub/5658-fishing
joelwurtz Dec 1, 2023
e7f8eef
Merge pull request #5661 from SOZ-Faut-etre-Sub/5660-electric-vehicle
joelwurtz Dec 1, 2023
eebefd5
Merge pull request #5661 from SOZ-Faut-etre-Sub/5660-electric-vehicle
joelwurtz Dec 1, 2023
5621a86
Always display Cayo may with ExtraMapTiles lib
Laikker Dec 1, 2023
2da4707
Always display Cayo may with ExtraMapTiles lib
Laikker Dec 1, 2023
31ba888
14 days expiration on meal box
Laikker Dec 1, 2023
c2547b4
14 days expiration on meal box
Laikker Dec 1, 2023
7f67439
clothes: add new heels
Rigonkmalk Dec 2, 2023
3286a2c
clothes: add new heels
Rigonkmalk Dec 2, 2023
7ac9801
fix flying tree
Aurukh Dec 3, 2023
72b96e5
fix flying tree
Aurukh Dec 3, 2023
25fae97
fix zkea lod
Aurukh Dec 3, 2023
f790373
fix zkea lod
Aurukh Dec 3, 2023
c7036cc
Merge pull request #5663 from SOZ-Faut-etre-Sub/fix/cayo-map
NariieL Dec 4, 2023
40d782e
Merge pull request #5663 from SOZ-Faut-etre-Sub/fix/cayo-map
NariieL Dec 4, 2023
d447168
Fixing Gunsmith error message
MimiBloops Dec 4, 2023
b0a5ee0
Fixing giving not whole quantity
MimiBloops Dec 4, 2023
f159fa5
Changing info traffic into info trafic
MimiBloops Dec 4, 2023
00e729b
Fix hammer transder for staff/admin
Laikker Dec 4, 2023
2e25827
Add monitoring event for baun harvest
Laikker Dec 4, 2023
4b5afda
mtp: fixed entities floating in the air
Rigonkmalk Dec 4, 2023
51d8d64
Merge pull request #5676 from SOZ-Faut-etre-Sub/fix/gunsmith-error-me…
NariieL Dec 5, 2023
9b82ea2
Merge pull request #5682 from SOZ-Faut-etre-Sub/fix/admin-transfer-ha…
NariieL Dec 5, 2023
2309dce
Merge pull request #5683 from SOZ-Faut-etre-Sub/feat/baun-harvest-mon…
NariieL Dec 5, 2023
74be298
Merge pull request #5678 from SOZ-Faut-etre-Sub/fix/give-not-whole-qu…
NariieL Dec 5, 2023
bb7003c
Merge pull request #5679 from SOZ-Faut-etre-Sub/fix/tn-info-trafic
NariieL Dec 5, 2023
1a75465
Merge remote-tracking branch 'origin/oss' into oss
TheAzylium Dec 6, 2023
3a1ce63
Merge branch 'oss' into emojiCustom
TheAzylium Dec 6, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<dlcName>soz_custom</dlcName>
<fullDlcName>mp_f_freemode_01_soz_custom</fullDlcName>
<eCharacter>SCR_CHAR_MULTIPLAYER_F</eCharacter>
<creatureMetaData>MP_CreatureMetadata_soz_bcso</creatureMetaData>
<creatureMetaData>MP_CreatureMetadata_f_soz_custom</creatureMetaData>
<pedOutfits/>
<pedComponents/>
<pedProps/>
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added resources/[lib]/ExtraMapTiles/MINIMAP_LOADER.gfx
Binary file not shown.
303 changes: 303 additions & 0 deletions resources/[lib]/ExtraMapTiles/client.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,303 @@
-- DO NOT MODIFY!
vBitmapTileSizeX = 4500.0
vBitmapTileSizeY = 4500.0
vBitmapStartX = -4140.0
vBitmapStartY = 8400.0

-- Overlay ID.
overlay = 0

-- Will store the keys of the currently drawn tiles.
drawnTiles = {}

-- List to store the dummy blip handles.
dummyBlips = {}

-- Function that will create a new tile.
function createTile(tileName)


-- Early exit for invalid tile name.
if extraTiles[tileName] == nil then
return
end

-- Get the tile's object.
local extraTile = extraTiles[tileName]

if extraTile.txd == nil or extraTile.txn == nil then
return
end



-- Get the texture info, alpha, centering and rotation.
local textureDictionary = extraTile.txd
local textureName = extraTile.txn
local alpha = extraTile.alpha or defaultAlpha
local centered = extraTile.centered or false
local rotation = extraTile.rotation or 0.0

-- Load the required texture.
loadTextureDictionary(textureDictionary)

-- Get the width and height of the texture.
local xTexture, yTexture, _ = table.unpack(GetTextureResolution(textureDictionary, textureName))

-- Compute the scale ratios.
local xScale = vBitmapTileSizeX / xTexture * 100
local yScale = vBitmapTileSizeY / yTexture * 100

-- Tile was configurated to use XY coordinates.
if extraTile.x ~= nil and extraTile.y ~= nil then

-- Compute offsets from given coordinates since other functionalities
-- such as extendPauseMenuMapBounds() work with offsets, not with XY coords directly.
extraTile.xOffset = (extraTile.x - vBitmapStartX) / vBitmapTileSizeX
extraTile.yOffset = (extraTile.y - vBitmapStartY) / vBitmapTileSizeY
end


-- Get the offsets, convert to float.
local xOffset = extraTile.xOffset * 1.0
local yOffset = extraTile.yOffset * (-1.0)


-- Compute X and Y coordinates based on the offsets.
local x = vBitmapStartX + xOffset * vBitmapTileSizeX
local y = vBitmapStartY - yOffset * vBitmapTileSizeY



-- Convert alpha to an INT.
alpha = math.floor(math.abs(alpha))
-- Convert rotation to FLOAT.
rotation = rotation * 1.0

-- Call the Scaleform function.
CallMinimapScaleformFunction(overlay, "ADD_SCALED_OVERLAY")
-- Push the parameters onto the stack.
ScaleformMovieMethodAddParamTextureNameString(textureDictionary)
ScaleformMovieMethodAddParamTextureNameString(textureName)
ScaleformMovieMethodAddParamFloat(x)
ScaleformMovieMethodAddParamFloat(y)
ScaleformMovieMethodAddParamFloat(rotation)
ScaleformMovieMethodAddParamFloat(xScale)
ScaleformMovieMethodAddParamFloat(yScale)
ScaleformMovieMethodAddParamInt(alpha)
ScaleformMovieMethodAddParamBool(centered)
EndScaleformMovieMethod()

-- Mark the texture as no longer needed.
SetStreamedTextureDictAsNoLongerNeeded(textureDictionary)

-- Add it to the drawn tiles table.
table.insert(drawnTiles, tileName)
end

-- Function that deletes a tile.
function deleteTile(tileName)

local id = -1

for i = 1, #drawnTiles do
if drawnTiles[i] == tileName then
id = i
table.remove(drawnTiles, id)
break
end
end

if id == -1 then
return
end

-- Call the remove scaleform function.
CallMinimapScaleformFunction(overlay, "REM_OVERLAY");
-- Push the parameter onto the stack.
ScaleformMovieMethodAddParamInt(id - 1)
EndScaleformMovieMethod()
end

-- Function that will draw all tiles in the extraTiles table.
function createAllTiles()

local extraTilesNames = getTableKeys(extraTiles)
if extraTilesNames == nil then
return
end

-- Iterate all extra tiles.
for i = 1, #extraTilesNames do

-- Get the current tile's key.
local tileName = extraTilesNames[i]

-- Create the new tile.
createTile(tileName)
end

if #dummyBlips == 0 then
extendPauseMenuMapBounds()
end
end

-- Function that will delete all tiles that are currently drawn.
function deleteAllTiles()

-- Delete the tile at index 1. The table will shift the remaining
-- elements' indices.
for i = 1, #drawnTiles do
deleteTile(drawnTiles[1])
end

if #dummyBlips ~= 0 then
resetPauseMenuMapBounds()
end
end

-- Function that returns true if the tile with the specified name is currently drawn
-- or false otherwise.
function isTileDrawn(tileName)
if tileName == nil then
return false
end

for i = 1, #drawnTiles do
if drawnTiles[i] == tileName then
return true
end
end

return false
end

-- Function that will let you move outside the normal bounds of the
-- pause menu map.
function extendPauseMenuMapBounds()

if #dummyBlips ~= 0 then
resetPauseMenuMapBounds()
end


local extraTilesNames = drawnTiles
if extraTilesNames == nil then
return
end

-- Set starting values.
local xMinOffset = extraTiles[extraTilesNames[1]].xOffset or 0
local xMaxOffset = extraTiles[extraTilesNames[1]].xOffset or 0
local yMinOffset = extraTiles[extraTilesNames[1]].yOffset or 0
local yMaxOffset = extraTiles[extraTilesNames[1]].yOffset or 0

-- Find min and max values for xOffset and yOffset.
for i = 1, #extraTilesNames do
local extraTile = extraTiles[extraTilesNames[i]]

if extraTile.xOffset < xMinOffset then
xMinOffset = extraTile.xOffset
end

if extraTile.xOffset > xMaxOffset then
xMaxOffset = extraTile.xOffset
end

if extraTile.yOffset < yMinOffset then
yMinOffset = extraTile.yOffset
end

if extraTile.yOffset > yMaxOffset then
yMaxOffset = extraTile.yOffset
end
end

-- Create 4 invisible blips at the corners of the furthest tiles
-- to create something like a bounding box in which all other
-- tiles are included. This could possibly be improved to use 2
-- blips instead of 4.

createDummyBlip(vBitmapStartX + xMinOffset * vBitmapTileSizeX - vBitmapTileSizeX / 2,
vBitmapStartY + yMaxOffset * vBitmapTileSizeY + vBitmapTileSizeY / 2)

createDummyBlip(vBitmapStartX + xMinOffset * vBitmapTileSizeX - vBitmapTileSizeX / 2,
vBitmapStartY + (yMinOffset - 1) * vBitmapTileSizeY - vBitmapTileSizeY / 2)

createDummyBlip(vBitmapStartX + (xMaxOffset + 1) * vBitmapTileSizeX + vBitmapTileSizeX / 2,
vBitmapStartY + (yMinOffset - 1) * vBitmapTileSizeY - vBitmapTileSizeY / 2)

createDummyBlip(vBitmapStartX + (xMaxOffset + 1) * vBitmapTileSizeX + vBitmapTileSizeX / 2,
vBitmapStartY + yMaxOffset * vBitmapTileSizeY + vBitmapTileSizeY / 2)
end

-- This function will reset the pause menu map's bounds to the default.
function resetPauseMenuMapBounds()
for i = 1, #dummyBlips do
RemoveBlip(dummyBlips[i])
end

dummyBlips = {}
end

-- Function that will create an invisible blip.
function createDummyBlip(x, y)
local dummyBlip = AddBlipForCoord(x, y, 1.0)
SetBlipDisplay(dummyBlip, 4)
SetBlipAlpha(dummyBlip, 0)

table.insert(dummyBlips, dummyBlip)
end

-- Loads a minimap overlay from a given path.
function loadMinimapOverlay(gfxFilePath)
local _overlay = AddMinimapOverlay(gfxFilePath)

while not HasMinimapOverlayLoaded(_overlay) do
Citizen.Wait(0)
end

SetMinimapOverlayDisplay(_overlay, 0.0, 0.0, 100.0, 100.0, 100.0)

return _overlay
end

-- Loads a texture dictionary into memory.
function loadTextureDictionary(textureDictionary)
if not HasStreamedTextureDictLoaded(textureDictionary) then
RequestStreamedTextureDict(textureDictionary, false)
while not HasStreamedTextureDictLoaded(textureDictionary) do
Citizen.Wait(0)
end
end
end

-- Function that converts the keys of a dictionary to an alphabetically-sorted list.
function getTableKeys(keyset)
local list = {}

for key, _ in pairs(keyset) do
table.insert(list, key)
end

table.sort(list)

return list
end

exports("createAllTiles", createAllTiles)
exports("deleteAllTiles", deleteAllTiles)
exports("createTile", createTile)
exports("deleteTile", deleteTile)
exports("extendPauseMenuMapBounds", extendPauseMenuMapBounds)
exports("resetPauseMenuMapBounds", resetPauseMenuMapBounds)
exports("isTileDrawn", isTileDrawn)


Citizen.CreateThread(function()
-- Load the minimap overlay.
overlay = loadMinimapOverlay("MINIMAP_LOADER.gfx")

-- Draw all tiles.
createAllTiles()
end)
53 changes: 53 additions & 0 deletions resources/[lib]/ExtraMapTiles/config.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
--[[
This is the offsets table. This tells the script where to create new map tiles.
The origin point from which offset positions are calculated is defined by the
vBitmapStartX and vBitmapStartY, same as in the minimap.ymt file. Do not modify
the vBitmapStartX and vBitmapStartY, or the script will not function correctly.

The keys of each tile can be arbitrary, maybe something so you can identify them,
but they have to be unique.

xOffset represents the number of tiles away from the origin point to place the new
tile on the X axis. A positive xOffset will place the new tile to the right of the
origin on the X axis and to the left for negative values.

Same for yOffset, but on the Y axis. Positive values place it above the origin and
negative values place it below the origin point.

If needed, xOffset and yOffset you can omit the xOffset and yOffset fields and use
just x and y fields that represent in-game XY coordinates.

Remember that the anchor point of all new tiles is the top left corner of the tile,
unless setting centered to true.

Other optional fields include are:
- alpha: sets the alpha of the tile. Ranges from 0 to 100.
- rotation: Sets the rotation of the tile in a clockwise direction. Ranges from 0 to 360.
- centered: Sets the tile in the center of the chosen point. Can be true or false.


Important: By default, one tile's dimensions are 4500x4500. This is useful when creating
a grid of tiles using in-game XY coordinates so that you can perfectly align them together.

]]

-- Extra tiles can be placed at any offets, they don't have to be "connected" to the default
-- map's tiles.
extraTiles = {
[1] = {x = 4730.0, y = -5145.0, txd = "tile_cayo", txn = "cayo", centered = true},

-- 2 tiles in the top left corner of the default map.
--[1] = {xOffset = -1, yOffset = 1, txd = "minimap_extra_tile_1", txn = "extra_tile_1"},
--[2] = {xOffset = -2, yOffset = 1, txd = "minimap_extra_tile_1", txn = "extra_tile_1", alpha = 50},

-- Another tile in the middle, on the right side of the default map, but rotated 25 degrees clockwise
--[3] = {xOffset = 2, yOffset = 0, txd = "minimap_extra_tile_2", txn = "extra_tile_2", alpha = 70, rotation = 25},

-- Tiles created using in game coordinates instead of offsets.
--[4] = {x = 0.0, y = 0.0, txd = "minimap_extra_tile_1", txn = "extra_tile_1", centered = true},
--[5] = {x = 4500.0, y = 0.0, txd = "minimap_extra_tile_1", txn = "extra_tile_1"},
}


-- Default alpha value that will be used if not specified in the extraTiles table.
defaultAlpha = 100
20 changes: 20 additions & 0 deletions resources/[lib]/ExtraMapTiles/fxmanifest.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
-- Manifest data.
fx_version "cerulean"
games {"gta5"}
lua54 "yes"

-- Resource information.
name "Extra Map Tiles"
description "Adds extra tiles for textures on the minimap and pause menu map."
version "1.2.0"
author "L1CKS"

-- Files.
files {
"MINIMAP_LOADER.gfx" -- Always first in the list.
}

client_scripts {
"config.lua",
"client.lua"
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified resources/[mapping]/[mapping-prod]/soz-zkea/stream/cs4_02_utool.ytd
Binary file not shown.
Loading