mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-25 22:59:12 +07:00
Code Issues Packages Projects Releases Wiki Activity
7,925 Commits 6 Branches 1,040 Tags 1.2 GiB
42a17aab5b
Commit Graph

3593 Commits

Author SHA1 Message Date
vegeta1k95
42a17aab5b
Corrected Civilizations colors (#8224) 
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2022-12-25 10:01:40 +02:00
Yair Morgenstern
0c58488e42 4.3.12 2022-12-24 20:02:11 +02:00
Yair Morgenstern
d612286d81
Version rollout (#8219) 
* Bump version and create initial changelog entry

* Update Spanish.properties (#8217)

* Update traditional_chinese.properties (#8213)

* Update German translation (#8205)

* Update French.properties (#8204)

* Updated Brazilian_Portuguese.properties (#8201)

* Updated Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Italian.properties (#8199)

* Update Indonesian.properties (#8196)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: nacro711072 <nacro711072@yahoo.com.tw>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: kensvin <kensvin28@gmail.com>
 2022-12-24 19:52:05 +02:00
itanasi
bc483e8984
G&K Neutral Tile Road Maintenance (#8138) 
* Redo

* New parameterized and actually used Road Unique

* Remove unneeded

* Update CURRENT_COMPATIBILITY_NUMBER since adding new serialization data

* Make neutralRoads for CivilizationInfo.kt Transient
 2022-12-24 19:43:37 +02:00
letstalkaboutdune
8d0acd0647
Added keyboard shortcut to toggle World Screen UI elements (#8211) 
* AbsoluteUnits - Mongolian Uniques

* Added keyboard shortcut to toggle World Screen UI elements

Ctrl+U to toggle

* Update WorldScreen.kt

* Added a pesky space

* Remove "Experimental" warning text

* Revert "Remove "Experimental" warning text"

This reverts commit 3c8456db95.
 2022-12-24 19:41:35 +02:00
alexban011
994169944a
showed unknown civs as Unknown civilization in GP and Diplomacy screens (#8184) 
* added mod topics to wiki

* fixed stats from revealing unknown civs and cityStates

* Revert "added mod topics to wiki"

This reverts commit 5528950a96.

* used knows() instead of getKnownCivs().contains()

* showed politics when you don't know the civ in GlobalPoliticsOverviewTable

* Replaced unknown civs name with `Unknown civilization` in DiplomacyScreen

* forgot to remove a couple lines

* translated the strings for the protectors

* reviews

* made function and tested translations
 2022-12-24 19:40:36 +02:00
vegeta1k95
78c4f6de68
Big rework of Policy Picker UI, added new ninepatch RoundedEdgeRectangleSmall (#8218) 
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2022-12-24 19:17:00 +02:00
letstalkaboutdune
1fdbea0a45
Trim Nuke SFX (#8216) 2022-12-24 18:55:21 +02:00
vegeta1k95
0aa7c0e79b
Added gradle task of Atlas texture packing for Android build (#8208) 
* Added gradle task of Atlas texture packing for Android build

* ImagePackers check also for creation date

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2022-12-23 14:49:08 +02:00
Philip Keiter
9f6aa4b90f
Add new game option: No City Razing. (#8203) 2022-12-22 07:41:08 +02:00
Yair Morgenstern
01309be510 4.3.11 2022-12-21 12:02:05 +02:00
Yair Morgenstern
3a91a99143
Version rollout (#8195) 
* Bump version and create initial changelog entry

* Update Japanese.properties (#8194)

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Spanish.properties (#8190)

* Update Catalan.properties (#8183)

* Update German translation (#8181)

* Provide Ukrainian translations for the lately introduced original strings (#8177)

Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>

* Update Korean.properties (#8176)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Updated Brazilian_Portuguese.properties (#8175)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: K0baU <63403741+K0baU@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: Kostiantyn Kolesnichenko <test9@mormat.name>
Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
 2022-12-21 11:51:45 +02:00
vegeta1k95
2bc91f1216
Rework of City Screen: new Great People list + misc changes (#8180) 
* 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 (#8188) 
* 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
Yattong the Mackerel
68fc0487c1
Update template.properties (#8189) 2022-12-20 11:39:18 +02:00
Philip Keiter
f974c3a8a5
Continent and Islands (#8187) 
* Update comments that got outdated.

* Add map type: Continent and Islands
 2022-12-20 08:35:13 +02:00
letstalkaboutdune
6192de325e
AbsoluteUnits - Mongolian Uniques (#8186) 2022-12-20 08:26:16 +02:00
Yair Morgenstern
107edeab1f Fallback image for modded buildings - see #8158 2022-12-18 22:12:05 +02:00
Yair Morgenstern
6b4da20d85 Fallback image for modded buildings - see #8158 2022-12-18 22:11:56 +02:00
Yair Morgenstern
81f3ecd998 Fallback image for modded techs - see #8158 2022-12-18 22:05:17 +02:00
Ouaz
f331ac69e4
Fix new "temperature" map setting not translatable (#8173) 2022-12-18 21:23:05 +02:00
Yair Morgenstern
cf8e6b39e2 4.3.10 2022-12-18 19:42:45 +02:00
Yair Morgenstern
0a3f1c6384
Version rollout (#8172) 
* Bump version and create initial changelog entry

* Update Traditional_Chinese.properties (#8171)

* Update French.properties (#8160)

* Update Korean.properties (#8157)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Simplified_Chinese.properties (#8156)

* Update Italian.properties (#8155)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: nacro711072 <nacro711072@yahoo.com.tw>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2022-12-18 19:36:04 +02:00
Yair Morgenstern
b44ac9eaa4 Better unit action icons 2022-12-17 20:06:43 +02:00
Yair Morgenstern
c95befaf1b 4.3.9 2022-12-16 11:20:50 +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
e4a7f7e131
Version rollout (#8154) 
* Bump version and create initial changelog entry

* Update Filipino.properties (#8153)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Italian.properties (#8146)

* Update Korean.properties (#8145)

* Update German translation (#8142)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: MartinP <mape6@posteo.de>
 2022-12-16 11:15:19 +02:00
Philip Keiter
02f9176f78
Flat Earth Hexagonal (#8140) 
* Add new map shape: Flat Earth Hexagonal.

* Make flat earth logic easier to read.

* Make flat earth set temperature based on tile distance from center.

* Make flat earth waste less space on the ice ring.

* Add variety to the flat earth ice ring.

* Use baseTerrain for snow on flat earth edge instead of addTerrainFeature.

* Ensure flat earth center tiles and edge tiles are ocean not coast.

* Give flat earth ice ring some random juts and dips.

* Make 3rd continent smaller when flat earth.

* Enable more continent positions for three continents when flat earth.

* Add parens around or statement.

* Refactor flat earth temperature code into functions.

* Invert some flat earth if statements to reduce nesting.

* Allow coast near flat earth ice walls.

* Make flat earth ice wall generation more efficient.

* Stop adding ice to flat earth mountains.

* Move flat earth ice wall generation to its own function.

* Improve flat earth water placement comments.

* Move flat earth extra water generation to its own function.

* Move flat earth center ice spawn to its own function.

* Move flat earth edge ice spawn to its own function.

* Minor efficiency tweak.

* Add Flat Earth Hexagonal to template.
 2022-12-16 11:08:04 +02:00
Yattong the Mackerel
20062c1c3a
Update Nations.json (#8151) 2022-12-16 10:05:32 +02:00
vegeta1k95
bf81bb25e1
Change styles and behaviour of Unit flags as in Civ 5 (#8128) 
* Change styles and behaviour of Unit flags as in Civ 5

* Make shadow mask an optional (removed from default atlas)

* Make shadow mask an optional (removed from default atlas)

* Remove magical numbers, scaling dependent on a ratio of the source

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2022-12-15 21:51:46 +02:00
vegeta1k95
dc3809de84
"Auto Unit Cycle" and "Automated units move on turn start" options implemented (Civ 5) (#8144) 
* "Auto Unit Cycle" and "Automated units move on turn start" options implemented (Civ 5)

* Removed threading, added translation template for strings

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2022-12-15 21:51:17 +02:00
alexban011
d7c11cc990
added icon for Conduct Trade Mission button (#8125) 
* added icon

* rescaled image to 100px
 2022-12-15 21:02:45 +02:00
vegeta1k95
e1afa1e10e
NextTurnActions (pick tech/policy/etc) now can have icons (#8119) 
* NextTurnActions (pick tech/policy/etc) now can have icons

* Remove default NextTurn notification icons

* Added default notification icons. "Next unit" action priority is lowered (as in Civ 5)

* Added missing files

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2022-12-15 08:41:43 +02:00
Ouaz
65c5ce52ec
New map options translatable (#8135) 2022-12-15 07:20:52 +02:00
Yair Morgenstern
b67fc7d030 4.3.8 2022-12-15 00:26:51 +02:00
Yair Morgenstern
662141d661 Resolved #7479 - Removed copyrighted intro texts 2022-12-15 00:23:57 +02:00
Yair Morgenstern
0d9c6c105f
Version rollout (#8132) 
* Bump version and create initial changelog entry

* Update Bulgarian.properties (#8130)

* Update Spanish.properties (#8121)

* Update Korean.properties (#8113)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Updated Brazilian_Portuguese.properties (#8106)

* Update French.properties (#8105)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: excessmind <52409643+excessmind@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
 2022-12-15 00:13:50 +02:00
Yair Morgenstern
d3f8f680d1 4.3.7 2022-12-09 12:56:34 +02:00
Yair Morgenstern
32d46b24df
Version rollout (#8103) 
* Bump version and create initial changelog entry

* Update Italian.properties (#8100)

* Update German translations (#8097)

* Update French.properties (#8096)

* Update Spanish.properties (#8095)

* Updated Brazilian_Portuguese.properties (#8094)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
 2022-12-09 12:52:38 +02:00
vegeta1k95
58c57d6626
UnitActions seprated into own atlas (#8102) 
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2022-12-09 12:46:46 +02:00
alexban011
ccb1d769f1
added button to paste from clipboard when downloading a mod (#8101) 2022-12-07 21:14:54 +02:00
Yair Morgenstern
faf1b66a88 4.3.6 2022-12-05 19:24:25 +02:00
Yair Morgenstern
0063b92e07
Version rollout (#8093) 
* Bump version and create initial changelog entry

* update traditional_chinese.properties (#8092)

* Update German translation (#8089)

* Update Filipino.properties (#8082)

* Update Simplified_Chinese.properties (#8079)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Brazilian_Portuguese.properties (#8078)

* Update Italian.properties (#8076)

* Update French.properties (#8075)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: nacro711072 <nacro711072@yahoo.com.tw>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
 2022-12-05 19:20:36 +02:00
Yair Morgenstern
454f999948 Resolved #8090 - Replaces misunderstood 'virtual resolutions' with more intuitive 'screen size' 2022-12-05 18:56:47 +02:00
itanasi
bb1e8dc10d
Volley only for Siege in G&K (#8086) 2022-12-05 18:23:00 +02:00
Yair Morgenstern
1d5d445c19 After-combat notification for promotable units - see #4697 2022-12-03 23:12:01 +02:00
Yair Morgenstern
c9ed9d5d74 modding: Double Happiness from Natural Wonders -> [stats] from every known Natural Wonder 2022-12-02 11:50:11 +02:00
Yair Morgenstern
94605911a2 4.3.5 2022-11-30 18:06:28 +02:00
Yair Morgenstern
dceaf832b9
Version rollout (#8074) 
* Bump version and create initial changelog entry

* Updated Brazilian_Portuguese.properties (#8072)

* Update Filipino.properties (#8071)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Dutch.properties (#8067)

* Update Dutch.properties

* Update Dutch.properties

* Update Simplified_Chinese.properties (#8066)

* Update Spanish.properties (#8062)

* Update French.properties (#8060)

* Fix tests

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: MartijnCBV <49876349+MartijnCBV@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
 2022-11-30 18:03:20 +02:00