mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-25 22:18:50 +07:00
Code Issues Packages Projects Releases Wiki Activity
4,556 Commits 6 Branches 1,054 Tags 1.1 GiB
e7cd363b70
Commit Graph

4556 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yair Morgenstern
e7cd363b70 3.12.0 2020-12-13 10:00:22 +02:00
Yair Morgenstern
7ec176ac45 Minor fixes for the tile yields 2020-12-13 09:52:15 +02:00
jnecus
0e5b2f0db0
Display tile yields (#3322) 
* Show tile yields functionality (WIP)

* Toggle yields (WIP)

* Show Yields (WIP)

* Show tile yields WIP

* showTileYields (WIP)

* tidying code

* Display tile yields (WIP)

* Show tile yields (WIP)

* Update CityTileGroup.kt
 2020-12-13 09:31:37 +02:00
paontv
e6882e8223
Update Japanese.properties (#3407) 2020-12-13 09:29:08 +02:00
Yair Morgenstern
963fee3552 Added much-needed "+[]% Production when constructing [] units" unique 2020-12-13 09:27:31 +02:00
Yair Morgenstern
11fb6b4b67 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-12-13 09:20:40 +02:00
Yair Morgenstern
7731211b09 All relevant unit filtering moved to baseUnit, so we can filter on constructions as well 2020-12-13 09:19:45 +02:00
9kgsofrice
86b4548d11
kept the old one for now (#3414) 2020-12-12 20:11:15 +02:00
9kgsofrice
ee5aa38129
GG bonus generation now checks for civinfo uniques (#3412) 
* great general bonus isn't applied to national uniques

check added to allow this

* added uniques together :)

* added vals in line with similar checks - more efficient(?)
 2020-12-12 20:10:39 +02:00
9kgsofrice
fe38249dc1
City-state resources from all sources shared with ally civ (#3411) 
* merged functions for getCityResources and getResourcesFromAlly

* "city-states" origin moved to civinfotransientupdater
 2020-12-12 20:09:39 +02:00
Yair Morgenstern
bbcf5ffed7 Added "All" filter for units 2020-12-11 14:28:29 +02:00
Yair Morgenstern
4c48522de2 Removed unused "effects" from the policy file 2020-12-11 14:26:40 +02:00
Yair Morgenstern
d0774db030 Resolved #3408 - Unit maintenance cost reduction generalized, now works for Ottomans 2020-12-11 14:24:09 +02:00
Yair Morgenstern
3ab57f1ada Resolved #3409 - American unique grants extra sight only to military land units 2020-12-11 14:11:35 +02:00
Yair Morgenstern
1f59a4ea48 Fixed crash when nuking Barbarian units 2020-12-11 14:09:19 +02:00
Yair Morgenstern
95423c125d 3.11.19 2020-12-10 11:28:28 +02:00
Giuseppe D'Addio
2708cc3309
Update Italian.properties (#3397) 2020-12-10 11:24:12 +02:00
Yair Morgenstern
ab548dda54 Fixed ANR caused by too many saved games 2020-12-10 10:42:02 +02:00
Yair Morgenstern
4578994adf Reassign population after selling a specialist-providing building 2020-12-10 10:10:14 +02:00
9kgsofrice
d3ba68f7d3
resources can be added by tile improvement with unique "Provides [] []" (#3406) 
* resources can be added by tile improvement with unique "Provides [] []"

* to minimise indentation

* to minimise indentation

* changed null check

* flip if
 2020-12-09 23:02:46 +02:00
Yair Morgenstern
fb743ade31 Added nation icons to the leader names in the diplomacy screen 2020-12-09 23:01:43 +02:00
Yair Morgenstern
c1a717e4f8 Resolved #3289 - can place unbuildable improvements that can exist on tiles 2020-12-09 22:46:15 +02:00
Yair Morgenstern
f57955c8d5 Added a test to make sure that the base ruleset doesn't have any obvious bugs, so I don't shoot myself in the foot again 2020-12-08 21:34:00 +02:00
Yair Morgenstern
570656929d Merge branch 'test' 
# Conflicts:
#	android/assets/jsons/Civ V - Vanilla/Units.json
 2020-12-08 21:04:08 +02:00
Yair Morgenstern
ceef8bd7ad Fixed self-made bug of missing helicopters... 2020-12-08 21:02:40 +02:00
9kgsofrice
e80dc879bb
wonder text will not be displayed & "[] enabled:" will not show if nothing visible in list (#3399) 2020-12-07 22:26:34 +02:00
Yair Morgenstern
3e6955d0d9 Selected unit stays selected when single-tap moved into a tile with another unit 2020-12-07 20:08:58 +02:00
9kgsofrice
2c35cc98de
Specialists can add happiness (#3398) 2020-12-07 08:46:39 +02:00
9kgsofrice
cc5f4fc316
Should not be displayed without [] (#3396) 
* cleaned up again :)

* add val "filter"
 2020-12-06 22:19:49 +02:00
Yair Morgenstern
8a5247324c 3.11.18 2020-12-06 22:16:03 +02:00
Yair Morgenstern
e66fbd61fa Merge branch 'master' of https://github.com/yairm210/Unciv 2020-12-06 21:51:18 +02:00
Yair Morgenstern
b50c129e2d "+[] Movement for all [] units" now respects all unit categories 2020-12-06 21:50:46 +02:00
TG
64ad7216ca
Update Korean.properties (#3394) 
* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties
 2020-12-06 21:37:16 +02:00
paontv
139503ff55
Update Japanese.properties (#3392) 2020-12-06 21:27:34 +02:00
Yair Morgenstern
378e1ddc66 Fixed broken build, also - test for the new Travis! 2020-12-06 21:23:49 +02:00
Yair Morgenstern
48d0758abf Improvements can't be built in neutral areas, as per Civ V 2020-12-06 20:39:53 +02:00
Yair Morgenstern
22b3f563f3 Crash reports contain the game version for easy filtering 
Added helper function cityInfo.isWorked(tile)
 2020-12-05 22:54:16 +02:00
givehub99
6a73909c67
Helicopter Gunship (#3385) 
* -Helicopter Gunship Implemented
-Anti-Tank Gun upgrades to it

* unit atlas

* "All tiles cost 1 movement"
 2020-12-04 14:20:24 +02:00
Yair Morgenstern
5cf3e7764a CORRECT handling for mods that changed their buildings or units 2020-12-04 14:12:47 +02:00
Yair Morgenstern
81a38be5f4 Added button to add construction items directly to the queue 2020-12-04 11:27:28 +02:00
Duan Tao
93a26f635c
Workers stop building (most) duplicate roads connecting cities. (#3391) 2020-12-04 10:16:19 +02:00
Yair Morgenstern
4a0c69741e Merge branch 'temp' 2020-12-04 00:11:48 +02:00
Yair Morgenstern
4bb6426b79 3.11.17-patch1 2020-12-04 00:11:29 +02:00
Yair Morgenstern
a9d36c073a Mods can handle removing existing buildings 2020-12-03 23:58:48 +02:00
Yair Morgenstern
c12afb4131 "have signed the peace treaty" -> "have signed a peace treaty" 2020-12-03 23:29:36 +02:00
Yair Morgenstern
af113db8d7 Don't allow AI to offer peace to cty states allied with their enemies 2020-12-03 22:17:52 +02:00
Yair Morgenstern
91e58f45bb 3.11.17 2020-12-02 23:54:14 +02:00
Yair Morgenstern
2a3a0b107f Fixed rare errors 2020-12-02 23:17:20 +02:00
9kgsofrice
1f5fa74cea
adds val to modoptions and check to battle.kt to adjust max xp from barbarians (#3389) 2020-12-02 23:04:00 +02:00
9kgsofrice
525cea1cc9
"Uncapturable" unique (#3388) 
* WIP

* "Uncapturable" unique; civilians will be destroyed instead of captured
 2020-12-02 22:45:44 +02:00