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

2955 commits

This branch
This branch
All branches
Author SHA1 Message Date
Yair Morgenstern
83aab24bba Resolved #1341 - Annexed cities no longer have population permanently gone "outside" their borders (Mr Gorbachev, tear down this wall!) 2019-11-17 23:03:13 +02:00
Yair Morgenstern
f7bb5c4a59 Added lines between prerequisite techs in TechPickerScreen - now you can see the entire tree! 2019-11-17 22:41:08 +02:00
Yair Morgenstern
2d94cc2179 Changed translation files to always read in UTF-8 - should solve Desktop getting wierdly read characters, hopefully 2019-11-17 22:38:30 +02:00
Yair Morgenstern
80d9b3bd49 Trades in overview screen are now almost symmetrical 2019-11-17 21:37:27 +02:00
Yair Morgenstern
aa4c70f090 Fixed trades always beng denied because "our proposed trade is no longer relevant" 2019-11-17 21:16:51 +02:00
Yair Morgenstern
7a02019b7c Resolved #1340 
Apparently some chipsets, like NVIDIA Tegra 3 graphics chipset (used in Asus TF700T tablet), don't support non-power-of-two texture sizes - kudos @yuroller!
 2019-11-17 20:15:10 +02:00
Yair Morgenstern
19fd2bd205 Yet even more images by The Bucketeer! 2019-11-17 20:00:43 +02:00
Yair Morgenstern
1ecc6bbb2a Performance improvement - tile taps and long-clicks are now done at the TileMapHolder level, meaning we can only create one instead of one per tile, massive memory saving! 
Map now zooms with mouse scroll in Desktop!
 2019-11-16 23:02:09 +02:00
lishaoxia1985
70c9d989c6 update (#1337) 2019-11-16 22:38:21 +02:00
Yair Morgenstern
a48c356920 Base image tiles on tiles with improvement images are now grayed out when not visible 2019-11-16 21:15:33 +02:00
Yair Morgenstern
6523d4f124
Update README.md 2019-11-16 20:43:59 +02:00
Yair Morgenstern
223f661267 I think it didn't like the / before the filename? 2019-11-16 20:18:37 +02:00
Yair Morgenstern
f2341bf71f Let's see if Travis handles the new script =) 2019-11-16 20:02:00 +02:00
Yair Morgenstern
8fad2fd680 Removed my dumb plantation art so that The Bucketeer's masterpieces can shine through =D 2019-11-16 19:52:30 +02:00
Yair Morgenstern
dd8f812465 Units &c updated! 2019-11-16 19:42:34 +02:00
Yair Morgenstern
28a1d96e1e Travis should now attach packed .JAR files to each new release 2019-11-16 18:46:17 +02:00
Yair Morgenstern
58e560cbe2 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-11-16 18:45:21 +02:00
Yair Morgenstern
3a4d79c14f Resolved #1336 - can no longer get Settlers from Collective Rule policy when in One City challenge 2019-11-16 18:44:56 +02:00
Yair Morgenstern
0155ded224
Update README.md 2019-11-16 18:41:02 +02:00
Smashfanful
1ffa329ffe Update Nations.json (#1328) 
* Update Nations.json

Changed a couple of lines

* Update Nations.json

Correction
 2019-11-15 15:59:20 +02:00
Yair Morgenstern
215431bf78
Update README.md 2019-11-15 15:25:06 +02:00
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