Merge v05 into branch

Browse Source

...

This commit is contained in:

C.S. Melis 2021-12-05 13:20:29 +01:00

parent e096b776b8 39fd193ba5

commit 4115b7e8c8

140 changed files with 95 additions and 94 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN

DATA/BASES/GENERIC/skydome_clouds_snow.3db Normal file

View File

Binary file not shown.

BIN

DATA/BASES/GENERIC/skydome_clouds_thin.3db Normal file

View File

Binary file not shown.

BIN

DATA/BASES/LIBERTY/li_01_manhattan_cityscape_background.3db Normal file

View File

Binary file not shown.

BIN

DATA/BASES/LIBERTY/li_01_manhattan_cityscape_buildings1.3db Normal file

View File

Binary file not shown.

BIN

DATA/BASES/LIBERTY/li_01_manhattan_cityscape_buildings2.3db Normal file

View File

Binary file not shown.

BIN

DATA/BASES/LIBERTY/li_01_manhattan_cityscape_buildings3.3db Normal file

View File

Binary file not shown.

BIN

DATA/BASES/LIBERTY/li_01_manhattan_cityscape_skyline.3db Normal file

View File

Binary file not shown.

BIN

DATA/BASES/LIBERTY/li_01_manhattan_cityscape_skyline2.3db Normal file

View File

Binary file not shown.

BIN

DATA/BASES/LIBERTY/li_californio_equip.cmp Normal file

View File

Binary file not shown.

BIN

DATA/BASES/LIBERTY/li_californio_trader.cmp Normal file

View File

Binary file not shown.

BIN

DATA/BASES/LIBERTY/li_forbes_bar.cmp Normal file

View File

Binary file not shown.

BIN

DATA/BASES/LIBERTY/li_manhattan_shipdealer.cmp Normal file

View File

Binary file not shown.

BIN

DATA/BASES/LIBERTY/li_manhattan_shipdealer_bg.3db Normal file

View File

Binary file not shown.

BIN

DATA/BASES/LIBERTY/li_manhattan_window_day_01.3db Normal file

View File

Binary file not shown.

BIN

DATA/BASES/LIBERTY/li_manhattan_window_day_02.3db Normal file

View File

Binary file not shown.

0

DATA/INTERFACE/BASESIDE/bar.3db → DATA/INTERFACE/BASESIDE/bar_flaticons.3db

Unescape Escape View File

0

DATA/INTERFACE/BASESIDE/city_maneuvertab1.cmp → DATA/INTERFACE/BASESIDE/city_maneuvertab1_darkhud.cmp

Unescape Escape View File

0

DATA/INTERFACE/BASESIDE/city_maneuvertab2.cmp → DATA/INTERFACE/BASESIDE/city_maneuvertab2_darkhud.cmp

Unescape Escape View File

0

DATA/INTERFACE/BASESIDE/city_maneuvertab3.cmp → DATA/INTERFACE/BASESIDE/city_maneuvertab3_darkhud.cmp

Unescape Escape View File

0

DATA/INTERFACE/BASESIDE/cityscape.3db → DATA/INTERFACE/BASESIDE/cityscape_flaticons.3db

Unescape Escape View File

0

DATA/INTERFACE/BASESIDE/commod_trader.3db → DATA/INTERFACE/BASESIDE/commod_trader_flaticons.3db

Unescape Escape View File

0

DATA/INTERFACE/BASESIDE/deck.3db → DATA/INTERFACE/BASESIDE/deck_flaticons.3db

Unescape Escape View File

0

DATA/INTERFACE/BASESIDE/equipment_dealer.3db → DATA/INTERFACE/BASESIDE/equipment_dealer_flaticons.3db

Unescape Escape View File

0

DATA/INTERFACE/BASESIDE/equiproomarrow.3db → DATA/INTERFACE/BASESIDE/equiproomarrow_flaticons.3db

Unescape Escape View File

0

DATA/INTERFACE/BASESIDE/frontdesk.3db → DATA/INTERFACE/BASESIDE/frontdesk_flaticons.3db

Unescape Escape View File

0

DATA/INTERFACE/BASESIDE/mission_vendor.3db → DATA/INTERFACE/BASESIDE/mission_vendor_flaticons.3db

Unescape Escape View File

0

DATA/INTERFACE/BASESIDE/news_vendor.3db → DATA/INTERFACE/BASESIDE/news_vendor_flaticons.3db

Unescape Escape View File

0

DATA/INTERFACE/BASESIDE/planetscape.3db → DATA/INTERFACE/BASESIDE/planetscape_flaticons.3db

Unescape Escape View File

0

DATA/INTERFACE/BASESIDE/repair.3db → DATA/INTERFACE/BASESIDE/repair_flaticons.3db

Unescape Escape View File

0

DATA/INTERFACE/BASESIDE/salesman.3db → DATA/INTERFACE/BASESIDE/salesman_flaticons.3db

Unescape Escape View File

0

DATA/INTERFACE/BASESIDE/ship_dealer.3db → DATA/INTERFACE/BASESIDE/ship_dealer_flaticons.3db

Unescape Escape View File

0

DATA/INTERFACE/BASESIDE/take_off.3db → DATA/INTERFACE/BASESIDE/take_off_flaticons.3db

Unescape Escape View File

0

DATA/INTERFACE/HUD/hud_grouprequest.3db → DATA/INTERFACE/HUD/hud_grouprequest_flaticons.3db

Unescape Escape View File

0

DATA/INTERFACE/HUD/hud_guagewindow.cmp → DATA/INTERFACE/HUD/hud_guagewindow_darkhud.cmp

Unescape Escape View File

0

DATA/INTERFACE/HUD/hud_infocard.3db → DATA/INTERFACE/HUD/hud_infocard_flaticons.3db

Unescape Escape View File

0

DATA/INTERFACE/HUD/hud_loot_bw.3db → DATA/INTERFACE/HUD/hud_loot_bw_flaticons.3db

Unescape Escape View File

0

DATA/INTERFACE/HUD/hud_maneuverbox1.cmp → DATA/INTERFACE/HUD/hud_maneuverbox1_darkhud.cmp

Unescape Escape View File

0

DATA/INTERFACE/HUD/hud_maneuverbox2.cmp → DATA/INTERFACE/HUD/hud_maneuverbox2_darkhud.cmp

Unescape Escape View File

0

DATA/INTERFACE/HUD/hud_maneuverbox3.cmp → DATA/INTERFACE/HUD/hud_maneuverbox3_darkhud.cmp

Unescape Escape View File

0

DATA/INTERFACE/HUD/hud_maneuverbox4.cmp → DATA/INTERFACE/HUD/hud_maneuverbox4_darkhud.cmp

Unescape Escape View File

0

DATA/INTERFACE/HUD/hud_maneuverbox5.cmp → DATA/INTERFACE/HUD/hud_maneuverbox5_darkhud.cmp

Unescape Escape View File

0

DATA/INTERFACE/HUD/hud_maneuverbox6.cmp → DATA/INTERFACE/HUD/hud_maneuverbox6_darkhud.cmp

Unescape Escape View File

0

DATA/INTERFACE/HUD/hud_maneuverbox7.cmp → DATA/INTERFACE/HUD/hud_maneuverbox7_darkhud.cmp

Unescape Escape View File

0

DATA/INTERFACE/HUD/hud_maneuverbox8.cmp → DATA/INTERFACE/HUD/hud_maneuverbox8_darkhud.cmp

Unescape Escape View File

0

DATA/INTERFACE/HUD/hud_maneuverbox9.cmp → DATA/INTERFACE/HUD/hud_maneuverbox9_darkhud.cmp

Unescape Escape View File

0

DATA/INTERFACE/HUD/hud_missilealert.3db → DATA/INTERFACE/HUD/hud_missilealert_flaticons.3db

Unescape Escape View File

0

DATA/INTERFACE/HUD/hud_nnbox4.cmp → DATA/INTERFACE/HUD/hud_nnbox4_darkhud.cmp

Unescape Escape View File

0

DATA/INTERFACE/HUD/hud_nnbox5.cmp → DATA/INTERFACE/HUD/hud_nnbox5_darkhud.cmp

Unescape Escape View File

0

DATA/INTERFACE/HUD/hud_nnbox6.cmp → DATA/INTERFACE/HUD/hud_nnbox6_darkhud.cmp

Unescape Escape View File

0

DATA/INTERFACE/HUD/hud_nnbox7.cmp → DATA/INTERFACE/HUD/hud_nnbox7_darkhud.cmp

Unescape Escape View File

0

DATA/INTERFACE/HUD/hud_numberboxes.cmp → DATA/INTERFACE/HUD/hud_numberboxes_darkhud.cmp

Unescape Escape View File

0

DATA/INTERFACE/HUD/hud_radiationalert.3db → DATA/INTERFACE/HUD/hud_radiationalert_flaticons.3db

Unescape Escape View File

BIN

DATA/INTERFACE/HUD/hud_shipinfo_adv_wide_hud_darkhud.cmp Normal file

View File

Binary file not shown.

0

DATA/INTERFACE/HUD/hud_shipinfo_button.3db → DATA/INTERFACE/HUD/hud_shipinfo_button_flaticons.3db

Unescape Escape View File

0

DATA/INTERFACE/HUD/hud_shipinfo.cmp → DATA/INTERFACE/HUD/hud_shipinfo_darkhud.cmp

Unescape Escape View File

0

DATA/INTERFACE/HUD/hud_shipinfo_min.3db → DATA/INTERFACE/HUD/hud_shipinfo_min_darkhud.3db

Unescape Escape View File

0

DATA/INTERFACE/HUD/hud_shipinfo_min.cmp → DATA/INTERFACE/HUD/hud_shipinfo_min_darkhud.cmp

Unescape Escape View File

0

DATA/INTERFACE/HUD/hud_shiptarget.3db → DATA/INTERFACE/HUD/hud_shiptarget_flaticons.3db

Unescape Escape View File

0

DATA/INTERFACE/HUD/hud_steeringarrow.3db → DATA/INTERFACE/HUD/hud_steeringarrow_darkhud.3db

Unescape Escape View File

BIN

DATA/INTERFACE/HUD/hud_target_adv_wide_hud_darkhud.cmp Normal file

View File

Binary file not shown.

0

DATA/INTERFACE/HUD/hud_target.cmp → DATA/INTERFACE/HUD/hud_target_darkhud.cmp

Unescape Escape View File

0

DATA/INTERFACE/HUD/hud_target_min.cmp → DATA/INTERFACE/HUD/hud_target_min_darkhud.cmp

Unescape Escape View File

0

DATA/INTERFACE/HUD/hud_trade.3db → DATA/INTERFACE/HUD/hud_trade_flaticons.3db

Unescape Escape View File

0

DATA/INTERFACE/HUD/hud_trailalert.3db → DATA/INTERFACE/HUD/hud_trailalert_flaticons.3db

Unescape Escape View File

0

DATA/INTERFACE/INTRO/OBJECTS/front_button.cmp → DATA/INTERFACE/INTRO/OBJECTS_darkhud/front_button.cmp

Unescape Escape View File

0

DATA/INTERFACE/INTRO/OBJECTS/front_characselectbox.cmp → DATA/INTERFACE/INTRO/OBJECTS_darkhud/front_characselectbox.cmp

Unescape Escape View File

0

DATA/INTERFACE/INTRO/OBJECTS/front_characselectbox_message.cmp → DATA/INTERFACE/INTRO/OBJECTS_darkhud/front_characselectbox_message.cmp

Unescape Escape View File

0

DATA/INTERFACE/INTRO/OBJECTS/front_charactercreatebox.cmp → DATA/INTERFACE/INTRO/OBJECTS_darkhud/front_charactercreatebox.cmp

Unescape Escape View File

0

DATA/INTERFACE/INTRO/OBJECTS/front_infowindow.cmp → DATA/INTERFACE/INTRO/OBJECTS_darkhud/front_infowindow.cmp

Unescape Escape View File

0

DATA/INTERFACE/INTRO/OBJECTS/front_loadingbar.cmp → DATA/INTERFACE/INTRO/OBJECTS_darkhud/front_loadingbar.cmp

Unescape Escape View File

0

DATA/INTERFACE/INTRO/OBJECTS/front_serverselect.cmp → DATA/INTERFACE/INTRO/OBJECTS_darkhud/front_serverselect.cmp

Unescape Escape View File

0

DATA/INTERFACE/INTRO/OBJECTS/front_serverselect_info.cmp → DATA/INTERFACE/INTRO/OBJECTS_darkhud/front_serverselect_info.cmp

Unescape Escape View File

0

DATA/INTERFACE/INTRO/OBJECTS/front_shipselectionbox.cmp → DATA/INTERFACE/INTRO/OBJECTS_darkhud/front_shipselectionbox.cmp

Unescape Escape View File

0

DATA/INTERFACE/INTRO/OBJECTS/multi_accountboxlong.cmp → DATA/INTERFACE/INTRO/OBJECTS_darkhud/multi_accountboxlong.cmp

Unescape Escape View File

0

DATA/INTERFACE/INTRO/OBJECTS/multi_accountboxshort.cmp → DATA/INTERFACE/INTRO/OBJECTS_darkhud/multi_accountboxshort.cmp

Unescape Escape View File

0

DATA/INTERFACE/INTRO/OBJECTS/multi_attentionreq'd.cmp → DATA/INTERFACE/INTRO/OBJECTS_darkhud/multi_attentionreq'd.cmp

Unescape Escape View File

0

DATA/INTERFACE/INTRO/OBJECTS/multi_charactercreation.cmp → DATA/INTERFACE/INTRO/OBJECTS_darkhud/multi_charactercreation.cmp

Unescape Escape View File

0

DATA/INTERFACE/LOADSAVE/front_button.cmp → DATA/INTERFACE/LOADSAVE_darkhud/front_button.cmp

Unescape Escape View File

0

DATA/INTERFACE/LOADSAVE/front_infowindow.cmp → DATA/INTERFACE/LOADSAVE_darkhud/front_infowindow.cmp

Unescape Escape View File

0

DATA/INTERFACE/LOADSAVE/ls_background.cmp → DATA/INTERFACE/LOADSAVE_darkhud/ls_background.cmp

Unescape Escape View File

0

DATA/INTERFACE/MULTIPLAYER/CHAT/chat_chat_textbox.cmp → DATA/INTERFACE/MULTIPLAYER_darkhud/CHAT/chat_chat_textbox.cmp

Unescape Escape View File

0

DATA/INTERFACE/MULTIPLAYER/TRADE/trade_background.cmp → DATA/INTERFACE/MULTIPLAYER_darkhud/TRADE/trade_background.cmp

Unescape Escape View File

0

DATA/INTERFACE/MULTIPLAYER/TRADE/trade_backgroundold.cmp → DATA/INTERFACE/MULTIPLAYER_darkhud/TRADE/trade_backgroundold.cmp

Unescape Escape View File

0

DATA/INTERFACE/NEURONET/ICONS/nn_chat.3db → DATA/INTERFACE/NEURONET/ICONS_flaticons/nn_chat.3db

Unescape Escape View File

0

DATA/INTERFACE/NEURONET/ICONS/nn_grouprequest.3db → DATA/INTERFACE/NEURONET/ICONS_flaticons/nn_grouprequest.3db

Unescape Escape View File

0

DATA/INTERFACE/NEURONET/ICONS/nn_info.3db → DATA/INTERFACE/NEURONET/ICONS_flaticons/nn_info.3db

Unescape Escape View File

0

DATA/INTERFACE/NEURONET/ICONS/nn_inventory.3db → DATA/INTERFACE/NEURONET/ICONS_flaticons/nn_inventory.3db

Unescape Escape View File

0

DATA/INTERFACE/NEURONET/ICONS/nn_map.3db → DATA/INTERFACE/NEURONET/ICONS_flaticons/nn_map.3db

Unescape Escape View File

0

DATA/INTERFACE/NEURONET/ICONS/nn_playerstatus.3db → DATA/INTERFACE/NEURONET/ICONS_flaticons/nn_playerstatus.3db

Unescape Escape View File

0

DATA/INTERFACE/NEURONET/ICONS/nn_request.3db → DATA/INTERFACE/NEURONET/ICONS_flaticons/nn_request.3db

Unescape Escape View File

0

DATA/INTERFACE/NEURONET/ICONS/nn_shipstatus.3db → DATA/INTERFACE/NEURONET/ICONS_flaticons/nn_shipstatus.3db

Unescape Escape View File

0

DATA/INTERFACE/NEURONET/ICONS/nn_storystar.3db → DATA/INTERFACE/NEURONET/ICONS_flaticons/nn_storystar.3db

Unescape Escape View File

0

DATA/INTERFACE/NEURONET/ICONS/nn_traderequest.3db → DATA/INTERFACE/NEURONET/ICONS_flaticons/nn_traderequest.3db

Unescape Escape View File

0

DATA/INTERFACE/NEURONET/INVENTORY/ammo.3db → DATA/INTERFACE/NEURONET/INVENTORY/ammo_flaticons.3db

Unescape Escape View File

0

DATA/INTERFACE/NEURONET/INVENTORY/cargobay.3db → DATA/INTERFACE/NEURONET/INVENTORY/cargobay_flaticons.3db

Unescape Escape View File

0

DATA/INTERFACE/NEURONET/INVENTORY/char_infowindow.cmp → DATA/INTERFACE/NEURONET/INVENTORY/char_infowindow_darkhud.cmp

Unescape Escape View File

0

DATA/INTERFACE/NEURONET/INVENTORY/commodities.3db → DATA/INTERFACE/NEURONET/INVENTORY/commodities_flaticons.3db

Unescape Escape View File

0

DATA/INTERFACE/NEURONET/INVENTORY/equipmenticon.3db → DATA/INTERFACE/NEURONET/INVENTORY/equipmenticon_flaticons.3db

Unescape Escape View File

0

DATA/INTERFACE/NEURONET/INVENTORY/front_button.cmp → DATA/INTERFACE/NEURONET/INVENTORY/front_button_darkhud.cmp

Unescape Escape View File

0

DATA/INTERFACE/NEURONET/INVENTORY/front_options_box2.cmp → DATA/INTERFACE/NEURONET/INVENTORY/front_options_box2_darkhud.cmp

Unescape Escape View File

Some files were not shown because too many files have changed in this diff Show More