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

3935 commits

This branch
This branch
All branches
Author SHA1 Message Date
Yair Morgenstern
58a8e358ea 3.9.9 2020-07-05 23:21:59 +03:00
uncivbot[bot]
d58b73313e
Translations update (#2804) 
* Update Indonesian.properties (#2792)

* add some simplified chinese translation (#2797)

Co-authored-by: gsm988aa@gmail.com <sim.gao@lab.sra.uni-hannover.de>

* German translation update - German.properties (#2799)

* Update German.properties

* Update German.properties

* Update German.properties

- english: resource -> german: Ressource
- several Additions

* Update German.properties

* Update German.properties

* Update German.properties

* Update Chinese translation. (#2803)

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

Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: gsm988aa <gsm988aa@gmail.com>
Co-authored-by: gsm988aa@gmail.com <sim.gao@lab.sra.uni-hannover.de>
Co-authored-by: scaphander <67830047+scaphander@users.noreply.github.com>
Co-authored-by: lishaoxia1985 <49801619+lishaoxia1985@users.noreply.github.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2020-07-05 23:13:47 +03:00
Yair Morgenstern
1b7b9bfcd5 Civ is properly destroyed when liberating the last city of the civ 2020-07-05 23:03:28 +03:00
Yair Morgenstern
75c6ab8acb Replaced units are not shown in tech button even when replacing unique unit is in a different tech 2020-07-05 19:21:16 +03:00
Alexander Korolyov
ad89286476
Change "try .. catch" statement to "if(consoleMode)" statement for mods folder loading. (#2802) 2020-07-05 06:27:41 +03:00
Yair Morgenstern
84a06b7fcb Reset ruleset when entering main menu screen, so that all map elements for the background will be available after returning from a modded game that removed some of them 2020-07-05 00:22:17 +03:00
Yair Morgenstern
c94079c0a7 Fixed tests which broke due to console checking being dependant on UncivGame.Current 2020-07-04 23:57:45 +03:00
Yair Morgenstern
d7cc0868fb Added a NewGameScreen option to choose the base ruleset - it works, which means G&K and Vanilla games can coexist well! 
We're ready to start making changes! =D
 2020-07-04 23:53:46 +03:00
Yair Morgenstern
81f88087fe Merge branch 'master' of https://github.com/yairm210/Unciv 2020-07-04 23:33:49 +03:00
Yair Morgenstern
46c6e3b464 Vanilla and G&K rulesets now coexist - this is a big step towards multiple base rulesets! 2020-07-04 23:33:25 +03:00
Alexander Korolyov
eef5cdb584
Basic spectator functionality. (#2765) 
* Basic spectator functionality.
Added as a separate nation with full visibility.

* Robots not allowed to spectate :(

* Allow multiple human spectators

* Multiple spectators allowed.
Fix crash when max players in map editor.

* At least one active (not spectator) human player needed

* - Invisible tiles vision for spectators.
- Minimum 1 active player (Human or AI) to start the game.
- temporary only 1 spectator in game

* Revert "At least one active (not spectator) human player needed"

This reverts commit d843bebe

* Add all tech to spectators for resource view

* Spectators couldn't be rolled out from "Random" civ

* Spectator is not a MajorCiv.
corrected random pick

* Small refactor

* No diplomacy button for Specators

* Add fixes from yair210 review.
 2020-07-04 23:29:20 +03:00
Yair Morgenstern
c2f0ee94fc Taking simulateUntilWin from the UncivGame.Current was causing problems when downloading multiplayer games - @alkorolyov 2020-07-04 22:51:43 +03:00
illantalex
2c9cf077c5
Added an installation problem solution on Ubuntu (#2798) 2020-07-04 21:48:46 +03:00
Alexander Korolyov
4bcae5f664
Console mode for multiple game automation (#2777) 
* Remove ruleset from GameSetupInfo class

* Remove dependency from Gdx for file IO:
- load Ruleset
- save/init in GameSettings
- get settings in GameSaver

* Remove simulation logging from GameInfo class

* MapGenerator: add switch for RNG seed verbose

* PlayerPickerTable small refactor

* Basic console mode

* Add multithreading to console mode and refactoring.

* Merge branch 'master' into console

* Small refactor
 2020-07-04 21:47:52 +03:00
Yair Morgenstern
0271fdead2 Resolved #2794 - Save games and maps cannot have slashes/backslashes, to avoid foldername/filename confusion 2020-07-03 16:01:09 +03:00
Yair Morgenstern
329cad660e 3.9.8 2020-07-03 15:55:07 +03:00
Duan Tao
a12b9b5e6f
AI destroys empty barbarian encampment. (#2793) 2020-07-03 15:48:28 +03:00
uncivbot[bot]
fdbc5279e5
Translations update (#2790) 
* Update Japanese.properties (#2781)

* Update Italian.properties (#2782)

Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2020-07-02 20:55:26 +03:00
Duan Tao
48350fc6a3
Mark red for air unit attack range. (#2786) 
Ya know what, sure why not
 2020-07-02 20:04:34 +03:00
Yair Morgenstern
4357d2513a Resolved #2787 - AIs MUCH more likely to build the Apollo Program and win a scientific victory 2020-07-02 19:56:59 +03:00
Yair Morgenstern
e1aaa88e3d Resolved #2789 - losing a resource no longer cancells all trades with that resource, only as many as is necessary to reach equilibrium 2020-07-02 19:43:01 +03:00
Yair Morgenstern
20772a5b6d
Added IOS FAQ 2020-07-01 06:38:31 +03:00
Yair Morgenstern
665404db4d Removed tech exchange, as per Civ V - some of the logic is still there, to allow a gradual phase-out for games that have existing tech trades 2020-06-29 22:22:28 +03:00
Yair Morgenstern
950c761e44 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-06-29 22:21:29 +03:00
Yair Morgenstern
7edd818a98 3.9.7 2020-06-29 22:20:09 +03:00
uncivbot[bot]
b182ccb307
Translations update (#2780) 
* Update Italian.properties (#2767)

* Update Indonesian.properties (#2770)

* Update Korean.properties (#2771)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Japanese.properties (#2775)

* Almost full translation in Brazilian Portuguese (#2776)

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: TG <saud2410@naver.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: henriquepena <67446379+henriquepena@users.noreply.github.com>
 2020-06-29 22:00:18 +03:00
Yair Morgenstern
df18d5f8a9 Resolved #2749 - show current improvement and remaining time to build in improvement picker screen 2020-06-29 21:59:45 +03:00
Yair Morgenstern
29e25747a8 Resolved #2112 - Show current resource amounts on incoming trade requests 2020-06-29 21:45:00 +03:00
Alexander Korolyov
5356e63249
Refactor UncivGame initialization - add UncivGameParameters. (#2779) 2020-06-29 20:05:58 +03:00
Yair Morgenstern
79ff8c2ecf Fixed broken tests due to 'impassible' changes 2020-06-28 20:48:51 +03:00
Yair Morgenstern
18b2c5868b Hopefully mitigated some very odd multiplayer-checker-related crashes 2020-06-27 23:57:22 +03:00
Yair Morgenstern
1bb26c579d All UI changes in MultiplayerScreen now use postRunnable to run on the main thread 2020-06-27 23:51:05 +03:00
Yair Morgenstern
cba9995f99 Fixed natural wonders not being considered 'impassible' for certain things (e.g. ancient ruins spawn) 2020-06-27 23:40:40 +03:00
Yair Morgenstern
3a42be7b77 Merge tag '3.9.6' 2020-06-25 23:04:21 +03:00
Yair Morgenstern
4c0a5d66ce 3.9.6 2020-06-25 23:02:23 +03:00
Alexander Korolyov
4c7970f5d7
Slightly change mechanics of simulateUntilWin (#2772) 
* Slightly change mechanics of simulateUntilWin

* Forgot to turn off some debugging switch
 2020-06-25 22:32:00 +03:00
Alexander Korolyov
aa677042dd
New icon for "Load Scenario" (#2768) 
* New icon for "Load Scenario"

* Javadoc comments
 2020-06-25 22:30:39 +03:00
Daniel Bälz
5753115c30
Fix not translated notifications (#2715) 
* Translate notification strings before they are shown. Fixes #2703

* Respect translations from active mods for placeholder translations

* Revert translation call to avoid issues in multiplayer. Still works without it.
 2020-06-24 23:58:16 +03:00
Alexander Korolyov
de03a727f6
Scenarios editor first part of changes (#2764) 
* Unnecessary line.

* First part of changes

* All features required for basic functionality were implemented.

Additional features:
- Sync between player adding/deleting and it's unit on map editor
- Sync between player's nation change and all it's units

Final prototype ready for beta-test.

* Second part of commits

* Small fix of TileMap.stripAllUnits

* Small post fixes.
Bring back deleting rivers, accidentally removed during merging.

* Fixes by your comments

* reverse if statement for "Random" chosenCiv

* tileEditorOptions take updated this.gameParameters from constructors

* updated unit placement.
Check validity by unit.canMoveTo()
Correct airunit placement in carriers.

* tileMap.stripAllUnits() refactor
 2020-06-24 23:47:34 +03:00
uncivbot[bot]
e4a5f2af18
Translations update (#2766) 
* Update Korean.properties (#2755)

* Update Korean.properties

* Update Korean.properties

* Update Indonesian.properties (#2756)

* Added translation for "Great improvement" (#2760)

* Update Russian.properties (#2763)

Co-authored-by: TG <saud2410@naver.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: alfoirazabal <49956896+alfoirazabal@users.noreply.github.com>
Co-authored-by: Bada <64350251+BadaTheBada@users.noreply.github.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2020-06-24 23:46:36 +03:00
Yair Morgenstern
a23d9ff291 Resolved #2761 - Tutorial titles are auto-added to the translation files 2020-06-24 23:44:17 +03:00
soggerr
213f71def3
Improve performance of multiplayer load poll (#2758) 
* Switch to schedule instead of schedulefixedrate to prevent floodgate of requests after long delays
* Move everything possible off of main thread so user can have smoother interaction with game during poll
 2020-06-24 23:13:04 +03:00
Yair Morgenstern
0f09ed2800 3.9.5 2020-06-21 19:26:17 +03:00
uncivbot[bot]
acedcc6da4
Translations update (#2752) 
* Update Italian.properties (#2740)

* Update Japanese.properties (#2741)

* Update Japanese.properties

* Update Japanese.properties

* Update Korean.properties (#2743)

* Update Korean.properties

* Update Korean.properties

* Update Ukrainian.properties (#2751)

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: TG <saud2410@naver.com>
Co-authored-by: Prosta4okua <31485341+Prosta4okua@users.noreply.github.com>
 2020-06-21 19:21:24 +03:00
lyrjie
e18bfa0053
Replaced the List with MutableList to avoid creating new ones on adding/removing values (#2746) 2020-06-20 23:10:02 +03:00
lyrjie
835c0832e2
Fixed strategic resources generation (#2745) 
* Fixed strategic resources generation

* Removed the already PR'd part
 2020-06-20 23:09:15 +03:00
alkorolyov
f6b738a04a Now clearCurrentMapButton and TerrainsAndResources clears rivers. 2020-06-20 23:07:22 +03:00
Yair Morgenstern
b49fba6955 Fixed coast tiles around nat wonders spawning land-type tings, hopefully 2020-06-20 23:04:53 +03:00
Duan Tao
b2d0a10f0e Fix oil generation in sea. 2020-06-20 23:04:06 +03:00
Duan Tao
3150c1783c Fix forest display in Default tileset. 2020-06-20 22:57:10 +03:00