wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3897 commits 7 branches 304 tags 288 MiB
Commit graph

2378 commits

Author SHA1 Message Date
Yair Morgenstern
90051ebe5c Rivers no longer disappear on 'next turn' 2020-05-21 22:18:28 +03:00
Yair Morgenstern
9b9e172897 Gold deficit only affects science when the civ has negative gold 2020-05-21 22:16:12 +03:00
Jack Rainy
98a4c8bf00
Don't reveal submarine position by city markers (#2643) 2020-05-21 12:20:44 +03:00
Yair Morgenstern
4b405ecc61 Resolved #2642 - added difficulty settings to Civilopedia 
No translations yet
 2020-05-20 22:20:26 +03:00
Yair Morgenstern
d81507ef2d Resolved #2549 - fixed New Game Screen options alignment and placing 2020-05-20 20:52:13 +03:00
Yair Morgenstern
9b93e4fb51 Unified capitalization in New Game screen - #2549 2020-05-20 20:46:59 +03:00
Yair Morgenstern
0262ee816b Resources no longer spawn under unbuildable, unremovable terrain features 2020-05-19 21:44:10 +03:00
AcridBrimistic
39e5d0df0f
relationshipLevel() clean-up (#2627) 
* Diplomacy Clean-up

* Better formatting

* Quickfix

* Fix

counterpoint
 2020-05-19 21:28:32 +03:00
Yair Morgenstern
eb6a11cccb Resolved #2638 - Auto-assign of population no longer "double books" tiles 2020-05-19 19:21:26 +03:00
lishaoxia1985
0678e77487
delete skin file about "*.fnt" and use nativefont instead. (#2109) 2020-05-19 19:06:03 +03:00
Daniel Bälz
47d7e8ef09
Gradle Kotlin DSL (#2634) 
* Ease migration to Gradle Kotlin DSL by changing quotes, function calls and plugin definitions

* Migrate build scripts to Gradle Kotlin DSL
 2020-05-19 00:14:01 +03:00
Yair Morgenstern
45f85d9c38 Fixed Manhattan Project being inversely affected by nuclear weapons disabling 2020-05-18 23:42:40 +03:00
Väinö Mäkelä
4b6bab523f
Rewrite the font system to render the characters incrementally (#2635) 2020-05-18 23:09:38 +03:00
Yair Morgenstern
7330daff48 All UI changes in threads are now run in a postRunnable - should hopefully get rid of IndexOutOfBoundsExceptions 2020-05-18 23:08:19 +03:00
Yair Morgenstern
3032ba9c73 River adjacency functions and gold bonus for tiles adjacent to rivers 2020-05-17 21:29:12 +03:00
Alexander Korolyov
8a43d5c5d6
Change default value for new simulateUntilWinOrLose parameter. (#2632) 
By default it should be 0 - simulation turned off.
 2020-05-17 18:48:58 +03:00
Alexander Korolyov
55fdb3a9e7
Exits simulation mode when player wins or losses. (#2624) 
* Exits simulation mode (simulateUntilTurnForDebug) when player wins or losses.

* Update core/src/com/unciv/logic/GameInfo.kt

Co-authored-by: AcridBrimistic <acridbrimistic@protonmail.com>

* Update core/src/com/unciv/UncivGame.kt

Co-authored-by: AcridBrimistic <acridbrimistic@protonmail.com>

* Update core/src/com/unciv/logic/GameInfo.kt

Co-authored-by: AcridBrimistic <acridbrimistic@protonmail.com>

* New parameter for simulation until any of player wins or loses or maximum turns reached.
Added battle logging flag.

Co-authored-by: AcridBrimistic <acridbrimistic@protonmail.com>
 2020-05-17 12:33:49 +03:00
Yair Morgenstern
2444b2e1d2 New river edges and flattened tiles by The Bucketeer! 
Opened River changes in Tile Editor - only visual for now, but should help people see how their tiles would look with rivers surrounding them
 2020-05-16 23:54:16 +03:00
Yair Morgenstern
7668a21ae8 Tiny fix to Years To Turn 2020-05-16 22:15:54 +03:00
AcridBrimistic
67f7e67f55
Years per turn improvement (#2607) 
* Year issue fix

* Clean up and try

* real good update

* udf
 2020-05-16 22:01:10 +03:00
Jack Rainy
8877c18f31
Civilian should not move when bought (#2621) 
* Civilian cannot move when bought same as military unit

* Minor code restyling
 2020-05-16 21:57:36 +03:00
Jack Rainy
4026c9b91d
Fix of the translation template for the start new game menu (#2623) 
* Adding missing translations + corrections to existing

* Translation of the "Avoid" starting biases
 2020-05-16 21:56:55 +03:00
Yair Morgenstern
14b99aa010 City-states no longer accumulate points towards Great Generals 2020-05-16 21:40:43 +03:00
Yair Morgenstern
8639fc6e1c Can no longer see other human players' assigned tiles in Multiplayer 2020-05-15 14:07:58 +03:00
Yair Morgenstern
cc8f4c3ceb Separated the city overview from the overview screen - it was getting too crowdded 2020-05-15 12:28:17 +03:00
Yair Morgenstern
2f3d3d96b7 Resolved #2618 - better inter-city navigatin int eh city screen 2020-05-15 10:39:51 +03:00
Yair Morgenstern
54dd7e5d62 Resolved #2611 - City button shrinks on zoom in, showing the 'hidden' unit icons behind it 2020-05-15 00:36:06 +03:00
Yair Morgenstern
de337a0ca2 Fixed crash in rare situation where a citadel takes over land of an unknown civ 2020-05-14 08:22:30 +03:00
Yair Morgenstern
b566aacef4 3.8.8 2020-05-12 21:47:33 +03:00
Yair Morgenstern
b393498c1a Organized checkboxes in game parameters table 2020-05-12 21:46:31 +03:00
Yair Morgenstern
c84550fc2c More NewGameScreen reorg 2020-05-12 21:38:54 +03:00
Yair Morgenstern
0190854b88 Redid layout for the New Game screen - see #2549 2020-05-12 20:38:44 +03:00
Yair Morgenstern
105a7d63b0 Separated MapOptions to its own class - this can help us with map generation in the map editor, AND help us make UI changes for the New Game screen faster 2020-05-12 19:20:48 +03:00
Yair Morgenstern
1ace4bcf3a Normalized "Buy" and "Fortify" sounds, so they're not overly loud 2020-05-11 23:11:18 +03:00
Yair Morgenstern
1adb19787a Removed the crutches for unit attack bugs - we want to figure them out! 2020-05-11 20:33:53 +03:00
Yair Morgenstern
3a2b8453d5 Solved ANR when loading game to display its metadata 2020-05-11 20:20:24 +03:00
Yair Morgenstern
c756014fec Added helper class GameSetupInfo - this will help us when setting up multiplayer games for transferring data from/to the server 2020-05-10 22:28:35 +03:00
Yair Morgenstern
b64391d767 Population assigned to tiles of other cities do not auto-unassign 2020-05-10 20:32:34 +03:00
Yair Morgenstern
f605a0c00f Settler automation takes into account which tiles already belong to other civs 2020-05-10 10:55:38 +03:00
Yair Morgenstern
b012fd0df8 Fixed "isWorked" not registering for tiles worked not by the owning city 2020-05-09 22:01:15 +03:00
Yair Morgenstern
efb823c67d Optimized imports 2020-05-08 11:43:44 +03:00
uncivbot[bot]
a9f9685dc2
Translations update (#2600) 
* Update Romanian.properties (#2589)

* Translation/romanian (#2590)

* romanian translations

* romabian translation

* romanian translatiobs

* wrong diacritics

* fixed wrong diacritics

* Romanian translations

* romanian translations

* Romanian translations

* Romanian translations

* Finalized Nations translations for Romanian

* romanian translations

Co-authored-by: Beniamin Szabo <beniamin.szabo@reea.net>

* Update Brazilian_Portuguese.properties (#2591)

* Update Brazilian_Portuguese.properties

> Some fixes

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* German translations 2020-05-06 (#2593)

* German translations 2020-05-06

* Fix two missing tr() calls for User-ID-from-clipboard responses

* add translation to China , USA and Japan city (#2594)

* Update Italian.properties (#2597)

* UPDATE SPANISH (#2599)

I hope this could be useful. Regards.

Co-authored-by: LynxRo <62301821+LynxRo@users.noreply.github.com>
Co-authored-by: Beniamin Szabo <szabo.farkas.beny@gmail.com>
Co-authored-by: Beniamin Szabo <beniamin.szabo@reea.net>
Co-authored-by: quantumilogic <64731997+quantumilogic@users.noreply.github.com>
Co-authored-by: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com>
Co-authored-by: HI_OuO <45450852+zvn2060@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Rakyat02 <63031405+Rakyat02@users.noreply.github.com>
 2020-05-08 11:39:05 +03:00
Väinö Mäkelä
bba289627c
Remove gdx-box2d from build files because it isn't used (#2595) 
* Remove box2d from build files because it isn't used

* Remove some unused includes to make the build work
 2020-05-08 08:05:26 +03:00
Yair Morgenstern
b309cac67b Fadeout for potentially workable tiles currently being worked by another city 
Mint icon looks much nicer
 2020-05-07 13:04:25 +03:00
Yair Morgenstern
0eb79fff82 Resolved #2588 - instead of tile ownershp being transferrable between cities, cities can now work tiles belonging to other cities. 2020-05-06 23:37:02 +03:00
Väinö Mäkelä
91c1e0ae6d
Fix the missing overlays caused by commit 0ffb038129 (#2586) 2020-05-05 20:15:13 +03:00
Jack Rainy
647a0c9ff7
Wait for autosave thread while closing (#2580) 2020-05-05 08:51:41 +03:00
SomeTroglodyte
a940eda4a9
Better Resource order in empire overview screen (#2577) 2020-05-04 22:10:24 +03:00
Yair Morgenstern
2b3a9c14bf Resolved #2576 - Clicking on "Encountering" notifications now move the map to the encounter location 2020-05-04 20:22:23 +03:00
Väinö Mäkelä
0ffb038129
Don't call canReach on the main thread when selecting a tile to move to (#2575) 2020-05-04 17:01:53 +03:00
Yair Morgenstern
d828fdaeca Maps no longer spawn ancient ruins in immediate vicinity of civ spawns 2020-05-03 21:45:23 +03:00
Yair Morgenstern
ad7d7fba60 Added missing Romanian characters 2020-05-03 20:39:08 +03:00
Yair Morgenstern
9397f3608c Fixed thread crashes due to concurrent actor changes in multiplayer update popups 2020-05-03 19:11:07 +03:00
uncivbot[bot]
b42c8672e1
Translations update (#2562) 
* Update Simplified_Chinese.properties (#2545)

* Update Romanian.properties (#2546)

* Update Russian.properties (#2547)

* Update Russian.properties

Tutorial error correction

* Update Russian.properties

Небольшие правки в Tutorial и Tutorial tasks.

* Update Russian.properties

Nations, City-states, minor translations

* Update Russian.properties

Cities

* German translations 2020-04-30 (#2548)

* Update French.properties (#2560)

* Translation/romanian (#2557)

* romanian translations

* romabian translation

* romanian translatiobs

* Update Portuguese.properties (#2558)

* Corrections to the translations (#2559)

Co-authored-by: Doubi_TS <48427744+tianshidoubi@users.noreply.github.com>
Co-authored-by: LynxRo <62301821+LynxRo@users.noreply.github.com>
Co-authored-by: BadaTheBada <64350251+BadaTheBada@users.noreply.github.com>
Co-authored-by: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com>
Co-authored-by: snipe2004 <snipe2004@hotmail.com>
Co-authored-by: Beniamin Szabo <szabo.farkas.beny@gmail.com>
Co-authored-by: guilherme-peev <guilherme.peev@gmail.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
 2020-05-02 21:42:53 +03:00
Yair Morgenstern
f5968e678d Players has to be an ArrayList, or else it's not guaranteed to be initializable when starting mods... 2020-05-01 00:03:07 +03:00
Yair Morgenstern
af8e217e18 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-04-30 15:58:02 +03:00
Yair Morgenstern
cc206494df 3.8.4-patch1 
Fixed regexes broken for Android by #2538
 2020-04-30 15:57:08 +03:00
SomeTroglodyte
3808c006ae
Translation code cleanup - purely decorative changes (#2544) 2020-04-30 14:08:08 +03:00
Yair Morgenstern
ba2e6d26e5 3.8.4 2020-04-29 19:39:38 +03:00
SomeTroglodyte
4ff1e96892
Make tr() a little faster (#2538) 
* Make tr() a little faster

* Make tr() a little faster - more consistent whitespace

* Make tr() a little faster - fix translation file generator

* Make tr() a little faster - adapted unit tests
 2020-04-29 19:02:48 +03:00
Yair Morgenstern
cee834b062 AI war motivation taked relationship level into account 2020-04-29 19:02:18 +03:00
SomeTroglodyte
44239e9e7a
TranslationFileWriter: patch to duplicate less stuff into mods (#2541) 2020-04-29 19:01:36 +03:00
Yair Morgenstern
6e3de37950 Minimap now looks good for both rectangular and hexagonal maps 2020-04-29 11:14:52 +03:00
Yair Morgenstern
8bcca39f07 WILL YOU SHUT UP ABOUT THE STUPID MINIMAP NOW 2020-04-29 10:56:31 +03:00
Yair Morgenstern
3865972737 Better declare war and city battle decisions (hopefully) for AI 2020-04-29 10:42:35 +03:00
Yair Morgenstern
38333c2600 Resolved #2536 - cities correctly expand to the last available tile 2020-04-28 12:52:18 +03:00
Yair Morgenstern
206686a4d4 Game always resume previous screen on resume(), and autosaves on pause (in case the user / Android decides later that it's closing the app completely) 2020-04-28 00:05:58 +03:00
Yair Morgenstern
e11feaea2f Fixed 'auto assign production' not working when changing from manual to auto assign 2020-04-27 23:21:14 +03:00
Väinö Mäkelä
c4f1e0f15d
Use ArrayDeque for BFS implementation (#2529) 2020-04-27 22:57:32 +03:00
Yair Morgenstern
6e03910097 Fixed crashing error when loading mods 
Load game now shows user ShowableUncivExceptions
 2020-04-27 19:23:59 +03:00
Yair Morgenstern
6fed455d76 Happiness is now a saved transient - saves about 10% of all runtime! Can't believe I hadn't thought of that before! 0_0 2020-04-27 00:01:40 +03:00
Yair Morgenstern
ba2d6fe405 Performance improvements for .nextTurn() 2020-04-26 23:09:06 +03:00
Yair Morgenstern
f0adc40e81 Fixed modification exception when destroying transported units 2020-04-26 20:50:09 +03:00
SomeTroglodyte
5e5a175f06
Terrace Farms: Bonus resource restriction (#2522) 2020-04-26 19:39:48 +03:00
SomeTroglodyte
818adbd1a3
Map editor: Placed improvement check updated: Potentially resolves #2489 (#2518) 
* Map editor: Placed improvement check updated: Potentially resolves #2489

* Map editor: Placed improvement check updated: Code readability
 2020-04-26 19:39:29 +03:00
Yair Morgenstern
f9d5cf60f8 Performance - Great general automation was taking 40% (!) of nextTurn time - decreased to 6%, which is still A LOT but much, much less 2020-04-26 11:23:09 +03:00
Yair Morgenstern
04cd1978fa Resource bonus from Fascism effective immediately 2020-04-26 09:58:24 +03:00
Yair Morgenstern
e50e2ad5d2 3.8.2 
Translations writer updated to handle new older structure
 2020-04-26 00:26:14 +03:00
SomeTroglodyte
20f37d25f1
Character set reorganized, added portuguese vowels (#2513) 2020-04-25 23:14:03 +03:00
Jack Rainy
99f4b612ec
Dynamical width of the buttons (#2496) 
* Dynamical width of the buttons

* Better alignment of icons

* Using the same style as in the game

* Compilation fix after merging
 2020-04-24 15:17:43 +03:00
Yair Morgenstern
4d75f30fd2 Can now add units in map editor! 
Support for loading maps with units added, support for starting gams with maps with preadded units added
Not supported: Starting games with maps of civ A when that civ isn't in the game
This needs a lot of work before it can be released publicly
 2020-04-24 15:04:19 +03:00
Yair Morgenstern
c2fdcb7849 Prepping for multiple rulesets - current ruleset is now is Vanilla folder 2020-04-24 14:03:41 +03:00
Yair Morgenstern
5ec9cc5f67 AI great people will no longer try to raise great improvements on tiles with existing great improvements 2020-04-24 13:47:10 +03:00
Yair Morgenstern
e3ed241b9d Iroquois movement unique only applies to friendly territory 2020-04-24 11:29:24 +03:00
Yair Morgenstern
f318df68ce Resolved #2491 - Terrace farms are not precluded by resources 2020-04-24 11:15:56 +03:00
Yair Morgenstern
5a8b6fdb19 Resolved #2503 - Resizing the game no longer returns you to the main menu 2020-04-24 11:04:11 +03:00
Yair Morgenstern
9ec721f93b New game screen adjusts to base rulesets with small amounts of civs, including barbarians 
Unknown eras no longer cause the screen to go black
 2020-04-23 23:21:25 +03:00
Yair Morgenstern
33ee29bbb2 Saving a map from the map editor screen no longer changes the screen 2020-04-23 23:03:29 +03:00
Jack Rainy
813ba5b83c
Hotfix: Do not reset the screen to the capital in the multiplayer game (#2502) 2020-04-23 22:46:07 +03:00
Yair Morgenstern
c0b1788d96 Changed main menu buttons to the default color scheme, renamed MenuScreen to MainMenuScreen 2020-04-23 20:16:14 +03:00
uncivbot[bot]
c890895f39
Translations update (#2500) 
* French translation fixes (#2484)

* Replace tile improvement term in FR to match Civ terminology

* FR fixes for tutorial

* FR fixes for buildings and diplomacy

* FR fixes for Trade, Nation and City-State

* FR fixes for Menus and notifications

* FR - Removed particles in front of civ names

* FR - fix non translated string (419 -> 335)

Most of the fixes here are city or place names.
These were extracted from Wikipedia French articles matching the
corresponding english article.

Thanks goes to https://wikipedia.org

* FR - fix space before "!", typo, translate falsely translated tutorial lines

* Translations (#2490)

* Translations are added and corrected

* Translations for the main screen

* Update Indonesian.properties (#2487)

* Update Indonesian.properties

Finished all required translations
Some tweaks and corrections
Enjoy, Indonesians

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

Co-authored-by: Luke Marlin <luke.marlin@viacesi.fr>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
 2020-04-23 20:09:31 +03:00
Yair Morgenstern
f2c8c04106 More concurrency problems solved 2020-04-23 20:00:08 +03:00
Yair Morgenstern
07b4dcd8ba Fixed #2492 - trading cities with units in them no longer crashes the game 2020-04-23 19:53:06 +03:00
Yair Morgenstern
4e53bb77d1 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-04-23 19:39:42 +03:00
Yair Morgenstern
c73df02d76 Unified City States and City-States -> City-States #2497 2020-04-23 19:39:16 +03:00
Jack Rainy
73ffe4f44f
Decrease CPU load for multiplayer game (#2495) 
* Decrease CPU load for multiplayer game

* Misprint is corrected
 2020-04-23 19:33:14 +03:00
Yair Morgenstern
286ef707c2 Can start a new game from within a game, to copy over the game's parameters 2020-04-22 17:16:24 +03:00
Yair Morgenstern
b59cc8ab4f Fixed resource display bug in tile table in multiplayer 2020-04-22 16:25:42 +03:00
Yair Morgenstern
688b780b14 Added a repeating baclground to the menu screen 2020-04-21 23:53:33 +03:00
Yair Morgenstern
0321aed309 Solved a concurrent modification bug, a second before publish 2020-04-21 20:34:02 +03:00