Commit graph

2722 commits

Author SHA1 Message Date
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
Yair Morgenstern
c992995b6f Can now pick Random civ in player picker 2019-11-30 23:11:46 +02:00
Augusto V B Oliveira
cf7cf562fa Update Portuguese Translation (#1401)
few changes and added some others
2019-11-30 22:01:05 +02:00
Augusto V B Oliveira
23fde5944f Update Portuguese Translation (#1400)
Only tech names and Era names
2019-11-30 22:00:55 +02:00
Augusto V B Oliveira
3b8fa17e51 Update in Portuguese translation (#1398)
There were a few things that I don't understood.
2019-11-30 22:00:44 +02:00
u-ndefine
6d1cfd2a9c Minor typo fix at VictoryScreen.kt (#1399) 2019-11-30 21:57:42 +02:00
Yair Morgenstern
477cd62ca8 Merge branch 'master' of https://github.com/yairm210/Unciv 2019-11-30 21:56:25 +02:00
Yair Morgenstern
757439f2d1 3.3.3 2019-11-30 21:56:00 +02:00
fab144
250cc9627d Addes some Malay Translation (#1395) 2019-11-29 16:12:34 +02:00
fab144
5b86699155 Added alot of malay translation (#1397) 2019-11-29 16:12:01 +02:00
Yair Morgenstern
68ee549edb Map editor normalizes tiles, so you can't add improvements of features where they shouldn't belong
Placing a civ starting location removes older starting locations
2019-11-29 12:01:32 +02:00
Smashfanful
f256e4e32a Update Notifications.json (#1391)
Italian translation correction
2019-11-28 22:43:07 +02:00
Yair Morgenstern
5807957d32 Resolved #1369 - nuking capitals no longer crashes the game 2019-11-28 22:21:39 +02:00
Yair Morgenstern
c1d3ac2604 Added timers to see what's taking so long. It's the fonts - 11 seconds to load Chinese characters.
Specifically, putGlyph. Which makes sense, since it's basically rendering 3000 images into the memory for Chinese.
2019-11-28 22:10:26 +02:00
Yair Morgenstern
3816014ae4 Added Great Person city location to notification 2019-11-28 21:10:36 +02:00
armandberger
c50783f895 Update Terrains,Resources,Improvements.json (#1390)
new french translation
2019-11-28 21:06:52 +02:00
armandberger
cadb88f5d5 Update Other.json (#1389)
french translation
2019-11-28 21:06:39 +02:00
Yair Morgenstern
55b2da6d75 Normalized resource reveal notification 2019-11-28 21:05:36 +02:00
Yair Morgenstern
3d3b2cd3fc When choosing a tech to work towards, the order will no longer "jump" over techs 2019-11-28 20:42:25 +02:00
Yair Morgenstern
df964a5ec6 TechPickerScreen organization 2019-11-28 20:28:04 +02:00
Yair Morgenstern
008485b38c Exploring units are not considered Idle 2019-11-28 20:26:44 +02:00
Yair Morgenstern
de85e5bace Merge branch 'master' of https://github.com/yairm210/Unciv 2019-11-28 20:26:07 +02:00
Yair Morgenstern
d0975ebc38 I don't think you should be able to see other tech's tech trees from the victory screen. 2019-11-28 19:57:55 +02:00
fab144
83822c745c Added some malay translation (#1387) 2019-11-28 19:52:33 +02:00
Yair Morgenstern
cc5ba4412e Merge branch 'master' of https://github.com/yairm210/Unciv 2019-11-28 19:44:04 +02:00
Yair Morgenstern
ad19dd1afa Resolved #1388 - Starting era no longer automatically displayed as "Ancient" in New Game screen 2019-11-28 19:42:08 +02:00
Maron [RUNO]
9e825a7709 Added translation for Notifications.json (#1386)
Thats all. Night^^
2019-11-28 15:09:38 +02:00
Yair Morgenstern
8826c4e84f Resolved #1372 - AI should now build spaceship parts and be able to win a scientific victory =) 2019-11-27 21:15:16 +02:00
Yair Morgenstern
8854cafc96 Added linux files for jar 2019-11-27 21:03:14 +02:00
Yair Morgenstern
4270142421 Should now be recognized as Game in Android 2019-11-27 20:44:15 +02:00
Yair Morgenstern
127bafdbc6 Revert "Android launcher now Kotlin, app should be recognized as Game"
This reverts commit 8bdad4c38d.
2019-11-27 20:38:23 +02:00
Yair Morgenstern
8232ca3aee Dammit packr 2019-11-27 20:26:09 +02:00
Yair Morgenstern
3d556b6236 Use the packrConfig json again 2019-11-27 20:16:53 +02:00
Smashfanful
c9cab860f6 Update Other.json (#1383)
Italian translations
2019-11-27 15:41:17 +02:00
Smashfanful
88a845d52a Update Units,Promotions.json (#1384)
Italian translations
2019-11-27 15:40:59 +02:00
Smashfanful
ecaf845192 Update Policies.json (#1385)
Italian translations
2019-11-27 15:40:44 +02:00
Smashfanful
5aa3e0f04c Update Diplomacy,Trade,Nations.json (#1382) 2019-11-27 15:40:23 +02:00
Maron [RUNO]
76cbbe3008 Few changes and added basic info (#1379)
* Update Diplomacy,Trade,Nations.json

Added rest of Polish translation for Diplomacy etc file

* Changes

Changed some translations.
Added markers to check context ingame.
Added basic help (complete)
Started translating tutorial
2019-11-27 08:56:38 +02:00
Yair Morgenstern
81711c6949 Didn't like comments in the if 2019-11-27 08:44:02 +02:00
Yair Morgenstern
6b9c3b0ee8 With wget 2019-11-27 08:35:14 +02:00
Yair Morgenstern
40e045696f Let's see if it actually downloads the zip correctly 2019-11-27 08:14:09 +02:00
Yair Morgenstern
9a99ee4f61 Proper delimiting of curl 2019-11-26 23:42:25 +02:00
Yair Morgenstern
03beb73e08 Can't use the same cache for Linux and Windows - for now lets ignore it entirely 2019-11-26 23:37:13 +02:00
Yair Morgenstern
f27611710d My entire use of Packr has been a lie - it needs a JDK corresponding to the destination platform 2019-11-26 23:11:00 +02:00
Yair Morgenstern
405536beba I think the Windows64 executables haven't been compiling well from the get-go... 2019-11-26 22:18:07 +02:00
Yair Morgenstern
d53a67802e Removed another huge JavaFX file 2019-11-26 21:38:32 +02:00
Yair Morgenstern
dac044b2f8 Forgot to set the JDK back for travis, gah 2019-11-26 20:58:17 +02:00
Yair Morgenstern
9437da73e2 Merge branch 'master' of https://github.com/yairm210/Unciv 2019-11-26 20:55:46 +02:00