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

2804 commits

This branch
This branch
All branches
Author SHA1 Message Date
Yair Morgenstern
d704b78034 We now fail a build if the debug parameters were commited to the repo 2019-12-12 23:56:39 +02:00
Yair Morgenstern
58d58ef3a3 Cleaned up tutorials 2019-12-12 20:58:02 +02:00
Yair Morgenstern
acf91b4e12 Solved Application Not Responding errors when saving large games 2019-12-12 20:27:46 +02:00
Prosta4okua
f8b822eeb3 Patch 2 (#1444) 
* Update NewGame,SaveGame,LoadGame,Options.json

* Update Diplomacy,Trade,Nations.json

* Update Other.json

* Update Buildings.json

* Update Notifications.json

* Update Terrains,Resources,Improvements.json
 2019-12-11 22:52:15 +02:00
armandberger
32d425986d new french translations (#1445) 
I made an another check so I hope that it will good this time, thank you for your patience and your controls.
 2019-12-11 22:51:43 +02:00
Yair Morgenstern
5812f2026f Added Missions, to replace wall-of-text tutorials in bite-sized pieces! Very pleased with this =D 2019-12-11 22:48:18 +02:00
Prosta4okua
cfccf54f9a Update NewGame,SaveGame,LoadGame,Options.json (#1443) 
* Update NewGame,SaveGame,LoadGame,Options.json

* Update Diplomacy,Trade,Nations.json
 2019-12-11 21:19:27 +02:00
coding-human
19b2a61414 Fixed typo(Korean) (#1439) 
* Fixed typo

Oops. I missed the 'n' in the \n. My mistake.

* added Korean translation

added Korean translation
 2019-12-11 20:06:05 +02:00
Yair Morgenstern
2b384c7d01 Added tests to check that Nations files are serializable, and fixed problems in Korean and Ukrainian files 2019-12-11 20:01:29 +02:00
Yair Morgenstern
973c8fb7f8 Auto detecting resolution was a terrible idea and I regret it entirely 2019-12-11 19:43:08 +02:00
Ustklm
8f434c4638 Portuguese Language Updates (#1425) 
* Portuguese Update Building.json

* Portuguese Update (Building,json)

Translation:
                  Translated everything for Portuguese.
                  Minor gramatical fixes.

* Mini Update

Fixed some ' and " error.
 2019-12-11 07:28:17 +02:00
Yair Morgenstern
cc29f15ba9
Delete NewCivs.md 2019-12-10 22:06:16 +02:00
Yair Morgenstern
4c0376829e
Update README.md 2019-12-10 21:32:08 +02:00
Yair Morgenstern
dd826284b5
Update README.md 2019-12-10 20:34:20 +02:00
armandberger
9eb68a6565 last french translation (#1437) 2019-12-09 23:45:48 +02:00
Yair Morgenstern
a91d48c912 Load Map screen now includes Download, and can handle large map names 2019-12-09 23:21:09 +02:00
Yair Morgenstern
54bbd5d8a2 New game screen clearly split into "Map options" and "Game options" 2019-12-09 22:48:54 +02:00
Yair Morgenstern
9493ce1a2e Extracted name, type, radius and noRuins of map from GameParameters to MapParameters, so that Maps can be created and defined outside of games 2019-12-09 20:46:10 +02:00
Yair Morgenstern
a90059988b Resolved #1434 Resolved #1363 - Workers no longer build tiles on other civ's territory 2019-12-09 18:53:04 +02:00
Yair Morgenstern
caf98b8470 Silly multithreading movement problems should no longer crash the game for the user - they're rare, but when you have 50,000 users they pop up every day. 2019-12-09 18:48:48 +02:00
Yair Morgenstern
32ac709a02 Resolved #1433 - city-states immediately destroy cities upon conquering 2019-12-09 18:42:18 +02:00
Yair Morgenstern
969ecf6daa Merge branch 'master' of https://github.com/yairm210/Unciv 2019-12-08 21:20:36 +02:00
Yair Morgenstern
b6bb961d7c Resolved #1422 - resources are now spread over different terrains as much as possible 2019-12-08 21:19:45 +02:00
Prosta4okua
d537eca46e Update Tutorials_Ukrainian.json (#1343) 2019-12-08 21:14:12 +02:00
Yair Morgenstern
026afb2c88 Android icons up-to-date 2019-12-08 18:53:41 +02:00
Yair Morgenstern
9725c0f66c Facism -> Fascism policy name change in existing save files 2019-12-08 18:44:04 +02:00
Sam Rogers
cdcd7cf116 correct spelling of "Fascism" policy (#1432) 2019-12-08 18:40:48 +02:00
Yair Morgenstern
df27cb3bdd The base resolution is auto but it can be manually set. That oughtta keep everyone happy. 2019-12-08 18:22:25 +02:00
Yair Morgenstern
66e940dd2b Revert "We now auto-detect resolution from the screen! Been a long time coming!" 
This reverts commit 7d458207b5.
 2019-12-08 17:36:02 +02:00
u-ndefine
9ea1c31455 New icon! - minor update (#1431) 
* Delete Unciv icon v4.png

* Add files via upload
 2019-12-08 16:27:11 +02:00
Yair Morgenstern
7d458207b5 We now auto-detect resolution from the screen! Been a long time coming! 2019-12-08 15:28:53 +02:00
Yair Morgenstern
34bd8155ae New icon! 2019-12-08 15:00:27 +02:00
Yair Morgenstern
297e604bbf Long translated leader names now display nicely in civ picker popup 2019-12-08 12:59:38 +02:00
Simulant87
de50262da2 fix typo and add german translation (#1430) 2019-12-08 12:32:19 +02:00
Yair Morgenstern
5694877fbd Every civ damaged by a nuclear blast declares war on the attacker 2019-12-08 12:01:58 +02:00
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