Merge pull request #8 from DeusEx010101/New-Icons

Icons updated to be more consistent
2025-11-10 15:41:24 +00:00 · 2020-06-24 21:31:32 +02:00 · 2020-06-24 21:31:32 +02:00 · 0641907ea0
commit 0641907ea0
parent 768049ca36 ff0f32fcf5
165 changed files with 9 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -11,3 +11,11 @@ resources/tools/a.miz
 tests/**
 # User-specific stuff
 .idea/
+
+liberation_preferences.json
+
+logs/liberation.log
+
+qt_ui/logs/liberation.log
+
+*.psd
--- a/requirements.txt
+++ b/requirements.txt
@ -1,4 +1,4 @@
 pydcs>=0.9.4
 Pyside2>=5.13.0
-pyinstaller==3.5
+pyinstaller==3.6
 pyproj==2.6.1.post1
--- a/resources/ui/daytime/dawn.png
+++ b/resources/ui/daytime/dawn.png
--- a/resources/ui/daytime/day.png
+++ b/resources/ui/daytime/day.png
--- a/resources/ui/daytime/dusk.png
+++ b/resources/ui/daytime/dusk.png
--- a/resources/ui/daytime/night.png
+++ b/resources/ui/daytime/night.png
--- a/resources/ui/daytime/original/dawn.png
+++ b/resources/ui/daytime/original/dawn.png
--- a/resources/ui/daytime/original/day.png
+++ b/resources/ui/daytime/original/day.png
--- a/resources/ui/daytime/original/dusk.png
+++ b/resources/ui/daytime/original/dusk.png
--- a/resources/ui/daytime/original/night.png
+++ b/resources/ui/daytime/original/night.png
--- a/resources/ui/events/air_intercept.png
+++ b/resources/ui/events/air_intercept.png
--- a/resources/ui/events/attack.PNG
+++ b/resources/ui/events/attack.PNG
--- a/resources/ui/events/capture.PNG
+++ b/resources/ui/events/capture.PNG
--- a/resources/ui/events/convoy.png
+++ b/resources/ui/events/convoy.png
--- a/resources/ui/events/delivery.PNG
+++ b/resources/ui/events/delivery.PNG
--- a/resources/ui/events/icons-med/air_intercept.png
+++ b/resources/ui/events/icons-med/air_intercept.png
--- a/resources/ui/events/icons-med/attack.PNG
+++ b/resources/ui/events/icons-med/attack.PNG
--- a/resources/ui/events/icons-med/capture.PNG
+++ b/resources/ui/events/icons-med/capture.PNG
--- a/resources/ui/events/icons-med/convoy.png
+++ b/resources/ui/events/icons-med/convoy.png
--- a/resources/ui/events/icons-med/delivery.PNG
+++ b/resources/ui/events/icons-med/delivery.PNG
--- a/resources/ui/events/icons-med/infantry.PNG
+++ b/resources/ui/events/icons-med/infantry.PNG
--- a/resources/ui/events/icons-med/insurgent_attack.PNG
+++ b/resources/ui/events/icons-med/insurgent_attack.PNG
--- a/resources/ui/events/icons-med/naval_intercept.PNG
+++ b/resources/ui/events/icons-med/naval_intercept.PNG
--- a/resources/ui/events/icons-med/strike.PNG
+++ b/resources/ui/events/icons-med/strike.PNG
--- a/resources/ui/events/infantry.PNG
+++ b/resources/ui/events/infantry.PNG
--- a/resources/ui/events/insurgent_attack.PNG
+++ b/resources/ui/events/insurgent_attack.PNG
--- a/resources/ui/events/naval_intercept.PNG
+++ b/resources/ui/events/naval_intercept.PNG
--- a/resources/ui/events/originals/air_intercept.png
+++ b/resources/ui/events/originals/air_intercept.png
--- a/resources/ui/events/originals/attack.PNG
+++ b/resources/ui/events/originals/attack.PNG
--- a/resources/ui/events/originals/capture.PNG
+++ b/resources/ui/events/originals/capture.PNG
--- a/resources/ui/events/originals/convoy.png
+++ b/resources/ui/events/originals/convoy.png
--- a/resources/ui/events/originals/delivery.PNG
+++ b/resources/ui/events/originals/delivery.PNG
--- a/resources/ui/events/originals/infantry.PNG
+++ b/resources/ui/events/originals/infantry.PNG
--- a/resources/ui/events/originals/insurgent_attack.PNG
+++ b/resources/ui/events/originals/insurgent_attack.PNG
--- a/resources/ui/events/originals/naval_intercept.PNG
+++ b/resources/ui/events/originals/naval_intercept.PNG
--- a/resources/ui/events/originals/strike.PNG
+++ b/resources/ui/events/originals/strike.PNG
--- a/resources/ui/events/strike.PNG
+++ b/resources/ui/events/strike.PNG
--- a/resources/ui/ground_assets/aa.png
+++ b/resources/ui/ground_assets/aa.png
--- a/resources/ui/ground_assets/aa_blue.png
+++ b/resources/ui/ground_assets/aa_blue.png
--- a/resources/ui/ground_assets/allycamp.png
+++ b/resources/ui/ground_assets/allycamp.png
--- a/resources/ui/ground_assets/allycamp_blue.png
+++ b/resources/ui/ground_assets/allycamp_blue.png
--- a/resources/ui/ground_assets/ammo.png
+++ b/resources/ui/ground_assets/ammo.png
--- a/resources/ui/ground_assets/ammo_blue.png
+++ b/resources/ui/ground_assets/ammo_blue.png
--- a/resources/ui/ground_assets/cleared.png
+++ b/resources/ui/ground_assets/cleared.png
--- a/resources/ui/ground_assets/comms.png
+++ b/resources/ui/ground_assets/comms.png
--- a/resources/ui/ground_assets/comms_blue.png
+++ b/resources/ui/ground_assets/comms_blue.png
--- a/resources/ui/ground_assets/derrick.png
+++ b/resources/ui/ground_assets/derrick.png
--- a/resources/ui/ground_assets/derrick_blue.png
+++ b/resources/ui/ground_assets/derrick_blue.png
--- a/resources/ui/ground_assets/destroyed.png
+++ b/resources/ui/ground_assets/destroyed.png
--- a/resources/ui/ground_assets/factory.png
+++ b/resources/ui/ground_assets/factory.png
--- a/resources/ui/ground_assets/factory_blue.png
+++ b/resources/ui/ground_assets/factory_blue.png
--- a/resources/ui/ground_assets/farp.png
+++ b/resources/ui/ground_assets/farp.png
--- a/resources/ui/ground_assets/farp_blue.png
+++ b/resources/ui/ground_assets/farp_blue.png
--- a/resources/ui/ground_assets/fob.png
+++ b/resources/ui/ground_assets/fob.png
--- a/resources/ui/ground_assets/fob_blue.png
+++ b/resources/ui/ground_assets/fob_blue.png
--- a/resources/ui/ground_assets/fuel.png
+++ b/resources/ui/ground_assets/fuel.png
--- a/resources/ui/ground_assets/fuel_blue.png
+++ b/resources/ui/ground_assets/fuel_blue.png
--- a/resources/ui/ground_assets/oil.png
+++ b/resources/ui/ground_assets/oil.png
--- a/resources/ui/ground_assets/oil_blue.png
+++ b/resources/ui/ground_assets/oil_blue.png
--- a/resources/ui/ground_assets/original/aa.png
+++ b/resources/ui/ground_assets/original/aa.png
--- a/resources/ui/ground_assets/original/aa_blue.png
+++ b/resources/ui/ground_assets/original/aa_blue.png
--- a/resources/ui/ground_assets/original/allycamp.png
+++ b/resources/ui/ground_assets/original/allycamp.png
--- a/resources/ui/ground_assets/original/allycamp_blue.png
+++ b/resources/ui/ground_assets/original/allycamp_blue.png
--- a/resources/ui/ground_assets/original/ammo.png
+++ b/resources/ui/ground_assets/original/ammo.png
--- a/resources/ui/ground_assets/original/ammo_blue.png
+++ b/resources/ui/ground_assets/original/ammo_blue.png
--- a/resources/ui/ground_assets/original/cleared.png
+++ b/resources/ui/ground_assets/original/cleared.png
--- a/resources/ui/ground_assets/original/comms.png
+++ b/resources/ui/ground_assets/original/comms.png
--- a/resources/ui/ground_assets/original/comms_blue.png
+++ b/resources/ui/ground_assets/original/comms_blue.png
--- a/resources/ui/ground_assets/original/derrick.png
+++ b/resources/ui/ground_assets/original/derrick.png
--- a/resources/ui/ground_assets/original/derrick_blue.png
+++ b/resources/ui/ground_assets/original/derrick_blue.png
--- a/resources/ui/ground_assets/original/destroyed.png
+++ b/resources/ui/ground_assets/original/destroyed.png
--- a/resources/ui/ground_assets/original/factory.png
+++ b/resources/ui/ground_assets/original/factory.png
--- a/resources/ui/ground_assets/original/factory_blue.png
+++ b/resources/ui/ground_assets/original/factory_blue.png
--- a/resources/ui/ground_assets/original/farp.png
+++ b/resources/ui/ground_assets/original/farp.png
--- a/resources/ui/ground_assets/original/farp_blue.png
+++ b/resources/ui/ground_assets/original/farp_blue.png
--- a/resources/ui/ground_assets/original/fob.png
+++ b/resources/ui/ground_assets/original/fob.png
--- a/resources/ui/ground_assets/original/fob_blue.png
+++ b/resources/ui/ground_assets/original/fob_blue.png
--- a/resources/ui/ground_assets/original/fuel.png
+++ b/resources/ui/ground_assets/original/fuel.png
--- a/resources/ui/ground_assets/original/fuel_blue.png
+++ b/resources/ui/ground_assets/original/fuel_blue.png
--- a/resources/ui/ground_assets/original/oil.png
+++ b/resources/ui/ground_assets/original/oil.png
--- a/resources/ui/ground_assets/original/oil_blue.png
+++ b/resources/ui/ground_assets/original/oil_blue.png
--- a/resources/ui/ground_assets/original/power.png
+++ b/resources/ui/ground_assets/original/power.png
--- a/resources/ui/ground_assets/original/power_blue.png
+++ b/resources/ui/ground_assets/original/power_blue.png
--- a/resources/ui/ground_assets/original/ship.png
+++ b/resources/ui/ground_assets/original/ship.png
--- a/resources/ui/ground_assets/original/ship_blue.png
+++ b/resources/ui/ground_assets/original/ship_blue.png
--- a/resources/ui/ground_assets/original/target.png
+++ b/resources/ui/ground_assets/original/target.png
--- a/resources/ui/ground_assets/original/target_blue.png
+++ b/resources/ui/ground_assets/original/target_blue.png
--- a/resources/ui/ground_assets/original/village.png
+++ b/resources/ui/ground_assets/original/village.png
--- a/resources/ui/ground_assets/original/village_blue.png
+++ b/resources/ui/ground_assets/original/village_blue.png
--- a/resources/ui/ground_assets/original/ware.png
+++ b/resources/ui/ground_assets/original/ware.png
--- a/resources/ui/ground_assets/original/ware_blue.png
+++ b/resources/ui/ground_assets/original/ware_blue.png
--- a/resources/ui/ground_assets/original/ww2bunker.png
+++ b/resources/ui/ground_assets/original/ww2bunker.png
--- a/resources/ui/ground_assets/original/ww2bunker_blue.png
+++ b/resources/ui/ground_assets/original/ww2bunker_blue.png
--- a/resources/ui/ground_assets/power.png
+++ b/resources/ui/ground_assets/power.png
--- a/resources/ui/ground_assets/power_blue.png
+++ b/resources/ui/ground_assets/power_blue.png
--- a/resources/ui/ground_assets/ship.png
+++ b/resources/ui/ground_assets/ship.png
--- a/resources/ui/ground_assets/ship_blue.png
+++ b/resources/ui/ground_assets/ship_blue.png
--- a/resources/ui/ground_assets/target.png
+++ b/resources/ui/ground_assets/target.png
--- a/resources/ui/ground_assets/target_blue.png
+++ b/resources/ui/ground_assets/target_blue.png
--- a/resources/ui/ground_assets/village.png
+++ b/resources/ui/ground_assets/village.png
--- a/Show More
+++ b/Show More