Skip to content

editor: adding missing objects to list #581

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Dec 14, 2024
Merged

editor: adding missing objects to list #581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
216c271
editor: adding missing things
THEGizmoOfficial Nov 17, 2024
6c09719
Merge branch 'master' into master
Dutchman101 Nov 21, 2024
27f8783
Merge branch 'multitheftauto:master' into master
THEGizmoOfficial Nov 26, 2024
0a66543
editor: adding missing objects to list
THEGizmoOfficial Dec 6, 2024
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
33 changes: 33 additions & 0 deletions [editor]/editor_gui/client/browser/objects.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,13 @@
<object model="10186" name="lombard3_sfe" keywords="" />
<object model="1772" name="CJ_HOT_DOG1" keywords="" />
<object model="14442" name="SHADOW-Carter" keywords="" />
<object model="14841" name="Lee_gymers" keywords="" />
<object model="14818" name="mc_straps" keywords="" />
<object model="16333" name="quarry_crhookcble" keywords="" />
<object model="18010" name="int_3rest_lights" keywords="" />
<object model="6411" name="venice01bT_LAw2" keywords="" />
<object model="6062" name="Miami_atm" keywords="" />
<object model="5998" name="sunset18Tr_LAwN" keywords="" />
</group>
<group name="Nighttime Objects">
<object model="9934" name="nitelites_sfe04" keywords="" />
Expand Down Expand Up @@ -412,6 +419,12 @@
<object model="10146" name="nitelites_sfe14" keywords="" />
<object model="10058" name="nitelites_sfe11" keywords="" />
<object model="10057" name="nitelites_sfe10" keywords="" />
<object model="6518" name="LTS01_LAw2" keywords="" />
<object model="6519" name="LTS02_LAw2" keywords="" />
<object model="6520" name="LTS04_LAw2" keywords="" />
<object model="6521" name="LTS03_LAw2" keywords="" />
<object model="6412" name="sunitwin01_LAw2" keywords="" />
<object model="6001" name="LTSsunset18_LAwN" keywords="" />
</group>
<group name="Beach and Sea">
<group name="Ships, Docks, and Piers">
Expand Down Expand Up @@ -2381,6 +2394,7 @@
<object model="1038" name="rf_a_l" keywords="" />
<object model="1037" name="exh_c_l" keywords="" />
<object model="1036" name="wg_l_a_l" keywords="" />
<object model="1035" name="rf_c_l" keywords="" />
<object model="1034" name="exh_a_l" keywords="" />
<object model="1033" name="rf_c_s" keywords="" />
<object model="1032" name="rf_a_s" keywords="" />
Expand Down Expand Up @@ -4164,6 +4178,7 @@
<object model="18095" name="BARBER_BLINDS02" keywords="" />
<object model="18098" name="BARBER_BLINDS03" keywords="" />
<object model="18553" name="count_ammundoor" keywords="" />
<object model="14799" name="otb_glass" keywords="" />
</group>
<group name="Clothes">
<object model="2052" name="CJ_TOMMY_HAT" keywords="" />
Expand Down Expand Up @@ -6190,6 +6205,7 @@
<object model="16778" name="des_ufosign" keywords="" />
<object model="16779" name="ufo_light02" keywords="" />
<object model="16782" name="a51_radar_scan" keywords="" />
<object model="1593" name="plc_stinger" keywords="" />
</group>
<group name="Military">
<object model="7294" name="vgsN_polNB01" keywords="" />
Expand Down Expand Up @@ -6488,6 +6504,7 @@
<object model="17904" name="blokz_fireescape" keywords="" />
<object model="18366" name="cw2_mountwalk1" keywords="" />
<object model="18368" name="cs_mountplat" keywords="" />
<object model="6516" name="tvstudioTr_LAw2" keywords="" />
</group>
<group name="Trash">
<object model="961" name="CJ_ARM_CRATE_top" keywords="" />
Expand Down Expand Up @@ -8047,6 +8064,15 @@
<object model="18444" name="mtbfence39" keywords="" />
<object model="18445" name="mtbfence40" keywords="" />
<object model="18446" name="mtbfence43" keywords="" />
<object model="6517" name="santagard_LAw2" keywords="" />
<object model="6489" name="countclubTr_LAw2" keywords="" />
<object model="6451" name="Pier01Tr_LAw2" keywords="" />
<object model="6457" name="Pier02Tr_LAw2" keywords="" />
<object model="6458" name="Pier03Tr_LAw2" keywords="" />
<object model="6461" name="ferris01Tr_LAw2" keywords="" />
<object model="6466" name="pier04Tr_LAw2" keywords="" />
<object model="6413" name="sunset07Tr_LAw2" keywords="" />
<object model="6043" name="wilshire1w_law" keywords="" />
</group>
<group name="Garages and Petrol Stations">
<object model="3187" name="nt_gasstation" keywords="" />
Expand Down Expand Up @@ -9894,6 +9920,9 @@
<object model="18449" name="cs_roadbridge01" keywords="" />
<object model="18450" name="cs_roadbridge04" keywords="" />
<object model="18561" name="cS_newbridge" keywords="" />
<object model="17232" name="cuntwroad44" keywords="" />
<object model="6513" name="tunblock_LAw2" keywords="" />
<object model="6514" name="tunent01_LAw2" keywords="" />
</group>
</group>
<group name="Wires and Cables">
Expand Down Expand Up @@ -10118,5 +10147,9 @@
<object model="10267" name="cables16" keywords="" />
<object model="10040" name="cables3" keywords="" />
<object model="10012" name="cables4" keywords="" />
<object model="16335" name="des_transtower" keywords="" />
<object model="16334" name="des_cranelines01" keywords="" />
<object model="6405" name="venice03Tr_laW2" keywords="" />
<object model="6407" name="venice04Tr_LAw2" keywords="" />
</group>
</catalog>
Binary file modified [editor]/editor_main/client/colpatch/patches.col
View file
Open in desktop
Binary file not shown.
13 changes: 12 additions & 1 deletion [editor]/editor_main/client/colpatch/placement.list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5627,4 +5627,15 @@
16286,0,557.28125,1123.08594,26.72656,0.00000,-0.00000,0.00000
16498,0,829.40625,694.06250,10.67188,-0.00000,-0.00000,20.73494
16291,0,671.07813,1119.28125,37.03125,0.00000,-0.00000,0.00000
5993,0,1110.89844,-1328.81250,13.85156,0.00000,0.00000,0.00000
5993,0,1110.89844,-1328.81250,13.85156,0.00000,0.00000,0.00000
6411,256,415.68750,-1745.53125,14.13281,0.00000,0.00000,0.00000
6062,0,1137.14844,-1631.28906,14.48438,0.00000,0.00000,0.00000
5998,256,913.953125,-1015.632813,72.53125,0.00000,0.00000,0.00000
6518,0,310.34375,-1546.96875,69.5625,0.00000,0.00000,0.00000
6519,0,336.9453125,-1426.648438,42.453125,0.00000,0.00000,0.00000
6520,0,599.109375,-1458.757813,45.0625,0.00000,0.00000,0.00000
6521,0,461.359375,-1634.8125,41.234375,0.00000,0.00000,0.00000
6412,256,597.796875,-1265.507813,43.0703125,0.00000,0.00000,0.00000
6001,256,913.8125,-1021.132813,70.484375,0.00000,0.00000,0.00000
6043,256,955.14844,-1612.25000,20.17188,0.00000,0.00000,0.00000
6405,256,508.39063,-1772.82813,18.87500,0.00000,0.00000,0.00000
Loading