mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-24 10:01:39 +07:00
Code Issues Packages Projects Releases Wiki Activity
7,900 Commits 6 Branches 1,040 Tags 1.2 GiB
3a91a99143
Commit Graph

5170 Commits

Author SHA1 Message Date
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
Philip Keiter
827cb28d05
Raze Special Cities (#8115) 
* Support new ModOptions uniques: Allow raze capital, Allow raze holy city.

* Break up long set of boolean checks into if statements.
 2022-12-21 11:49:44 +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
Philip Keiter
47c21216b2
Update wrap water generation of two continents to support tall maps. (#8192) 2022-12-21 11:27:01 +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
Philip Keiter
0b10bf1d14
Update wrap water generation to only consider longitude as there is no latitude wrap. (#8193) 2022-12-21 11:13:59 +02:00
Yair Morgenstern
896fc575c0 Modding: Unbuildable units can still be upgraded to 2022-12-20 10:17:12 +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
nacro711072
e159b400b1
Update trade UI. (#8185) 
* delete unnecessary icon space.

* replace table fixed size with preferred size.
 2022-12-19 16:11:11 +02:00
Philip Keiter
1f284fee57
Prevent ice on mountains, and atolls under ice, resources on snow, in flat earth ice walls. (#8178) 2022-12-19 08:31:47 +02:00
Philip Keiter
757f06e3ca
Make map editor respond to max zoom setting. (#8179) 2022-12-19 08:31:20 +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
Yair Morgenstern
8481680622 Thinner stats table so we can see more of the tiles 2022-12-18 21:36:51 +02:00
Yair Morgenstern
6104a25d91 Readded stats drilldown 2022-12-18 21:34:55 +02:00
Yair Morgenstern
9c50052bc3 Default black color for thin circle 2022-12-18 19:39:12 +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
vegeta1k95
903d3ab278
Rework of City Screen: new current buildings list + misc changes (#8167) 
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2022-12-18 19:28:48 +02:00
alexban011
9aa3cb13c5
fixed global politics screen from revealing unknown civs and CityStates (#8165) 
* 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()
 2022-12-18 07:26:13 +02:00
vegeta1k95
0380773560
Construction table: ordering change (Civ 5) + add/remove on double-click (#8163) 
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2022-12-17 21:04:04 +02:00
Yair Morgenstern
b44ac9eaa4 Better unit action icons 2022-12-17 20:06:43 +02:00
Yair Morgenstern
5f664213f0 Solved temporary unique parsing error 2022-12-17 19:54:25 +02:00
alexban011
e7158646b0
fixed issue (#8148) 2022-12-17 18:34:19 +02:00
Yair Morgenstern
cb9c753d5b 4.3.9-patch1 2022-12-17 18:03:38 +02:00
vegeta1k95
8e1e8bc27b
Fix bug, where units do not reveal tiles (#8161) (#8162) 
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2022-12-17 17:53:09 +02:00
Yair Morgenstern
44b77de4f5 Handle mods with nations but no major civs 2022-12-16 16:02:06 +02:00
Yair Morgenstern
14882cfecf Fixed global resource unique 2022-12-16 14:38:53 +02:00
Yair Morgenstern
5aba4cb6a0 bugfix: players can no longer get citystate nations when selecting mod 2022-12-16 14:32:05 +02:00
Yair Morgenstern
a8df3ea242 Thin lines around construction images 2022-12-16 11:44:55 +02:00
Yair Morgenstern
f688254080 UI improvements - added thin lines around circle icons, cleaner politics table 2022-12-16 11:39:23 +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
vegeta1k95
7b83ce9838
Fix bug, where Unit flags backgrounds appear on CityScreen tiles (#8150) 
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2022-12-16 10:03:47 +02:00
vegeta1k95
1d66081df7
Fix minor bug, preventing flag shadows (if added) to appear (#8147) 
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2022-12-16 00:35:21 +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
Yair Morgenstern
557735cb0e Modding: Can provide resources as a global unique 2022-12-15 09:30:20 +02:00
itanasi
1fb43a805f
safer logic (#8139) 2022-12-15 08:53:18 +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
itanasi
8b4aafe941
Actually fix AI from pillaging neutral roads (#8137) 2022-12-15 07:20:32 +02:00
itanasi
f244c36b57
Update all improvement and road writes to use TileInfo setters (#8136) 2022-12-15 07:18:47 +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
nacro711072
7af63dd8b1
Avoid destroying all onboard units after player upgrade Air Carrier unit. (#8129) 2022-12-14 17:30:10 +02:00
itanasi
ed83cc9954
AI Pillages Neutral Roads only at War (#8087) 
* Only pillage neutral roads when at war.
Track road ownership based on who built the road or who last owned the tile

* Remove excessively safe checks

* Fix potential null exception

* Rework, use string

* yairm suggestions

* readability
 2022-12-14 07:45:46 +02:00
Philip Keiter
6341987f79
Three Continents (#8109) 
* Update Building-Locally.md

Add missing step to restart.

* Add new generated maps: Three Continents and Three Continents Fair

* Only use fair version of Three Continents. Make 3rd continent a little larger to be closer in size to the other two.
 2022-12-14 07:19:32 +02:00
Philip Keiter
2145bc80b6
Two Continents Allow both Lat or Long (#8110) 
* Rename generated map "Continents" to "Two Continents" and make it randomly choose latitude or longitude land division.

* Choose latitude or longitude land division based on map width and height if they are not equal.
 2022-12-13 22:52:51 +02:00
vegeta1k95
a134242487
Units/Buildings can now be given optional Portraits to be displayed instead of flags. (#8107) 
* Units can now be given optional Portraits to be displayed everywhere (except world map) instead of unit Flags.

* Add section to wiki for adding Unit Portraits

* Generify portrait functions

* Small nitpicks fixed

* Reverted one change

* Fix docs

* Fix docs

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2022-12-11 22:58:11 +02:00
Yair Morgenstern
154c083d3f Update unit uniques when entering moving to new tiles 2022-12-11 22:48:11 +02:00