1
0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-24 13:41:08 +07:00
Commit Graph

353 Commits

Author SHA1 Message Date
Yair Morgenstern
7fe2b9e99b Resolved - unit icons no longer overlap unit action images, improved render time for unit images 2023-01-09 23:30:23 +02:00
Yair Morgenstern
8cd9bca7bf MoveTo image visible - 2023-01-09 22:17:28 +02:00
vegeta1k95
0006aaef55
Modding: allow custom ResourcePortraits ()
* Modding: allow custom ResourcePortraits

* Modding: big generification of the icons/portraits mechanism

* Resolve conflict

* Fix background fallback, remove dimming of improvement icons

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
2023-01-09 21:03:00 +02:00
vegeta1k95
a5f68612ad
Better visibility for city status icons ()
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
2023-01-07 19:27:55 +02:00
vegeta1k95
8fd561de50
Added WLTKD status icon ()
* Added WTLKD status icon

* Credits

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
2022-12-29 13:52:35 +02:00
vegeta1k95
be573f2b76
Big rework of City plates ()
* Big rework of City plates

* New city plates design, new status icons

* A little bit of padding for construction icon

* Better border for defence counter

* Better border for defence counter

* Solid colored icons

* Solid colored icons

* Credits

* Credits

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
2022-12-28 17:32:26 +02:00
vegeta1k95
78c4f6de68
Big rework of Policy Picker UI, added new ninepatch RoundedEdgeRectangleSmall ()
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
2022-12-24 19:17:00 +02:00
vegeta1k95
2bc91f1216
Rework of City Screen: new Great People list + misc changes ()
* Rework of City Screen: new Great People list + misc changes

* Added a bit of padding

* Buildings are united under one tabs, GP font icons replaced by tinted UnitIcons

* Fix color of separators

* Big update to "Detailed stats" UI

* Rebuild pngs

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2022-12-21 11:46:35 +02:00
vegeta1k95
1346eea4ca
Huge update of Technology Picker screen UI (Civ 5), new original icons + misc changes ()
* Huge update of Technology Picker screen UI, new original icons + misc changes

* Fix possible memory leak

* Fix lines Z-Depth, shifted era boundary lines, thicker queue-path lines

* Fix lines Z-Depth more correctly

* Size checks replaced by truncation

* Icons credits

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
2022-12-21 11:25:10 +02:00
Yair Morgenstern
b44ac9eaa4 Better unit action icons 2022-12-17 20:06:43 +02:00
Yair Morgenstern
889a2c5946 Added thin line around tech icons in tech screen 2022-12-16 11:15:36 +02:00
Yair Morgenstern
0d19bf9cef Better icons for 'next turn' button
@vegeta1k95 sorry about this, but the way this works without resizing is simply not up to the standards of the current UI :/
2022-12-16 11:15:36 +02:00
Yair Morgenstern
d3f8f680d1 4.3.7 2022-12-09 12:56:34 +02:00
Yair Morgenstern
94605911a2 4.3.5 2022-11-30 18:06:28 +02:00
Yair Morgenstern
0858f8c038 Added AbsoluteUnits as default units for Hexarealm tileset :D 2022-11-02 23:10:40 +02:00
Yair Morgenstern
731e9f5815 4.2.15 2022-10-24 20:54:04 +03:00
Yair Morgenstern
11de54d8d5 4.2.10 2022-09-19 16:24:11 +03:00
Yair Morgenstern
04ee2b716e Updated preview images and added guide to doing so 2022-09-12 20:58:27 +03:00
Xander Lenstra
a19fed5d28
Added a screen to move spies between cities ()
* Added a screen to move spies between cities

* Fixed tests

* Reviews

* Avoid labels blinking

Co-authored-by: JackRainy <JackRainy@users.noreply.github.com>
2022-08-28 23:25:14 +03:00
Leonard Günther
18ef8fc20e
Removed legacy tileset code ()
* Removed legacy tileset code

which was only used for the "Default" tileset

* Updated "Default" tileset to support new rendering

* Updated docs

* Fixed fogOfWar coloring bug

* Removed cityImage variable completely

* Renamed variable out to baseHexagon

* Moved color lerp out of for loop

* Renamed "Default" tileset to "Minimal"

* Made "HexaRealm" the games fallback tileset

* Implemented requested changes

* Readded accidentally removed variable

* Reverted updateTileImage back to foreach loop

Since indices are not needed anymore

* Regenerated game.atlas and game.png
2022-08-22 13:02:52 +02:00
Ouaz
90e582a0c3
Add an icon for "Wait" unit action () 2022-08-16 12:30:37 +02:00
Xander Lenstra
202e0bcf47
Basic version of EspionageManger, added a unique to gain spies ()
* Handfull of comment questions, small refactorings

* Code changes

* Reworded a unique, removed a file

* Added spy names for all nations, minor consistency change

* Removed debug output

* Added an empty constructor so gdx can reconstruct it
2022-08-13 22:45:16 +03:00
itanasi
af6ab8e4e5
Add Air Sweep ()
* Add Air Sweep Unique
Enable Dogfighting Promotion
Add Air Sweep mode button and crosshair overlay

* Adding Air Sweep Battle Table

* Add airSweep to Battle
Remove double XP
While in AirSweep can't select other units on tile

* initial airsweep code

* Implement airSweep

* BattleTable indicates tile you're AirSweeping

* some notifications

* Clean up notifications.
Add icons

* Revert game.atlas and game.png

* Fix selection properly

* Update Vanilla UnitPromotions.json

* Better handling of movement use
comment cleanup

* missing credit

* Proper code so that Seas units also deal no damage
Adding Tutorials!

* Remove Intercept Bonus Damage/Protection

* Remove chance of Interceptor missing

* Battle Table a bit more consistent

* Defender also gets Air Sweep Modifiers

* Defender doesn't get bonus

* Remove unused getInterceptBonus
Combine logic

* Show damage in notifications for Air Sweep

* Randomize intercepting Civ and prioritize Air Units

* Remove debug code

* Updated atlas

* Clean up Uniques

* Object-ify DamageDealt for ease of reference

* code clean up

Co-authored-by: itanasi <spellman23@gmail.com>
2022-07-27 22:16:53 +03:00
OptimizedForDensity
2a2b4bc531
Better era-specific tile image support ()
* Better era specific tile images

* Use ImageAttempter to reuse code

* Redundant code

* Unify era-specific image loading

* Revert change

* I guess I'll commit these
2022-07-15 10:51:46 +03:00
OptimizedForDensity
76d1c0b4c9
Add missing Plains Hill Forest Lumber mill image for FantasyHex ()
* Add missing lumber camp for FantasyHex

* Update atlas

* Update image

* Add missing plains hill forest camp

* Update image and remove added camp tile

* Remove redundant image

* Undelete atlas

* Delete extra GrasslandsHillForestLumbermill image
2022-07-05 08:06:09 +03:00
Azzurite
9d6a945a91 Regenerate atlas 2022-06-25 15:11:39 +02:00
Azzurite
35c68b47d5 Regenerate atlas & update uniques.md 2022-06-18 23:39:08 +02:00
Yair Morgenstern
ea3b1bb612 4.1.7 2022-06-06 10:02:02 +03:00
Timo T
ea03b97639
Multiplayer Status Display ()
* Handle subclassing of Events properly

Previously, you could only listen to the exact class

* Add relevant parent classes for the multiplayer events

* Refactor: use the old name as the main name in MultiplayerGameNameChanged event

* Add being able to stop listening to events in the EventBus

* Add tests for EventBus

* Refactor: Extract GameList into standalone file

* Refactor: safeUpdateIf to more generic throttle function

* Refactor: Extract multiplayer UI helper functions into separate file

* Refactor: Extract load/download multiplayer game into logic class from UI

* Make loading a multiplayer game automatically update the in-memory game in OnlineMultiplayer

* Refactor: Extract multiplayer settings into separate object

* Add multiplayer status display

* Fix error with multiplayer games not correctly being cleaned up after successful update

* Prevent loadLatestMultiplayerState() while next turn update is running

* Show "Working..." while waiting for next turn calculations instead of "Waiting for [civ]..."

* Fix race condition while updating online game state
2022-05-25 22:22:58 +02:00
Azzurite
4eaf3c8355 Regenerate atlas for e672ca6bf4 2022-05-24 17:34:02 +02:00
itanasi
a2bc1a1a29
Assign Population Improvements ()
City management UI to allow focusing automatic worker placement

Improvements to worker / specialist assignment routines
2022-05-20 00:12:23 +02:00
Yair Morgenstern
f464ac2544 4.1.1 2022-05-18 23:03:29 +03:00
SomeTroglodyte
345ca0ec25
Pedia from mainmenu ()
* Make Civilopedia independent of worldScreen or gameInfo

* Make Civilopedia callable from Main Menu

* Era category for Civilopedia

* Era category for Civilopedia - atlas
2022-05-13 12:36:06 +03:00
Yair Morgenstern
3e63be5376 4.0.15-patch1
Extra images fixed and HexaRealm added :)
2022-05-11 17:58:30 +03:00
Yair Morgenstern
e348a20d2e Extracted policies, religions, nations and promotions to separate png files in order to fit HexaRealm tileset into the main file - see 2022-05-11 16:57:39 +03:00
Xander Lenstra
8fcfbf752b
Improved clarity and moddability of building improvements ()
* Renamed tile.hasUnique, deprecated `Indestructable`, unique for citadels
Also refactored the consumption of (great) people out of UnitActions.

* Reworked when improvements can be build somewhere for more clarity

* Made resources improvable by multiple improvements; Offshore Platform

* Fix compatability

* WIP

* Fixed the tests, but better

* I suppose I might as well update this now that we're a version later
2022-05-11 00:35:21 +02:00
SomeTroglodyte
7526114281
Empire overview resources ()
* Empire Overview Resources: Vertical option

* Empire Overview Resources: Extra Info

* Empire Overview Resources: Tweaks

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2022-03-28 17:31:19 +03:00
itanasi
9d1f463310
Add Amphibious penalty to Land attacking into Water and vice versa ()
* Add Amphibious penalty to Land attacking into Water and vice versa

* Replace Landing with Amphibious in all translation files

* Fix trailing whitespace

* Revert translation files

* Change working of Amphibious
Set penalty to Landing and Boarding

* Type-ify Unique and add Depreciated
Add Promotion to Melee Naval
Add exception that Landing penalty is NOT against cities

* Fix Vanilla

* Rename to Landing Party
Icon doesn't work

* Properly regenerated game.atlas/game.png

Co-authored-by: itanasi <spellman23@gmail.com>
2022-02-14 19:21:53 +01:00
yairm210
21fbaf4814 3.18.18 2022-01-16 19:51:33 +02:00
Xander Lenstra
483dd2e871
Fixed border image alpha () 2022-01-04 18:57:02 +02:00
Xander Lenstra
0f258d5638
Translations update ()
* Update Portuguese.properties

# Language settings

# Equivalent of a space in your language
# If your language doesn't use spaces, just add "" as a translation, otherwise " "
 # Requires translation!
" " = 

# If the first word in a sentence starts with a capital in your language, 
# put the english word 'true' behind the '=', otherwise 'false'.
# Don't translate these words to your language, only put 'true' or 'false'.
 # Requires translation!
StartWithCapitalLetter = 


# Starting from here normal translations start, as written on
# https://github.com/yairm210/Unciv/wiki/Translating

# Tutorial tasks

* Update Simplified_Chinese.properties ()

* Merged some uniques and added a new one for not allowing to build units ()

* Print stacktraces in more cases when crashing, useful for debugging

* Conditionalized no oceans before astronomy unique

* Cannot be built on tile before tech conditionalized

* Added "Cannot build unitFilter units" unique

* Fixed tests failing

* Merge branch master into some-uniques

* Fixed typo

* Apparently I made the same mistake twice

* Globalized unique

* Allowed follower beliefs to have more uniques, merged a unique and globalized some uniques ()

* Regenerate atlas. . ()

* Update Simplified_Chinese.properties

* Fixed translation tests failing

Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Co-authored-by: will-ca <willchencontact@gmail.com>

* Update Simplified_Chinese.properties ()

* Merged some uniques and added a new one for not allowing to build units ()

* Print stacktraces in more cases when crashing, useful for debugging

* Conditionalized no oceans before astronomy unique

* Cannot be built on tile before tech conditionalized

* Added "Cannot build unitFilter units" unique

* Fixed tests failing

* Merge branch master into some-uniques

* Fixed typo

* Apparently I made the same mistake twice

* Globalized unique

* Allowed follower beliefs to have more uniques, merged a unique and globalized some uniques ()

* Regenerate atlas. . ()

* Update Simplified_Chinese.properties

Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Co-authored-by: will-ca <willchencontact@gmail.com>

* Update Brazillian_portuguese.properties ()

* Merged some uniques and added a new one for not allowing to build units ()

* Print stacktraces in more cases when crashing, useful for debugging

* Conditionalized no oceans before astronomy unique

* Cannot be built on tile before tech conditionalized

* Added "Cannot build unitFilter units" unique

* Fixed tests failing

* Merge branch master into some-uniques

* Fixed typo

* Apparently I made the same mistake twice

* Globalized unique

* Allowed follower beliefs to have more uniques, merged a unique and globalized some uniques ()

* Regenerate atlas. . ()

* Update Brazillian_portuguese.properties

I translated some sentences.

Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Co-authored-by: will-ca <willchencontact@gmail.com>

* Update Czech.properties ()

- translated lot of new strings

* Some French translations ()

* Some French translations

* Update French.properties

* Update Italian.properties ()

* Update Dutch.properties ()

* Update Dutch.properties

* Voorgestelde verbeteringen toegevoegd

Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>

* Actually fixed the atlas generation

* Update Turkish.properties ()

* Delete Ship Of The Line.png

* GH Actions: Check user privileges before running bots. ()

* Revamped nukes again to closer match the original ()

* Update Turkish.properties

I translated again.This time i translated somra error scripts

Co-authored-by: hundun <wwj.hddjj@gmail.com>
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Co-authored-by: will-ca <willchencontact@gmail.com>

Co-authored-by: sidneybr <95696905+sidneybr@users.noreply.github.com>
Co-authored-by: ZGMZY <69511837+ZGMZY@users.noreply.github.com>
Co-authored-by: will-ca <willchencontact@gmail.com>
Co-authored-by: Ustklm <58632848+Ustklm@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: Newexae <96820363+Newexae@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Peter Bos <55184696+Peter1306@users.noreply.github.com>
Co-authored-by: HariboSever <96971269+HariboSever@users.noreply.github.com>
Co-authored-by: hundun <wwj.hddjj@gmail.com>
2022-01-02 19:07:09 +01:00
will-ca
1f153cc86e
Regenerate atlas. . () 2021-12-31 13:55:41 +00:00
yairm210
b8b5f79ee0 3.18.12 2021-12-25 22:51:41 +02:00
Xander Lenstra
17b382a614
Replaced illegal / questionably legal assets ()
* Replaced illegal / questionably legal assets

* Resized policy icon to correct size
2021-12-18 17:53:21 +02:00
SimonCeder
010931ca42
Bombard notification ()
* add notification when able to bombard

* harmonize with enemy unit notification

* use city.range
2021-11-04 18:36:50 +02:00
SimonCeder
bfe0b68ab8
Barbarian units ()
* barbarian unique units; barbarian blacklisted units

* credits

* barbarian units do not take resources

* ai fix
2021-10-29 13:33:11 +03:00
Arthur van der Staaij
df39dfd2a8
Fixed the visual gaps in territory borders ()
* Implemented left/right-concave border segments

* Fixed ConvexConcave border image

It was flipped horizontally.

* Implemented border left/right-concave detection

* Moved border images into their own directory

They're not really icons, after all.

* Cleaned up code a bit and added some more comments

* Applied requested change and consistified some function names

* Removed the old border images

I was sure I already did this, but apparently not.
2021-10-11 09:23:28 +03:00
yairm210
5468821edf 3.17.7 2021-10-10 22:41:46 +03:00
SomeTroglodyte
088e35ff13
Ethiopia - Nation ()
* Ethiopia - Nation

* Ethiopia - Unit and Stele

* Ethiopia - Graphics

* Ethiopia - color
2021-10-04 20:56:34 +03:00
SomeTroglodyte
71405b93aa
The Celtic People Reboot ()
* The Celtic People Reboot

* Redid the Shamrock sword of the Pictish Warrior

* The Celtic People Reboot - one comment

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-10-03 12:02:58 +03:00