mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-03-10 04:43:29 +07:00
Code Issues Packages Projects Releases Wiki Activity
7,869 Commits 6 Branches 1,057 Tags 1.1 GiB
44b77de4f5
Commit Graph

5145 Commits

Author SHA1 Message Date
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
Yair Morgenstern
aa49e47ca0 fix: Fix build 2022-12-11 19:15:43 +02:00
Yair Morgenstern
66c0f269d2 Simplified temporary uniques 2022-12-11 13:57:06 +02:00
nacro711072
aaaa84a00f
update score icon. (#8118) 2022-12-11 13:08:34 +02:00
Md. Touhidur Rahman
1da08994df
fix UncivServer.xyz not working (#8104) 
Normally this is auto-fixed but a `/` at the end of the URL does not work. Because in API you do requests like `GET /file/:filename` and if you also put a `/` at the end of the server URL, it becomes something like this `https://example.com//files/filename`. Since the auto-fix happens only when typing a new URL from `Options` > `Multiplayer`, the default value doesn't get auto-fixed and shows errors.
I tested on a new installation and as expected it shows the `Couldn't upload game` error.
This pr fixes this.
 2022-12-10 18:38:53 +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
Yair Morgenstern
d9d0414477 Resolved #7712 - 'loading' popup between turns only appears if there's a significant delay 2022-12-09 12:46:11 +02:00
Yair Morgenstern
dbeb063e2f Auto-Screenshot for f-droid as well 2022-12-08 13:27:29 +02:00
Yair Morgenstern
309aaf99d4 xyz server as default multiplayer server 2022-12-08 13:27:29 +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
ff25014a54 Automated screenshots! :D 2022-12-07 21:01:39 +02:00
Yair Morgenstern
8ec2ada740 Fixes for Repair 2022-12-05 22:42:39 +02:00
Yair Morgenstern
b351d4a4e2 Fixed all CSs getting unique units and unique luxuries 2022-12-05 20:26:47 +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
11e26c74ad Resolved #8088 - Single turn repair, repair turn inconsistencies 2022-12-05 19:03:17 +02:00
Yair Morgenstern
454f999948 Resolved #8090 - Replaces misunderstood 'virtual resolutions' with more intuitive 'screen size' 2022-12-05 18:56:47 +02:00
nacro711072
220c465a18
fix civilopedia category bug. (#8084) 
* fix civilopedia category bug.

* fix negative index.
 2022-12-04 18:04:16 +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
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
Yair Morgenstern
cdc8afb56d Made yields smaller so heavy yields looks better on tiles 2022-11-28 22:24:56 +02:00
Yair Morgenstern
1eb1976c4e Made yields smaller so heavy yields looks better on tiles 2022-11-28 21:45:56 +02:00
Yair Morgenstern
cfda54917f Modding: buildingName -> buildingFilter in all possible unique types 2022-11-28 19:19:40 +02:00
Yair Morgenstern
d223614067 Modding: improvement uniques can be assigned to tilefilter 2022-11-28 19:10:57 +02:00
Yair Morgenstern
d21e0d91b7 4.3.4-patch1 2022-11-28 19:00:15 +02:00