Commit graph

213 commits

Author SHA1 Message Date
Yair Morgenstern
006b2d7690 External merge resolve of #1566
Merge branch 'spain' of https://github.com/r3versi/Unciv into r3versi-spain
2019-12-29 17:56:05 +02:00
Yair Morgenstern
4dd3a69a72 Can now display pixel resources on the map! 2019-12-29 17:51:39 +02:00
Yair Morgenstern
050db70fff All nat wonders are go, courtesy of The Bucketeer! 2019-12-29 15:55:53 +02:00
Yair Morgenstern
eac9647829 Bahasa_Indonesia -> Indonesian, for uniformity among languages names 2019-12-26 14:52:16 +02:00
Yair Morgenstern
94f1b074c9 Indonesian is in and has a flag 2019-12-26 12:15:26 +02:00
Yair Morgenstern
3dfc6503a1 Mount Fuji artwork by The Bucketeer means it's now in the game! 2019-12-25 13:01:29 +02:00
Yair Morgenstern
97f3260047 Grand Mesa artwork by The Bucketeer means it's now in the game! 2019-12-24 15:28:59 +02:00
r3versi
c2dc0217b6 Rejuvenation icon + Unique promotions are listed in PromotionPickerScreen (#1506) 2019-12-22 15:29:40 +02:00
Yair Morgenstern
77d00f35bb Translation files now take a huge amount of time to load, moved their loading into a thread and put up a "loading screen" beforehand 2019-12-18 22:24:18 +02:00
Kevin Fisher
52111430ef Add close icon for the UnitTable (#1472) 2019-12-17 21:44:20 +02:00
Yair Morgenstern
486dba97df Added first images for resources - not implemented yet! 2019-12-17 14:25:28 +02:00
Yair Morgenstern
0de84e60a9 Not all Natural Wonders look good enough to enter the game as-of-now. 2019-12-17 14:23:17 +02:00
r3versi
aa02a2d321 Natural Wonders (#1456)
* NaturalWonders initial commit
* Created models/ruleset/tile/NaturalWonder and assets/json/NaturalWonders
* MapGenerator now spawns NaturalWonders in random compatible random locations
* MapParameters has a noNaturalWonders option
* TileInfo has naturalWonder property (set to null if none)
* TileInfo and  UnitMovementAlgorithms correctly manages stats and consider the tile unpassable and unimprovable

* Notification and happiness on NaturalWonder discovery

* El Dorado discovery bonus, Spain unique

* Doubled tile yields for Spain

* NaturalWonders implemented as TerrainType + Fountain of Youth promotion

* Images issue #124

* NaturalWonder TileImages (Fantasy) and Overlay (Default)

* NaturalWonderOverlay.png : https://www.flaticon.com/free-icon/mount-fuji_2166259

* Bugfix

* Added translations

* Italian translations

* Fix translation issue
* missing space after = in template.properties breaks translations

* Improved NaturalWonder spawn logic

* Great Barrier Reef spawns on 2 contiguous tiles
* Each wonder has specific spawn requirements
* Number of wonders spawned scales with map radius

* Fix unused import
2019-12-16 20:37:49 +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
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
Yair Morgenstern
5907d02403 Oil well images split into Coast and not-Coast 2019-11-26 20:46:53 +02:00
Yair Morgenstern
a8c98f60d7 Railroads are now much more visible! 2019-11-23 22:43:35 +02:00
Yair Morgenstern
62fd7d8588 Desktop Unciv now sends status to Discord!
Basically stole the Discord RPC implementation outta Mindustry
2019-11-21 16:24:27 +02:00
Yair Morgenstern
b1868accc5 Nuclear Weapon setting moved to Options, s it can be more easily explored by players 2019-11-19 22:00:16 +02:00
Duan Tao
111030e457 Nuke your enemy! (#1318)
* Nuke your enemy!

* Fantasy tiles. Worker automaticly clears fallout.

* Some AI improvement for choosing wonder and military unit.

* Add nuclear weapon option.
2019-11-19 08:43:04 +02:00
Yair Morgenstern
9533a35d15 3.2.4 2019-11-18 22:00:44 +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
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
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
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
827bf3d4b2 Images update! By The Buketeer again! 2019-11-15 14:28:46 +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
e21d7eb54a We can now have "layered" images for the base tile, such as grassland + manufactory! 2019-11-14 21:01:24 +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
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
Yair Morgenstern
e1350cdb05 separated whiteDot for images from TableBackground for backgrounds 2019-11-08 15:42:19 +02:00
Yair Morgenstern
f6d2143ff6 Fixed weird resizing bug - #1304, thanks @ninjatao! 2019-11-06 19:25:02 +02:00
dic1911
1b1c7228a6 Replace Traditional Chinese flag icon (#1298)
* 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
2019-11-05 13:01:09 +02:00
Yair Morgenstern
57b0040df7 Added Siam civ - #703 2019-11-03 23:22:49 +02:00
Yair Morgenstern
791439397e Added Brandenburg Gate wonder - #643
Fixed translation bugs
2019-11-02 23:08:55 +02:00
Yair Morgenstern
6a46af4f88 Can no longer create great improvements on water or unbuildable tiles (like Oasis) 2019-10-28 21:00:08 +02:00
Yair Morgenstern
c77d570381 Added Customs House tiles 2019-10-27 22:15:20 +02:00
Yair Morgenstern
ef0c39ac93 More tile changes 2019-10-23 23:39:12 +03:00
Yair Morgenstern
318dbb2a6d Added tiles with visiable improvements, since not all improvements and combinations are ready this is behind a menu option 2019-10-23 21:56:23 +03:00
Yair Morgenstern
062d1d34ce Czeck -> Czech icon, obviously 2019-10-22 19:31:28 +03:00
Yair Morgenstern
f400a03358 Renamed "Immortal" to "Persian Immortal" because of the conflict in naming between the unit and the difficulty
Also, changed existing units of Immortal or with Range promotion
2019-10-22 19:25:58 +03:00
Yair Morgenstern
965217d95c Undid "Immortal" name change
Fixed json errors
Added Korean and Czech flags
2019-10-21 23:23:38 +03:00
lishaoxia1985
362c67e348 1. rename the unit "Immortal" and the Promotion "Range" 2. fix the korean translation, it lost a ("). (#1216)
* update

* update

* update

* update

* update

* update

* update

* range extension
2019-10-21 23:00:36 +03:00
Yair Morgenstern
33805ca6f8 Organized TileGroup icons (for improvements, resources and units) into a separate class 2019-10-17 00:05:10 +03:00
Yair Morgenstern
14cbe9e21d Even more pixel images!
Added Pillaging tutorial
2019-10-15 16:00:07 +03:00
Yair Morgenstern
e2459c06fc More unit icons 2019-10-15 10:52:21 +03:00
Yair Morgenstern
35a96dbed4 Bonus and Luxury resources are spread out evenly over the map 2019-10-14 23:00:55 +03:00
Yair Morgenstern
5473afbecf Added icons for the major unit types 2019-10-13 14:06:18 +03:00