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

3069 commits

This branch
This branch
All branches
Author SHA1 Message Date
Yair Morgenstern
02501793b3 Using nuclear weapons has large diplomatic reprecussions 2019-12-08 11:50:30 +02:00
Yair Morgenstern
736edb5069 Back to the way it was - we only need the shader if we're using GL 3.0 apparently 
Let's stick to 2.0 for now
 2019-12-08 11:22:46 +02:00
Yair Morgenstern
81e520e608 GL 3.0 should now work for mac - kudos @lishaoxia1985 2019-12-08 10:04:16 +02:00
coding-human
14b24d17ee Update Diplomacy,Trade,Nations.json (#1429) 
fixed some Korean typo
 2019-12-08 09:23:57 +02:00
Yair Morgenstern
eace5a46b4 Disabled GL 3.0 because it causes problems in Mac computers 2019-12-08 09:10:02 +02:00
Yair Morgenstern
b410c9af37
Update README.md 2019-12-07 21:48:57 +02:00
Yair Morgenstern
8c71e782a7 Better APK name for releases 2019-12-07 21:15:40 +02:00
Yair Morgenstern
670f255511 Unsigned APK on Release test 2019-12-07 21:04:26 +02:00
Yair Morgenstern
9f3a943865 Resolved #1426 - starting a new game from a file-map game shows new correct options on the new game screen 2019-12-07 20:31:04 +02:00
Yair Morgenstern
440941cdea Battle simulation will no longer be dislayed for fogged-out tiles with units 2019-12-07 20:21:44 +02:00
Yair Morgenstern
69cdd0c187 Can no longer construct Apollo Program, and therefore spaceship parts, if Scientific Victory is disabled 2019-12-07 19:56:10 +02:00
Gnlow
8846ad8f4a Korean translations minor fix (#1424) 
* Update Other.json (Korean translations minor fix)

* Update Policies.json

* Update Notifications.json

Korean translations minor fix

* Update Buildings.json

Korean translations minor fix
 2019-12-07 19:32:29 +02:00
coding-human
6c755135c3 Added Korean (#1423) 
* Create BasicHelp_Korean

Added Korean translation of BasicHelp

* Delete BasicHelp_Korean

* Create BasicHelp_Korean.json

Added Korean translation of BasicHelp

* Create Nations_Korean.json

Added Korean translation of Babylon, Greece, China

* Update Nations_Korean.json

Added some more Korean translations

* Update Nations_Korean.json

Updated Korean translation of City States

* Update Nations_Korean.json

Added more Korean translations

* Update Nations_Korean.json

Added another Korean translations

* Create Tutorials_Korean.json

Added some Korean translation (about half)

* Update Tutorials_Korean.json

* Update Tutorials_Korean.json

Finished Korean translation

* Update Nations_Korean.json

Only 10 nations left!(Finally..)

* Update Nations_Korean.json
 2019-12-07 19:24:02 +02:00
HI_OuO
16c09ff2e2 add 'Songhai' translation (#1421) 2019-12-07 19:21:58 +02:00
Yair Morgenstern
38b9b13a0a Ruleset should have a lower-case s, because it's not, you know, a Set 
Also, Rulesets can now read rules from any json folder
 2019-12-06 13:59:12 +02:00
Yair Morgenstern
c32e3fce3c More normalization - can no longer add "everywhere" improvements on Water tiles. 2019-12-06 11:17:33 +02:00
Yair Morgenstern
6ab58fd8ab More map editor normalization, because people will doo whatever they can to break the system 2019-12-06 10:23:30 +02:00
Yair Morgenstern
3ea4f8bc82 Resolved #1420 - Menu in the map editor no longer opens multiple times on subsequent clicks 2019-12-06 10:12:16 +02:00
Yair Morgenstern
110e7b7052 Desktop no longer crashes/bugs on first initialization 2019-12-05 20:59:44 +02:00
Yair Morgenstern
b9487c1800 More ruleSet-shouldnt-come-from-static fixes 2019-12-05 20:39:57 +02:00
Yair Morgenstern
51a0d7727a Renamed gameInfo.gameBasics to ruleSet 2019-12-05 20:22:34 +02:00
Yair Morgenstern
effaa558f6 Un-broken 2019-12-05 20:10:21 +02:00
Bootjeuhz
3e2dcd7b91 Added some Dutch translations (#1417) 
See my file changes :).
 2019-12-05 18:50:14 +02:00
armandberger
f64fe0ed0c new french translations (#1415) 2019-12-05 18:49:55 +02:00
Yair Morgenstern
1903709f20 Tests now work again, yay 2019-12-05 18:44:07 +02:00
armandberger
0a3d3bf3f7 new french translations (#1414) 2019-12-05 12:00:45 +02:00
Yair Morgenstern
9b6ec809b3 Map editor now works with new ruleset 2019-12-05 00:15:05 +02:00
Yair Morgenstern
b7ffdb7cc3 Renamed GameBasics to RuleSet, because that's basically what it is 2019-12-05 00:01:00 +02:00
Yair Morgenstern
47e214258a FINALLY managed to un-staticify GameBasics, this means the game can potentially recognize different rulesets! 2019-12-04 23:57:54 +02:00
Yair Morgenstern
975531d856 Enabled HDPI for Mac OSX 2019-12-04 19:56:09 +02:00
Yair Morgenstern
b64c209218 Resolved #1361 - clicking on a unit's promotions now brings you to the promotion screen 2019-12-04 19:47:18 +02:00
Maron [RUNO]
a544bfc8f0 Complete polish translation for tutorial (Finally ^^) (#1410) 
And some small fixes
 2019-12-04 11:10:59 +02:00
coding-human
db077a9384 All Korean translations in "Translation" Folder (#1413) 
* Update Buildings.json

Korean translation (100%, but not in-game tested)

* Korean translations - Diplomacy,Trade,Nations.json

Updated Korean translations

* Korean translation-Diplomacy,Trade,Nations.json

Added Korean translation

* Korean update -NewGame,SaveGame,LoadGame,Options.json

Korean Translation Updated

* Add files via upload

* Add files via upload

* Kor translation - Buildings.json

Korean translation added

* Delete Units,Promotions.json

* Add files via upload

* Kor translation - Diplomacy,Trade,Nations.json

Korean translation added

* Kor translation - NewGame,SaveGame,LoadGame,Options.json

Korean translation added

* Kor translation - Notifications.json

Korean translation added

* Kor translation - Other.json

Korean translation added

* Kor translation - Terrains,Resources,Improvements.json

Korean translation added

* Kor translation - Units,Promotions.json

Korean translation added

* Kor translation - Policies.json

Korean translation added

* Kor translation - Techs.json

Korean translation added
 2019-12-04 11:10:38 +02:00
Yair Morgenstern
05fd40b306 Added tests to alert when we don't have translations for game basics 2019-12-03 22:11:04 +02:00
Yair Morgenstern
ef272b3208 Fixed "Positive" diplomatic modifier for warmongering 2019-12-03 21:28:50 +02:00
Yair Morgenstern
87a746f79b Non-coastal cities no longer have water units missing resources in the construction list 2019-12-03 21:19:28 +02:00
Yair Morgenstern
ab2c7fe51f 3.3.4-patch1 2019-12-03 21:04:48 +02:00
Yair Morgenstern
cf4d40501e Fixed "Arial units trying to move to their own tile" crashing bug 2019-12-03 20:45:35 +02:00
Yair Morgenstern
9868749d56 Solved crashing "AI Unit upgrade" bug! 2019-12-03 19:48:16 +02:00
StepanIvasyn
0ded139f5a Update Units,Promotions.json (#1407) 
Add Ukrainian translation.
 2019-12-03 16:40:35 +02:00
Yair Morgenstern
0ca3d91994 Tests are back to Java, because they didn't really run via Gradle when in Kotlin 2019-12-02 22:33:48 +02:00
Yair Morgenstern
e3ac6f4e53 Resolved #1404 - AI should no longer be able to win cultural victory after being defeated 2019-12-02 22:08:57 +02:00
Yair Morgenstern
f79858e39e Tutorials will now always be read with the correct encoding 2019-12-02 22:02:21 +02:00
Yair Morgenstern
7a9fd14b13 Resolved #1405 - upgrading Spearman to Landsknecht no longer gives you gold 2019-12-02 22:01:16 +02:00
Augusto V B Oliveira
650ac66ff6 Complete update for this section (units, promotions, etc) (#1403) 
some minor changes and adds
 2019-12-01 22:08:21 +02:00
Yair Morgenstern
fa0d650362 City buttons stay the correct size upon "Next turn" 2019-12-01 21:47:40 +02:00
Yair Morgenstern
6124fd5271 Removed long click action. It was more trouble than it was worth. 2019-12-01 21:21:50 +02:00
Yair Morgenstern
2280f16a2d Merge branch 'master' of https://github.com/yairm210/Unciv 2019-12-01 21:21:14 +02:00
Yair Morgenstern
dae477a870 Resolved #1374 - air units should no longer move and attack in the same turn 2019-12-01 21:20:53 +02:00
Maron [RUNO]
a4b0bc148f Added complete polish translation to Units,Promotions.json (#1402) 
Also i updated Tutorial file (i should complete it tommorow)
Have a nice day ^^
 2019-12-01 12:07:33 +02:00