Commit Graph

2019 Commits

Author SHA1 Message Date
b6e2b72b5c The size of minimap will change with resolution changing. (#1922) 2020-02-13 09:20:04 +02:00
3bfb2a29b7 Merge pull request #1903 from JackRainy/ForgeAndSpacePart
Forge increases production of the space parts (#1902)
2020-02-12 23:17:39 +02:00
4ab084feeb Forge increases production of spaceparts 2020-02-12 23:11:28 +02:00
5b845abc04 This reverts previous commit cb0a87681e. 2020-02-12 21:25:21 +02:00
aec539f77f Fix tile yields in city screen 2020-02-12 19:39:32 +01:00
3402065e3c Captured Khans now automate properly 2020-02-12 20:34:32 +02:00
d9d6f4eeb8 Minimap can show the whole worldscreen (#1872)
Saw the images you sent by email =)
2020-02-12 20:22:19 +02:00
ac1e5bb417 Minimap can show the whole worldscreen 2020-02-13 00:33:11 +08:00
b9e3ca5fd4 Legalism grants enqueued buildings (#1906) 2020-02-11 10:36:58 +02:00
cb0a87681e Forge increases production of the space parts 2020-02-10 22:06:41 +02:00
942092e33e Resolved #1902 - buildings requiring worked resources can be built in cities that are built on that resource 2020-02-10 20:35:14 +02:00
a514e462cc Cleaned up Unit Actions 2020-02-10 18:43:18 +02:00
14f89b6799 Fix: Moai being buildable on forests, etc. (#1896)
* Moved terrain.unbuildable check above moai coastal tile check

* Refactor
2020-02-10 11:32:59 +02:00
6d2cf860a7 Reset advanced settings to default (#1894)
* Reset to default

* Translations
2020-02-10 10:25:48 +02:00
86cd158d83 3.5.12 2020-02-09 20:44:52 +02:00
26affe7943 Translation (#1878)
* Update Nations_Italian.json (#1864)

* Update Japanese.properties (#1867)

* 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 Japanese.properties

* Update Thai.properties (#1871)

I'm back!!

* Update German.properties (#1873)

Revised promotions

* Update German.properties (#1874)

added missing unit translations

* Update Italian.properties (#1875)

Typo fix

* Update Nations_Russian.json (#1877)

* rfe

* Update Nations_Russian.json

* Update Nations_Russian.json

* Update Russian.properties (#1876)

* Translation roundup + added Mongolian civ translations

* Update Russian.properties (#1879)

Mongolia update

* Additional translation strings related to the custom map settings (#1881)

* Diplomacy screen: Secondary relationships line is added (#1880)

* Additional translation strings

* Update Japanese.properties (#1883)

* Update Japanese.properties

* Update Japanese.properties

* Update to Ukrainian translations + fix of the translation call (#1888)

* Final touches before version

Co-authored-by: Smashfanful <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: NoNZeeZ <58921355+NoNZeeZ@users.noreply.github.com>
Co-authored-by: ozolotl <ozolotl@users.noreply.github.com>
Co-authored-by: IraqLobster34 <56483230+IraqLobster34@users.noreply.github.com>
Co-authored-by: JackRainy <JackRainy@users.noreply.github.com>
2020-02-09 20:29:34 +02:00
66ac364045 Center the research screen (#1887)
* Correct list of the researchable techs

* Center on the researchable technology
2020-02-09 20:16:34 +02:00
3f27bdb19e Diplomacy screen: Secondary relationships line is added (#1880) 2020-02-08 21:58:03 +02:00
e2c435d36f Fixed bug where air units in transports couldn't upgrade 2020-02-08 21:13:03 +02:00
096e1c2beb Tied the unit upkeep scaling to game speed (#1870)
* Tied the unit upkeep scaling to game speed

* Refactor: Modifier and TurnLimit are now fields

* Turn limit will be derived from the GameSpeed.modifier and base game duration
2020-02-08 20:51:45 +02:00
edf0294dfd Mongolia (#1855)
* Mongolia

* Translation & Atlas

* Remove debug option

* Remove erroneous import

* Promotions.addXP

* Khan heals 15 HP

* XP bonus fix

* Added 'Mongol Terror' which is the term used for the mongolian combat bonus

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-02-08 20:51:21 +02:00
33de01961d Improvements to the Diplomacy screen (#1851)
* Diplomacy overview window: Using full screen

* Different shades of friendship

* Show/hide the relations for the picked civilization

* Minor refactoring

* Optimized handling of lines visibility
2020-02-08 20:46:42 +02:00
f8f44320ae Resolved #1859 - skip defeated players' turns in multiplayer 2020-02-06 22:51:26 +02:00
3d18a2aa0a Automated workers now build unique improvements 2020-02-06 22:21:58 +02:00
20a7ff7c76 Organized 'explore' actions 2020-02-05 23:30:37 +02:00
6fc3b2fd0e Bugfix: Request rendering on New Game creation and Game Save (#1857)
* Request rendering on New Game creation and Game Save

* setWorldScreen issues a rendering request
2020-02-05 23:04:52 +02:00
193ebe0ccd Resolved #1852 - buildings requiring an improved resource now accept resources with great improvements 2020-02-05 22:21:57 +02:00
cb6ca058f3 Solved the 'infinite warmongering penalty' bug 2020-02-05 20:40:05 +02:00
c4a2a3055e Resolved #1844 - improved worker automation 2020-02-05 00:01:53 +02:00
1a2e69f4ae Resolved #1847 - Civs defeated by a nuke are now properly destroyed 2020-02-04 23:47:02 +02:00
d43afe38e6 Rectangular maps, maps generator, bugfixes (part 1) (#1843)
* TileMap Rectangular constructor

* HexMath utilities

* Perlin gradients changed & utility function to combine octaves

* NewGame & MapParameters UI

* MapParameters & MapGenerator refactor

* Advanced Map Parameters UI

* Fix Hide advanced settings
2020-02-04 23:30:35 +02:00
eb1ce0f6cb Resolved #1457 - no AI trades are 'automatically accepted', they all require an active decision of the proposed side and will only happen on their turn 2020-02-04 16:13:37 +02:00
f6b8afc952 When disbanding carriers, transported air units move to nearby tiles if they can. If thy can't then they're disbanded. 2020-02-04 09:23:36 +02:00
7ac515ad6e If you're at war with someone, then 'please don't settle cities near us' is irrelevant 2020-02-04 09:20:45 +02:00
748168398e Resolved #1839 - Civs no longer declare war and offer things in the same turn 2020-02-04 09:10:17 +02:00
df68ff75f8 Resolved #1827 - can no longer see other (current) player's city production in multiplayer 2020-02-04 09:06:41 +02:00
0ace2e1c7a forgot this little thing 2020-02-03 16:48:32 +02:00
848637c78c Better top-down trickling of information instead of relying on UncivGame.Current info 2020-02-03 16:41:42 +02:00
0f26671bcf Resolved #1835 - game no longer crashes when losing alliance with a city-state due to it being captured 2020-02-03 16:24:10 +02:00
24c3bdc564 Fixed crashes caused by 'healing on friendly tile' checks to unmet civs for barbarians 2020-02-03 16:13:32 +02:00
ef19775545 More translation related stuff that I forgot =/ 2020-02-02 18:00:08 +02:00
6df11f0a7f Fix: Capturing the cities must not improve relations (#1828) 2020-02-02 16:07:15 +02:00
db5cc82ec7 "Sleep until healed" functionality (#1821)
* "Sleep until healed" functionality

* Unit test for actions translations is added

* "Fortify until healed" functionality

* Refactoring
2020-02-02 09:55:10 +02:00
0914750489 Show name when icon is tapped in resource overview in a label above the icon. (#1817) 2020-02-01 20:31:12 +02:00
261c3d6ced Resolved #1820 - Fixed a crashing bug with the AI trying to ally with defeated city states, as well as many other minor bugs
All caused by the fact that getKnownCivs didn't filter out defeated civs
Also some minor code cleanup
2020-02-01 20:26:27 +02:00
d7310aa90a typo fix withing -> within 2020-01-31 14:17:38 +02:00
58fa5d6dd5 Debug option: simulate game until certain turn (#1812) 2020-01-31 14:10:32 +02:00
7577655264 Nuclear missile is able to target any tile within the range (#1801)
* Minor refactoring

* Refactoring: special function Battle.nuke() for missiles

* Special BattleTable.simulateNuke() function for missiles

* Refactoring: BugReport popup moved into a separate function

* Refactoring: call defaults().pad once in the init()

* Refactoring: not using "syntax sugar"
2020-01-31 14:09:55 +02:00
0888e0a24d Rewritten the MapUnit.rankTileForHealing() (#1811) 2020-01-31 14:04:44 +02:00
3362c2128c Fix: notification when city-states advance to a new era (#1813)
* Fix: notification when city-states advance to a new era

* Replaced forEach with for, according with code standards
2020-01-31 14:03:21 +02:00