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

2884 commits

This branch
This branch
All branches
Author SHA1 Message Date
Yair Morgenstern
e7b6450a71 Resolved #1332 - can no longer get settlers from ruins in One City challenge 2019-11-15 14:31:19 +02:00
Yair Morgenstern
827bf3d4b2 Images update! By The Buketeer again! 2019-11-15 14:28:46 +02:00
Yair Morgenstern
ccdc9abda3
Update README.md 2019-11-15 09:33:59 +02:00
Yair Morgenstern
85fbbaaa6d Checking if we can remove some lines from the Travis file to speed up build time 2019-11-15 09:27:13 +02:00
Yair Morgenstern
4845fb7865 JAR file is now ready for desktop consumption! 2019-11-15 09:12:06 +02:00
Yair Morgenstern
292ca7a908 HOT DAMN Unciv now works from desktop:dist and the command line! 2019-11-14 23:54:52 +02:00
Yair Morgenstern
8729100993 altas commit 2019-11-14 22:30:14 +02:00
Yair Morgenstern
24e62e7cc1 Added all of The Bucketeer's improvements, and units until Landskecht 2019-11-14 22:14:23 +02:00
Yair Morgenstern
f1ce1a67e1 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-11-14 22:12:27 +02:00
Yair Morgenstern
e21d7eb54a We can now have "layered" images for the base tile, such as grassland + manufactory! 2019-11-14 21:01:24 +02:00
Voytee
05dad7ad91 Update Diplomacy,Trade,Nations.json (#1331) 
* Update Diplomacy,Trade,Nations.json

Few translations in Polish added.

* Update Diplomacy,Trade,Nations.json

Fix to the latest commit. Polish translation.
 2019-11-14 12:47:57 +02:00
Yair Morgenstern
6eaa4c320f 3.2.2 2019-11-13 23:07:04 +02:00
VoyteeG
d3694b600b Update Buildings.json (#1330) 
Some Polish translation added.
 2019-11-13 22:58:34 +02:00
Yair Morgenstern
c6b550e43d Resolved #1312 - More obvious division between promotion 'pick now' and description 
Civilopedia redone!
Now with simpler picking and images!
 2019-11-13 22:54:10 +02:00
Yair Morgenstern
a94a3f9d2e Resolved #1323 - invalid trades should now be removed when turn starts 2019-11-13 21:45:54 +02:00
Smashfanful
1abc649d59 Update Nations_Italian.json (#1329) 2019-11-13 19:55:38 +02:00
VXplayGames
392afab35d Update Buildings.json (#1309) 
two translations corrected and one added (Polish)
 2019-11-12 08:20:59 +02:00
sveckarel
7a9c99ee81 Update czech translations (#1327) 
* Czech translations improvements

* Update Czech translations
 2019-11-12 06:52:48 +02:00
Yair Morgenstern
9ad2851b80 Gradle changes so the desktop:dist will work. still not 100% since I can't get it to recognize Kotlin yet 2019-11-11 23:17:12 +02:00
Yair Morgenstern
b0e29c5d3c City-state alliance Bugfix 2019-11-11 21:07:16 +02:00
Smashfanful
2bd9a2fbd6 Update Nations.json (#1319) 
Added Kuala Lumpur and Manila, and changed Ur's defeat quotes
 2019-11-10 21:57:53 +02:00
Yair Morgenstern
63f9bc28c8 Now let's see if it detects the fix properly 2019-11-10 21:50:59 +02:00
Yair Morgenstern
f105364493 Intentionally breaking json to see if the Travis test catches it 2019-11-10 21:45:41 +02:00
Yair Morgenstern
2df7bcafbd Added tests for Travis to fail if the jsons don't parse or something 2019-11-10 21:39:10 +02:00
Yair Morgenstern
91eed3fc02 3.2.1-patch1 2019-11-10 18:34:44 +02:00
dic1911
3efb0d67f8 fix typo (#1324) 
* allow reverse landscape

by setting android:screenOrientation value to userLandscape

* Add first batch of Traditional Chinese translation

* Complete Traditional Chinese translation for Notifications.json

* Traditional Chinese translation for Other.json

* Fix translation derp, which crashes the game upon launch

* Fix translation derp

* Traditional Chinese translation for Buildings.json

* Traditional Chinese translation for Diplomacy,Trade,Nations.json

* Replace China mainland flag with bg-color-filled one

* Traditional Chinese for Techs.json

* t.chinese translation

* fix typo

* fix translation

* fix typo
 2019-11-10 15:52:07 +02:00
dic1911
7199fc5e89 Fix translation derp and add placeholder chinese tutorial (#1322) 
* allow reverse landscape

by setting android:screenOrientation value to userLandscape

* Add first batch of Traditional Chinese translation

* Complete Traditional Chinese translation for Notifications.json

* Traditional Chinese translation for Other.json

* Fix translation derp, which crashes the game upon launch

* Fix translation derp

* Traditional Chinese translation for Buildings.json

* Traditional Chinese translation for Diplomacy,Trade,Nations.json

* Replace China mainland flag with bg-color-filled one

* Traditional Chinese for Techs.json

* t.chinese translation

* fix typo

* fix translation
 2019-11-10 10:29:59 +02:00
Yair Morgenstern
637b487a2c City-states allied to Civs no longer attempt to declare war when it does on Civs they haven't met yet 2019-11-09 20:25:30 +02:00
Smashfanful
065b7586b2 Update Diplomacy,Trade,Nations.json (#1317) 
Translation line correction - now you can see it translated, hopefully
 2019-11-09 19:51:15 +02:00
Yair Morgenstern
28b15a537a City-states no longer generate Great People 2019-11-09 19:18:27 +02:00
Yair Morgenstern
7b8d335902 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-11-09 19:17:54 +02:00
Yair Morgenstern
1a034cba03 Removed mod civs from nation metadata 2019-11-09 19:07:35 +02:00
Prosta4okua
4a312c3197 Ukrainian translation (#1281) 
* init

* 1

2

* 3

* from StepanIvasyn

* Preparing.
Other.json

* Fully translated file Other.json

* Fix

* Fully translated BasicHelp_Ukrainian.json

* 1

* resolved conflicts

* 1

* 2
 2019-11-09 19:06:10 +02:00
Yair Morgenstern
e1350cdb05 separated whiteDot for images from TableBackground for backgrounds 2019-11-08 15:42:19 +02:00
lishaoxia1985
4d5ae8fa25 now you only need to create font once. (#1269) 
* update

* update

* update

* update

* update

* update

* update

* range extension

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update
 2019-11-08 15:31:11 +02:00
dic1911
39314a5543 fix typo (#1310) 
* allow reverse landscape

by setting android:screenOrientation value to userLandscape

* Add first batch of Traditional Chinese translation

* Complete Traditional Chinese translation for Notifications.json

* Traditional Chinese translation for Other.json

* Fix translation derp, which crashes the game upon launch

* Fix translation derp

* Traditional Chinese translation for Buildings.json

* Traditional Chinese translation for Diplomacy,Trade,Nations.json

* Replace China mainland flag with bg-color-filled one

* Traditional Chinese for Techs.json

* t.chinese translation

* fix typo
 2019-11-07 17:31:03 +02:00
Smashfanful
528ded112e Update Notifications.json (#1311) 2019-11-07 17:30:32 +02:00
Yair Morgenstern
d8ec67bb43 Resolved #1307 - you no longer get a notification when conneccting to the cities of other Civs 
New notification when cities have disconnected from your capital
 2019-11-06 21:43:48 +02:00
dic1911
d2121075f0 Make t.chinese translation 99% complete! (#1308) 
* allow reverse landscape

by setting android:screenOrientation value to userLandscape

* Add first batch of Traditional Chinese translation

* Complete Traditional Chinese translation for Notifications.json

* Traditional Chinese translation for Other.json

* Fix translation derp, which crashes the game upon launch

* Fix translation derp

* Traditional Chinese translation for Buildings.json

* Traditional Chinese translation for Diplomacy,Trade,Nations.json

* Replace China mainland flag with bg-color-filled one

* Traditional Chinese for Techs.json

* t.chinese translation
 2019-11-06 21:00:54 +02:00
Yair Morgenstern
1bd6f5fc73 Atlas updated now (: 2019-11-06 19:34:02 +02:00
Yair Morgenstern
f6d2143ff6 Fixed weird resizing bug - #1304, thanks @ninjatao! 2019-11-06 19:25:02 +02:00
dic1911
8fd0f39ed4 more t.chinese (#1306) 
* allow reverse landscape

by setting android:screenOrientation value to userLandscape

* Add first batch of Traditional Chinese translation

* Complete Traditional Chinese translation for Notifications.json

* Traditional Chinese translation for Other.json

* Fix translation derp, which crashes the game upon launch

* Fix translation derp

* Traditional Chinese translation for Buildings.json

* Traditional Chinese translation for Diplomacy,Trade,Nations.json

* Replace China mainland flag with bg-color-filled one

* Traditional Chinese for Techs.json
 2019-11-06 12:16:28 +02:00
VoyteeG
3632fa714b Update NewGame,SaveGame,LoadGame,Options.json (#1303) 
Hopefully this time is OK. Some polish additions.  By the way I've noted missing starting eras. Is it correct?
 2019-11-05 21:25:47 +02:00
Yair Morgenstern
140753e9c4 Resolved #1302 - captured settlers are converted workers as per original Civ V 2019-11-05 18:16:37 +02:00
Smashfanful
1ea961b54a Update Diplomacy,Trade,Nations.json (#1301) 2019-11-05 15:24:18 +02:00
Smashfanful
24b6dffad6 Update Notifications.json (#1300) 2019-11-05 15:23:44 +02:00
Yair Morgenstern
ccca425f5b Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-11-05 15:22:03 +02:00
Yair Morgenstern
777802ab04 Can no longer click 'next turn' if popups are open - #1289 2019-11-05 15:21:28 +02:00
Yair Morgenstern
9e949c0fde
Resolved #1297 - Added wiki/help documentation in readme.md 2019-11-05 15:19:53 +02:00
Yair Morgenstern
b2cd200856
Update README.md 2019-11-05 13:06:36 +02:00