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

2025 commits

Author SHA1 Message Date
lishaoxia1985
59f6e10511
some bug fix (#2817) 
* Scout won't be built when research "Scientific Theory". Fix the word "Can only build water units in coastal cities".

* Fix the bugs when you delete all maps close button disappears and you can't go to main menu.

* Basictests don't check that Scout can't upgrade.

* If the unit is obsolete it will remove from construction queue.
 2020-07-16 22:22:47 +03:00
Yair Morgenstern
6309bc2fba Main menu buttons no longer require scrolling 2020-07-15 21:52:42 +03:00
Giuseppe D'Addio
4f919b32de
Update template.properties (#2843) 
Added new translation lines that were absent in the game
 2020-07-14 14:32:55 +03:00
Yair Morgenstern
e179f1a472 Added Water Mill building 2020-07-13 22:42:30 +03:00
Giuseppe D'Addio
0c7d4b296a
Update Nations.json (#2815) 
Typo fix
 2020-07-13 22:37:01 +03:00
Yair Morgenstern
f57533bc48 3.9.11 2020-07-13 21:45:52 +03:00
uncivbot[bot]
05b32e2146
Translations update (#2842) 
* Update Korean.properties (#2816)

* Update Korean.properties

* Update Korean.properties

* Update Japanese.properties (#2821)

* Update Japanese.properties

* Update Japanese.properties

* Update Indonesian.properties (#2831)

* Update Brazilian_Portuguese.properties (#2841)

Co-authored-by: TG <saud2410@naver.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Dalmolax <63485458+Dalmolax@users.noreply.github.com>
 2020-07-13 21:37:51 +03:00
Alexander Korolyov
c51879cc5f
OptionsPopup with two experimental switches: Spectator mode, Extended Map editor. (#2834) 2020-07-12 12:59:32 +03:00
Yair Morgenstern
04939feb3c 3.9.10 2020-07-08 19:39:16 +03:00
uncivbot[bot]
cf8fb3da1c
Translations update (#2814) 
* Update Ukrainian.properties (#2805)

* Update Japanese.properties (#2806)

* Update Italian.properties (#2807)

* Update Korean.properties (#2812)

* German translation update II - German.properties (#2813)

* Update German.properties - fixed lost variables

* Update German.properties

- more compact notation: Geländemerkmale entfernen - "Entfernen von Geländemerkmalen" is too long / looks bad in civilopedia
- simplified spelling
- better descriptions

* Update German.properties

Vanilla Nations - Sumerians!

Co-authored-by: Prosta4okua <31485341+Prosta4okua@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: TG <saud2410@naver.com>
Co-authored-by: scaphander <67830047+scaphander@users.noreply.github.com>
 2020-07-08 19:32:32 +03:00
Yair Morgenstern
19bb1cdb94 Translation writer now takes from all base ruleset, and doesn't add duplicate keys - we're ready to start actual work on G&K! 2020-07-07 00:18:02 +03:00
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
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
329cad660e 3.9.8 2020-07-03 15:55:07 +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
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
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
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
aa677042dd
New icon for "Load Scenario" (#2768) 
* New icon for "Load Scenario"

* Javadoc comments
 2020-06-25 22:30:39 +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
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
Yair Morgenstern
288e6877ba 3.9.4 2020-06-17 20:05:55 +03:00
uncivbot[bot]
ac59584caf
Translations update (#2738) 
* Update Japanese.properties (#2731)

* Minor update Russian.properties (#2737)

* Update Indonesian.properties (#2734)

Co-authored-by: paontv <57051667+paontv@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-06-17 20:01:52 +03:00
Yair Morgenstern
ac0c874061 Great improvements are marked as such in the Civilopedia 2020-06-15 20:20:48 +03:00
Yair Morgenstern
46dd66d343 3.9.3 2020-06-14 23:53:11 +03:00
uncivbot[bot]
a372ed7ed9
Translations update (#2728) 
* Update Russian.properties (#2709)

New lines are translated

* Update Ukrainian.properties (#2711)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Indonesian.properties (#2720)

* Update Korean.properties (#2712)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Japanese.properties (#2721)

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

* Update Brazilian_Portuguese.properties (#2727)

Co-authored-by: Bada <64350251+BadaTheBada@users.noreply.github.com>
Co-authored-by: Prosta4okua <31485341+Prosta4okua@users.noreply.github.com>
Co-authored-by: Mulaiz Jorigo <66756998+NexVanca@users.noreply.github.com>
Co-authored-by: TG <saud2410@naver.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: Werlichz <66792554+Werlichz@users.noreply.github.com>
 2020-06-14 23:39:35 +03:00
Yair Morgenstern
1961aa7245 Code for era-based city images is go, the current era city images hide the rivers behind them so it's temporarily disabled 2020-06-10 22:00:32 +03:00
Yair Morgenstern
86d54bd3fe Resolved #2708 - added rivers to plain tileset 2020-06-08 19:34:25 +03:00
Yair Morgenstern
4cbd279713 Resolved #2704 - Rome starts avoid extreme temperatures 2020-06-07 21:55:31 +03:00
Yair Morgenstern
f03c0c6de2 Translation updates 2020-06-07 21:52:29 +03:00
uncivbot[bot]
258b2f587c
Translations update (#2707) 
* Update Korean.properties (#2700)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Italian.properties (#2698)

* Finish spansih translation (#2705)

* Lithuanian.properties (#2692)

* Lithuanian.properties

fixed several errors in the text, added translation of diplomacy and cities of states

* Update Lithuanian.properties

Co-authored-by: TG <saud2410@naver.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Álvaro Ferrero <alfedi3867@hotmail.com>
Co-authored-by: teodor24 <65969302+teodor24-real@users.noreply.github.com>
 2020-06-07 21:36:35 +03:00
Yair Morgenstern
31b9faaf23 New translations 2020-06-05 12:40:22 +03:00
uncivbot[bot]
e314475bdc
Translations update (#2697) 
* Update template.properties (#2685)

* Update template.properties

Also preparing for the Aztecs

* Update template.properties

* Update Russian.properties (#2688)

New tutorial lines are translated

* Update Italian.properties (#2695)

* Update Korean.properties (#2694)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Japanese.properties (#2693)

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Simplified_Chinese.properties (#2696)

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: saud2410 <64586749+saud2410@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: Doubi_TS <48427744+tianshidoubi@users.noreply.github.com>
 2020-06-05 12:37:39 +03:00
Yair Morgenstern
677a258375 3.9.1 2020-06-03 19:36:42 +03:00
uncivbot[bot]
6bb555a666
Translations update (#2687) 
* Update Japanese.properties (#2681)

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Spanish.properties (#2682)

I just checked some Grammar errors that capted my attention while playing and also translated some lines that I consider an Accurate translation

* Update Russian.properties (#2683)

* Update Russian.properties

New lines are translated

* Update Russian.properties

Translation issue closed

* Update Italian.properties (#2686)

Fix

Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: WhiteRoar <63148999+WhiteRoar@users.noreply.github.com>
Co-authored-by: Bada <64350251+BadaTheBada@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2020-06-03 19:26:53 +03:00
Yair Morgenstern
35ff2a38f5 Apparently I removed the nat wonders, causing tests to fail. Lucky the tests are there, or the tutorial would be gone! 2020-06-03 19:14:15 +03:00
Yair Morgenstern
d511899ed8 Resolved #2613 - added a close button to the Civ-picking popup in the New Game screen 2020-06-03 19:09:48 +03:00
Yair Morgenstern
3e31be1801 Natural wonders spawned before rivers, so we don't retroactively get rivers on coast tiles 
Other small improvements for catching and avoiding crashes
 2020-06-03 18:44:03 +03:00