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

3735 commits

This branch
This branch
All branches
Author SHA1 Message Date
uncivbot[bot]
392fb4135a
Translations update (#2543) 
* Update Italian.properties (#2531)

* Update Italian.properties

* Update Italian.properties

* Update Italian.properties

* German translations 2020 04 27 (#2532)

* German xlt 2020-04-27

* German xlt 2020-04-27-b

* German xlt 2020-04-27-c

* Update Korean.properties (#2535)

튜토리얼 번역 (35줄 까지)
Translate Tutorial Part (until line 35)

* Final translations (#2539)

* Update Portuguese.properties (#2533)

* Update Portuguese.properties (#2537)

* Update Portuguese.properties (#2542)

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com>
Co-authored-by: heogeon <akffod2525@gmail.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: guilherme-peev <guilherme.peev@gmail.com>
 2020-04-29 19:34:45 +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
e59776f443 3.8.3 2020-04-27 23:26:16 +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
uncivbot[bot]
ef29ea4df6
Translations update (#2530) 
* Patch 1 (#2528)

* Update Russian.properties

* Update Russian.properties

* Update Ukrainian.properties (#2520)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Напевно, перекладено ВСЕ!

* Стилістичні правки.

Поставив лапки та довге тире де треба.

* Показувати/візуалізувати -> Показувати

* Поставив апостроф усюди.

* Так

Так і знав буде щось не так з цими рядками.

* Забув виправити пустий рядок.

* Мультиплеєр->багатокористувацька гра

* Виправлення помилок знайдених JackRainy

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

Co-authored-by: Trema28 <54084262+Trema28@users.noreply.github.com>
Co-authored-by: Prosta4okua <31485341+Prosta4okua@users.noreply.github.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2020-04-27 23:20:40 +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
uncivbot[bot]
cee8b58e5a
Translations update (#2527) 
* Update Indonesian.properties (#2519)

Minor updates

* Update Simplified_Chinese.properties (#2526)

* Update Russian.properties (#2521)

Lines from Tutorials are translated.
Entered Pericles quote for Mausoleum of Halicarnassus.

* Update Russian.properties (#2523)

* German translations 2020 04 24 (#2511)

* Still more german readability improvements and nation text

* More german translations

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

* Update German.properties (#2515)

Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Doubi_TS <48427744+tianshidoubi@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: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: Haeherfeder <gitDeDemos@haeherfeder.de>
 2020-04-27 10:53:17 +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
uncivbot[bot]
28aae7b9e8
Translations update (#2516) 
* Update Portuguese.properties (#2501)

* Update Italian.properties (#2506)

* Added translations for Danish/Scandinavian towns (#2509)

* Update Portuguese.properties (#2512)

* Update Indonesian.properties (#2505)

Co-authored-by: guilherme-peev <guilherme.peev@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Elizabeth Sherrock <lizzyd710@gmail.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
 2020-04-25 23:56:50 +03:00
Yair Morgenstern
0627f981b9 Decapitalized Terrace farm image so it would register on Android 2020-04-25 23:43:52 +03:00
Yair Morgenstern
e8fc5b32a7 Resolved #2514 - returned to grade 5.6.4 2020-04-25 23:36:55 +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
SomeTroglodyte
289bf62e99
Typos in json and translations: Suzdal, Edinburgh defeat (#2504) 2020-04-24 00:40:56 +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
Yair Morgenstern
f51c3b7b1e 3.8.1-patch1 2020-04-23 22:46:52 +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
6c5eed4dd9 3.8.1 2020-04-23 20:17:58 +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