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

3834 commits

This branch
This branch
All branches
Author SHA1 Message Date
Yair Morgenstern
4a69544c7d Resolved #2672 - Difficulties are sorted by ascending difficulty in Civilopedia 2020-05-30 23:40:27 +03:00
Yair Morgenstern
84e4e58f23 Added movement cost for crossing rivers 2020-05-30 23:32:53 +03:00
Yair Morgenstern
58059fc59b Great person uniques can be added to any modded unit 2020-05-30 23:11:49 +03:00
Yair Morgenstern
40325a38b4 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-05-26 16:35:56 +03:00
Yair Morgenstern
8e9cd174dc 3.8.12-patch1 
Added case where worker that needs to ru away has nowhere to move to
 2020-05-26 16:35:01 +03:00
k.h.lai
a9d9b5a64f
Reformat "object:" to "object :" according to the official kotlin style guide (#2666) 2020-05-26 16:12:29 +03:00
Yair Morgenstern
1f7d9ead20 3.8.12 2020-05-25 21:34:38 +03:00
k.h.lai
ef0c0b9407
Improve keyboard shortcut (#2663) 
* Use keyDown instead of keyTyped to handle arrow keys

* Rename getIconAnKeyForUnitAction to getIconAndKeyForUnitAction
Remove unnecessary dependencies in UnitActionsTable.kt

* Use backButtonAndESCHandler to deselect unit and city
 2020-05-25 21:17:02 +03:00
uncivbot[bot]
29d17ead9b
Translations update (#2659) 
* Update Korean.properties (#2649)

* Update Korean.properties

* Update Korean.properties

* Translated part of Arabia (#2653)

* Update Polish.properties (#2656)

* Update Spanish.properties (#2655)

Translate India and Germany

Co-authored-by: saud2410 <64586749+saud2410@users.noreply.github.com>
Co-authored-by: Shon-Shon <65797120+Shon-Shon@users.noreply.github.com>
Co-authored-by: RadioMagnetofonStereofoniczny <remixionmix@gmail.com>
 2020-05-24 21:50:01 +03:00
Yair Morgenstern
41aade6eb9 Advanced sliders work on New Map Screen 2020-05-24 21:49:36 +03:00
Daniel Bälz
fcffbbb9bd
Minor UI improvements construction menu (#2657) 
* Fix padding for headers in construction menu

* Sync width of queue and available construction tables

* Left align "Add to queue" button to prevent jumping

* Remove duplicate separator and padding

* Improve design of CityInfoTable

* Fix padding for headers in construction menu

* Sync width of queue and available construction tables

* Left align "Add to queue" button to prevent jumping

* Remove duplicate separator and padding

* Improve design of CityInfoTable
 2020-05-24 21:30:34 +03:00
Daniel Bälz
ee5ef800c7
Evaluate translations for mods only when the mod is active in a game. Fixes #2622 (#2650) 2020-05-24 21:29:16 +03:00
Daniel Bälz
24c88313e8
Add remove button for construction queue items (#2654) 2020-05-23 23:10:46 +03:00
Yair Morgenstern
2f43213616 Resolved #2647 - Automated workers run away from enemy military units 2020-05-22 11:08:39 +03:00
Yair Morgenstern
890a64c533 3.8.11 2020-05-21 22:58:58 +03:00
uncivbot[bot]
bc919815c6
Translations update (#2646) 
* Update Italian.properties (#2639)

* Update Brazilian_Portuguese.properties (#2645)

hi, i added some civilizations translates :D

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Moizeba <65720902+Moizeba@users.noreply.github.com>
 2020-05-21 22:44:36 +03:00
Alexander
8745f58dc2
Uniformed the size of buttons on LanguagePickerScreen and MultiplayerScreen (#2628) 2020-05-21 22:31:03 +03:00
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
Giuseppe D'Addio
b3a7528818
Update template.properties (#2637) 
* Update template.properties

Added two new translation lines

* Update template.properties

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2020-05-19 19:24:21 +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
Yair Morgenstern
321c5858ce Merge branch 'master' into preVersion 2020-05-19 19:00:14 +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
ac0603a606 3.8.10 2020-05-19 00:12:16 +03:00
uncivbot[bot]
c9e63b3e00
Translations update (#2636) 
* Update Italian.properties (#2626)

* Update Italian.properties

Also added a new translation line

* Update Italian.properties

Fiiix

* Update Russian.properties (#2630)

* Update Indonesian.properties (#2631)

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Bada <64350251+BadaTheBada@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
 2020-05-19 00:06:29 +03:00
Yair Morgenstern
8ba8c6b596 More new tiles by The Bucketeer! 2020-05-19 00:06: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
507c677d08 Windows 32 bit test 2 2020-05-17 22:38:18 +03:00
Yair Morgenstern
b7e5d8ac6e Windows 32-bit test 2020-05-17 22:13:25 +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
6ed88b54d1 3.8.9 
For real this time, so F-Droid etc. can pick up on it
 2020-05-16 22:40:21 +03:00
Yair Morgenstern
0b0505eed6 3.8.9 2020-05-16 22:34:26 +03:00
uncivbot[bot]
20e03271a1
Translations update (#2625) 
* Update Indonesian.properties (#2612)

* Update Simplified_Chinese.properties (#2617)

* Update Korean.properties (#2615)

Added more translations

* Update Korean.properties (#2620)

Archipelago translation added

Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: woone8 <63055987+woone8@users.noreply.github.com>
Co-authored-by: PenguinDoc <65184091+PenguinDoc@users.noreply.github.com>
Co-authored-by: saud2410 <64586749+saud2410@users.noreply.github.com>
 2020-05-16 22:19:53 +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