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

2904 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Yair Morgenstern
7998ed2f0c Resolved #1365 - Disabled trading cities in One City Challenge 2019-11-26 20:55:07 +02:00
armandberger
d926dfbe98 Update Units,Promotions.json (#1378) 
New french translation
 2019-11-26 20:51:59 +02:00
Yair Morgenstern
5d59f25532 Added packr config, shrinking final zip from 80MB to 50MB! 2019-11-26 20:47:31 +02:00
Yair Morgenstern
5907d02403 Oil well images split into Coast and not-Coast 2019-11-26 20:46:53 +02:00
Maron [RUNO]
6e96235b55 Update Diplomacy,Trade,Nations.json (#1377) 
Added rest of Polish translation for Diplomacy etc file
 2019-11-26 19:36:53 +02:00
Yair Morgenstern
451f2a5381
Update feature_request.md 2019-11-26 11:00:00 +02:00
Yair Morgenstern
6426c56c48
Update feature_request.md 2019-11-26 10:55:40 +02:00
ThatIsAPseudo
2e4c5830b0 Update Buildings.json (#1373) 
- add French translations
 2019-11-26 10:28:47 +02:00
Yair Morgenstern
8bdad4c38d Android launcher now Kotlin, app should be recognized as Game 2019-11-25 15:59:16 +02:00
Yair Morgenstern
2da7c5be8f Tutorials are now popup tables - limits the width of tutorials so they don't go off-screen 2019-11-25 14:28:32 +02:00
Yair Morgenstern
ad4bc86d52 Merge branch 'master' of https://github.com/yairm210/Unciv 2019-11-25 12:09:33 +02:00
Yair Morgenstern
aee9724765 Your voice has been heard - All units now have the Explore command 2019-11-25 12:08:22 +02:00
lishaoxia1985
7453ee637f 1. overflow science when finishing and starting research. 2. in the cityscreen unit should be not visible. 3. modifier the policy "Commerce Complete" according to original game. 4. the action of "Great Merchant" now is the same as original game. 5. translation update. (#1355) 
* update

* update

* update

* update

* update

* update
 2019-11-25 12:03:20 +02:00
Yair Morgenstern
488b733db6 Resolved #1368 - missiles can no longer be promoted 2019-11-25 11:58:02 +02:00
Yair Morgenstern
041ca493ba
Update readme - added standalone zip explaination 2019-11-25 08:28:46 +02:00
Yair Morgenstern
3fad0985b4 Attempt to use GL 3.0 when possible 2019-11-25 06:34:02 +02:00
Yair Morgenstern
4277ba5c8f Yes we changed the repo name... 2019-11-24 23:48:21 +02:00
Yair Morgenstern
9580e8cb38 Let's see if it can use the local JAVA_HOME from Travis since it doesn't seem to like downloading large external files 2019-11-24 23:41:27 +02:00