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

263 commits

Author SHA1 Message Date
Yair Morgenstern
fb768682fe Added more unit icons =) 
Organized tileset image locations
 2019-10-13 11:49:34 +03:00
Yair Morgenstern
538e53883c Added pixel sprites for land and water units! 2019-10-13 11:18:14 +03:00
Yair Morgenstern
e77fdd2993 Polynesia works! 2019-10-11 14:54:08 +03:00
Yair Morgenstern
4da70dfe88 Added polynesia icon and colors 2019-10-11 12:49:07 +03:00
Yair Morgenstern
a8dac82157 Added Moai as part of Polynesian civ - lots of changes to be made for that! 2019-10-11 12:09:22 +03:00
Yair Morgenstern
47db4dce31 Fixed Coastal Raider image 
Puppet cities no longer increase policy costs
 2019-10-01 22:05:38 +03:00
Yair Morgenstern
3abd25c130 Added Thai, although the symbols on top don't seem to render well =( 2019-09-29 12:44:02 +03:00
Yair Morgenstern
dcdf36b153 Added coloring to tech icons themselves (All tech icons are now white) 2019-09-24 17:55:21 +03:00
Yair Morgenstern
a1f5690e41 Added Puppet icon - some reorgnizing still needs to be done in regards to puppet vs annex 2019-09-23 10:46:51 +03:00
Duan Tao
65b8fe531e Duantao/liberate city (#1097) 
* Allow to liberate city to its founder.

* Workaround : Avoid exception on conquering city with infantry unit.

* Liberate button actually works.

* Fix trade resources check.

* Postpone the 2nd part of postBattleActions until choice is made.

* Add puppet option.

* Puppet city cannot be controlled directly.

* Add annex and puppet happiness/culture/science bonus.

* Add courthouse. Icon is missing.

* Icon for courthouse.

* Update png.
 2019-09-23 08:37:53 +03:00
Yair Morgenstern
f4d828d5e4 Finished changing all unit promotion icons! 2019-09-18 22:15:37 +03:00
Yair Morgenstern
04127164bc Added all remaining wonder quotes and more promotion icons 2019-09-17 22:39:08 +03:00
Yair Morgenstern
48ad8f3f88 Got rid of most of the original civ's Promotion icons and replaced with Unciv icons =) 2019-09-15 23:26:20 +03:00
Yair Morgenstern
3084a5bc33 Added Persian civilization 2019-09-15 15:17:56 +03:00
Yair Morgenstern
9665c59782 Changed some border icons to filled icons, which look way better in-game 2019-09-15 14:53:18 +03:00
Yair Morgenstern
d645ae4478 Added Iroquois civilization 2019-09-15 12:13:14 +03:00
Yair Morgenstern
f6323edbc8 Victory screen no longer shows every turn on "one more turn" mode 
Moved Nation jsons
 2019-09-14 23:06:34 +03:00
Yair Morgenstern
eeb1c26ef5 Added Korean civ 2019-09-02 23:44:29 +03:00
Yair Morgenstern
a032269cd9 Resolved #563 - Added American unique B17 and Japanese unique Zero units 2019-09-01 16:35:20 +03:00
Yair Morgenstern
d7cd305e1c Added image for Polish language 2019-08-08 20:57:49 +03:00
Yair Morgenstern
e73ad76227 Resolved #931 - added Barbarian Brute as a replacement to the Warrior 2019-07-21 22:49:04 +03:00
Yair Morgenstern
558bba44cc Added Anti-Aircraft gun unit, and intercept range on non-ranged units 2019-07-19 14:40:29 +03:00
Yair Morgenstern
1ac3cfb74e Added icons for Lasers and Mobile Tactics 2019-07-17 22:03:57 +03:00
Yair Morgenstern
8f30db74ab Added Radar tech and Fighter unit 2019-07-16 22:52:15 +03:00
Yair Morgenstern
d9942aec7c Added all promotions for air units, and a couple for other units that were previously missed 2019-07-11 22:35:22 +03:00
Yair Morgenstern
ab7ce12a87 Resolved #687 - can now place starting locations for specific civs in the map editor 2019-07-07 23:55:43 +03:00
Yair Morgenstern
070d780e18 Unit table now displays range for ranged units 
Air units are ranged units
Moving air units around now works completely!
 2019-07-05 14:27:39 +03:00
Yair Morgenstern
185ec10f10 Can now see when city contains air units 2019-07-03 23:32:17 +03:00
Am-per-Sand
abb8eb8987 add Helicopter icon 
please consider if it is optimal for small screens to call it _Helicopter Gunship_ with 2 words
 2019-07-03 18:36:06 +03:00
Am-per-Sand
aebbb6f505 added air icons set 
May be turns out handy one day.

Post your opinion below. However I promise to introduce corrections only after I will have seen them in game. Earlier it's hard to say if the images are crisp enough or not.

_Based on antique catalogue photos and public domain works by US military employees, so I release the to public domain too._

Zero chasing B-17:
![https://raw.githubusercontent.com/Am-per-Sand/saves/master/B%2017%20blue%20Zero%20red.png](https://raw.githubusercontent.com/Am-per-Sand/saves/master/B%2017%20blue%20Zero%20red.png)
 2019-07-03 18:36:06 +03:00
Yair Morgenstern
c517dd9d64 Added the Ottomans! #703 2019-06-25 23:00:55 +03:00
Yair Morgenstern
a1e1b91b9a Added Civ icon to cities 
Improved City Connection icon
 2019-06-19 20:13:32 +03:00
Yair Morgenstern
a6d1cdc398 Unified civ display in Overview and Victory screens 2019-06-19 19:20:25 +03:00
Yair Morgenstern
227f6627be Resolved #883 - Added Civilization icons 2019-06-19 18:43:25 +03:00
Yair Morgenstern
b2afc838a6 Resolved #533 - Added nation-dependant start location biases 2019-06-17 12:51:57 +03:00
Yair Morgenstern
89020c8916 Removed ThorfMaps tiles - were much uglier than the other 2 tilessets and unneccesary 2019-06-12 22:00:35 +03:00
Yair Morgenstern
4b4f5e77b8 Resolved #646 - Barbarians now spawn from Encampments! 2019-05-31 17:36:19 +03:00
Am-per-Sand
8b15535eb7 War Chariot icon retouched 
hope it doesn't break commit history, or...
 2019-05-28 22:54:24 +03:00
Yair Morgenstern
1bb62ad681 Civs respond according to neutral/hate and respond properly after peace 2019-05-26 18:32:19 +03:00
Amper-sandd
af19d8a1b0 add Indian assets (#800) 
* War Elephant icon

* Mughal Fort icon

* credits for Indian unique icons

* bonuses for Castle apply to Mughal Fort too

* getCityHappiness() complies with the Indian unique

* getCityHappiness() complies with the Indian

missing bracket 🙄
 2019-05-23 21:50:46 +03:00
Yair Morgenstern
fd4123e15f City state icon in city button now visible and colored according to city-state color 2019-05-20 22:22:16 +03:00
Yair Morgenstern
8ce1613559 Resolved #698 - Added Heal Instantly 'promotion' 2019-05-08 16:03:01 +03:00
Duan Tao
1434ca3f30 Update city-state related icons and popups. 2019-05-08 13:32:23 +03:00
Yair Morgenstern
89902bef95 Added Medic, Medic II promotions - #698 2019-05-06 23:01:28 +03:00
Am-per-Sand
024bad9b5a added Hanse building icon 
silhouette from own photo of [Artus Court](https://en.wikipedia.org/wiki/Artus_Court)
 2019-05-06 20:09:23 +03:00
Am-per-Sand
148d55c4db added unit icons for German uniques 2019-05-06 20:09:23 +03:00
Yair Morgenstern
9e03893e60 Added Woodsman promotion - #698 2019-05-05 23:22:59 +03:00
Brian Gainor
d527ccf90e Fix spelling of colosseum 2019-05-04 21:29:02 +03:00
Am-per-Sand
c19be603f2 new Cossack icon 2019-04-22 12:33:23 +02:00
Duan Tao
1a6fe1a397 Merge branch 'dev/main' into BigBen 2019-04-15 19:59:03 +08:00
Yair Morgenstern
c3bfed1bd1 Added Legion unique unit - #563 2019-04-12 14:30:53 +03:00
Yair Morgenstern
e3dcd4cb43 Added Cossack unique unit - #563 2019-04-12 14:02:15 +03:00
Yair Morgenstern
dc2f88765b Added Foreign Legion unique unit - #563 2019-04-12 13:33:59 +03:00
Yair Morgenstern
a969c8f479 Added Ship of the Line unique unit - #563 2019-04-12 09:18:01 +03:00
Am-per-Sand
b00b432bb3 War Chariot 
100x100 white on grey transparent
 2019-04-11 20:19:24 +02:00
Yair Morgenstern
6af749b77b Added Walls of Babylon unique building 
Added Chu-Ko-Nu unique unit
 2019-04-09 23:31:16 +03:00
Yair Morgenstern
7fa24a8f17 Added Neuschwanstein wonder - part of #245 2019-04-09 16:27:12 +03:00
Yair Morgenstern
472c370c8f Added Terracotta Army wonder - part of #245 2019-04-08 22:36:50 +03:00
Yair Morgenstern
86ed7c2ec3
Merge pull request #632 from Am-per-Sand/master 
Machu Picchu deresoluted
 2019-04-08 08:51:56 +03:00
Am-per-Sand
28a63d8170
Machu Picchu deresoluted 
Enlarged building to be more distinct on large screens in small scale
 2019-04-07 22:32:28 +02:00
Yair Morgenstern
3c3c81fd88 Added Himji Castle wonder - #245 2019-04-07 20:23:57 +03:00
Yair Morgenstern
9a0baf028e Added Colossus wonder - #245 2019-04-04 16:07:16 +03:00
Yair Morgenstern
12719c1e0e Added Great Wall wonder 2019-03-29 15:17:58 +03:00
Yair Morgenstern
9b7a796a03
Merge pull request #597 from Am-per-Sand/master 
Frigate <-> Caravel icons swap
 2019-03-22 00:59:12 +02:00
Yair Morgenstern
dddda38d57 City tiles no longer show "ground" area 2019-03-21 23:59:02 +02:00
Am-per-Sand
e3a589ffb4
Frigate <-> Caravel icons swap 2019-03-21 15:21:03 +01:00
Am-per-Sand
36ead7a569
Delete Frigate.png 2019-03-21 15:19:17 +01:00
Am-per-Sand
c6ca334271
Delete Caravel.png 2019-03-21 15:19:07 +01:00
Yair Morgenstern
775055902f Continuation of #590 - "Machu Picchu" instead of "Machu Pichu" 
Changed info in saved games to fit the change
 2019-03-21 12:53:41 +02:00
Yair Morgenstern
3f6dead4c6
Merge pull request #590 from Am-per-Sand/master 
"Machu Picchu" typo
 2019-03-21 12:30:24 +02:00
Am-per-Sand
d16322d494
Delete Machu Pichu.png 2019-03-20 18:54:40 +01:00
Am-per-Sand
f83eed0d08
new wonder icon 
Machu Picchu correct
 2019-03-20 18:54:07 +01:00
Yair Morgenstern
973cfd50a2 Added different city tiles for different locations 2019-03-20 15:15:55 +02:00
Yair Morgenstern
a52bc2776c Added Jungle tiles to FantasyHex tileset! 2019-03-20 13:06:18 +02:00
Yair Morgenstern
1d88e76452 Split map into layers for base image, features, overlays, and fog 
Added Marsh and Lakes images
IT LOOKS SO GOOD NOW DAMN
 2019-03-20 12:09:54 +02:00
Yair Morgenstern
fe9fc110d8 Added tile feature tiles to tilesets! 2019-03-20 11:06:08 +02:00
Yair Morgenstern
9d5c6911fd Added a tileset for Thorm maps - beutiful stuff but doesn't zoom in well, hope I'll be able to find a more HQ version of this type 2019-03-19 23:13:46 +02:00
Yair Morgenstern
d6f3ab3f40 Fantasy hex tileset is go! 2019-03-19 18:35:58 +02:00
Yair Morgenstern
21377f63e7 Added Tilesets, for alternative tile images - this could be big! 
Options table is now a table, not a list - more room for future options
 2019-03-19 17:09:51 +02:00
Lliam Leosh
32fbabdd19 "Replacable Parts" is now "Replaceable Parts" 2019-03-14 02:55:22 -05:00
Yair Morgenstern
9e5d6d3c75 Resolved #469 - AI Great General tries to maximize effect on troops 2019-03-02 22:53:30 +02:00
Yair Morgenstern
58e38ea634 Added Japan civ! 
Some units now recieve promotions when created/upgraded to, as per Civ V
 2019-03-02 21:27:35 +02:00
Yair Morgenstern
f3cbeb5ca4 Resolved #123 - Added final units - Modern Armor, Rocket Artillery and Mechanized Infantry! 2019-02-28 23:45:21 +02:00
Yair Morgenstern
3ae5662c32 Added everything needed for Modern Armor 2019-02-22 10:54:07 +02:00
Yair Morgenstern
53664ec043 Added Kremlin wonder 2019-02-22 10:27:47 +02:00
Yair Morgenstern
e200e9026f Text for strength, movement and ranged strength in unit tablee replaced with icons - table is now consistently much smaller, and much less bothersome! 2019-02-14 22:49:46 +02:00
Yair Morgenstern
0fab01e393 Tile map now pans to chosen tile, instead of "flashing" there - makes the map feel more connected and helps you understand where you are IMHO 2019-02-14 22:21:26 +02:00
Yair Morgenstern
7497ffd3b6 Added Combined Arms tech with Tank, Anti-Tank Gun units and Pentagon wonder 
Tech tree rearrangement - now much closer to original G&K tree
 2019-01-26 23:08:20 +02:00
Yair Morgenstern
e16bb2b8a7 Added Tank, Anti-Tank Gun units 2019-01-16 23:15:02 +02:00
Yair Morgenstern
e573368d18 Added CN Tower, Pentagon #245 2019-01-16 22:24:29 +02:00
Yair Morgenstern
eeaca08f57 Added Alhambra #245 2019-01-16 21:45:46 +02:00
Yair Morgenstern
49ed7570f8 Added Hubble Space Telescope wonder, Stable unique ability 
Added missing translations
 2019-01-16 21:26:14 +02:00
Yair Morgenstern
2df64861d1 Added Infantry, Machine Gun units 
Added Railroad, Ballistics techs
Added Statue of Liberty wonder
 2019-01-15 22:17:34 +02:00
Yair Morgenstern
c282ffb423 Resolved #410 - land units on lake aren't shown as embarked 2019-01-08 15:43:54 +02:00
Yair Morgenstern
eeb494364b Resolved #407 - Add pillaging terrain improvements 2019-01-07 21:56:02 +02:00
Duan Tao
ed96534d34 Fix paper maker icon 2018-12-31 19:56:28 +08:00
Duan Tao
de5610180f Add WaterSubmarine unit type. 2018-12-31 19:42:20 +08:00
Duan Tao
c3e8563bf2 Add great general unit. 2018-12-26 18:06:36 +08:00
Yair Morgenstern
2923dc80c9 Massive performance improvement thanks to: 
* not mapping out the uniques every tile
* saving tech uniques and units uniques specific to movement between tiles
 2018-12-17 21:33:07 +02:00
Yair Morgenstern
94fd43f422 Added icon for lakes 
Added more sound effects
Added Leaning Tower of Pisa
 2018-12-17 19:00:45 +02:00
Yair Morgenstern
f5c8b28d82 Organized Modern Era techs 
Free techs are added like regular techs - with all the abilities and notifications thereof
 2018-12-17 10:49:13 +02:00
Duan Tao
209eb4c73b Add submarine and refrigeration. Submarine is not invisible yet. 2018-12-12 13:23:29 +08:00
Duan Tao
2edb566078 Add Battleship. Enabled Electronics for battleship. 2018-12-11 16:26:29 +08:00
Yair Morgenstern
63f1f501cd Added Hoplite (Greek unique unit) and Rome's unique ability 2018-12-10 22:31:03 +02:00
Yair Morgenstern
41df61c92e GAH chinese turned out to be a NIGHTMARE but it looks like it's finally done! 2018-12-10 11:19:35 +02:00
Yair Morgenstern
70d6697f16 Added icon for simplified chinese, missing character for Portuguese, ancient ruins no longer appear on impassible tiles 2018-12-10 11:04:40 +02:00
Yair Morgenstern
0a5ba19c6d Translation update: more things are translated, more are translatable, translation function moved 2018-12-07 11:24:55 +02:00
Yair Morgenstern
01ece11185 Added Camel Archer, Arabian unique unit 2018-12-06 23:08:11 +02:00
Yair Morgenstern
6672b9e7bd Added Minuteman, American unique, and England special ability 2018-12-06 22:02:03 +02:00
Yair Morgenstern
9b07120080 Added Destroyer, late-game naval melee unit 
Caravel upgrades to ironclad
 2018-12-06 15:47:35 +02:00
Yair Morgenstern
e53f8d8933 Merge branch 'master' of https://github.com/yairm210/UnCiv 2018-12-06 11:41:49 +02:00
Duan Tao
fbfde0d9fb Add resistance icon. 2018-12-06 14:44:18 +08:00
Yair Morgenstern
67625321b8 Great merchant trade mission gold increases with era (as per original civ) 
Added Great People actions translations
 2018-12-05 13:48:23 +02:00
Duan Tao
f1c27ca0ea Add icon for aquirable tiles in city screen. 2018-12-05 15:13:06 +08:00
Yair Morgenstern
53bac34b42 Added Gatling Gun unit 
Cannon upgrades to Artillery
 2018-12-03 16:00:29 +02:00
Yair Morgenstern
24b27a791f Added Replacable Parts tech and Great War Infantry 
Musketman now upgrades to Rifleman
Solved more rare concurrency problems
 2018-12-02 23:05:05 +02:00
Yair Morgenstern
28ae533acc Added Landship, the first Armor unit! 
Added promotions for Armor units
 2018-12-02 15:46:45 +02:00
Yair Morgenstern
288875ae4f Changed icons for jungle, flood pains and marsh 2018-12-02 11:28:15 +02:00
Yair Morgenstern
ce9d68e375 Hopefully the yield in the city screen looks better now 
Added mountains
 2018-11-28 23:05:14 +02:00
Yair Morgenstern
6096bde9cd Changed Forest icon 
Narrowed hexagon edges
 2018-11-27 21:51:52 +02:00
Yair Morgenstern
5b66f8f0f7 Organized Unit Table UI 2018-11-23 14:36:22 +02:00
Yair Morgenstern
0a0b664dfe Specialists work again! =D 2018-11-12 21:54:11 +02:00
Yair Morgenstern
62ef51f38e Added Navigation tech with Seaport building and Frigate unit 
Water maps are out of beta and are now default!
 2018-11-12 13:05:42 +02:00
Yair Morgenstern
5ef5ff572e Added Ironclad unit 2018-11-12 11:21:00 +02:00
Yair Morgenstern
a7694867d0 Population is assigned/unassigned in cities by clicking on the tile, not just the population symbol 2018-11-06 22:49:40 +02:00
Yair Morgenstern
c8285b9b0a Added new Targeting, Coastal Raider, Bombardment, Boarding Party promotions for naval units, and opened up older promotions for them 2018-11-04 20:07:54 +02:00
Yair Morgenstern
73d0a7cf72 Added Sydney Opera House 2018-11-04 18:43:36 +02:00
Yair Morgenstern
937687a0f4 Steam Power and Astronomy now increase embarked units' movement 2018-11-04 13:07:03 +02:00
Yair Morgenstern
fb2538524a Tile info now dispays which civ each unit belongs to 
Embarked units marked on map with different shaped background
 2018-11-04 13:06:16 +02:00
Yair Morgenstern
52e9e35853 Removed unused fog/crosshatch images 2018-11-03 20:01:29 +02:00
Yair Morgenstern
3958ed3cdb Fixed Ecology image 
World screen now also displays icons of tech results
 2018-11-03 19:49:05 +02:00
Yair Morgenstern
8b12b80f34 Fixed images of Burial Tomb and Paper Maker 
Techs now display little icons of their effects
 2018-11-03 19:19:30 +02:00
Yair Morgenstern
eb9ae392d3 Added Monastery and Solar Plant icons, which were missing 2018-11-02 14:53:20 +02:00
Yair Morgenstern
3655e07614 Added Caravel unit 2018-11-02 13:52:37 +02:00
Yair Morgenstern
abc3bfcae8 Added Galleass, first ranged water unit! 2018-11-02 12:49:41 +02:00
Yair Morgenstern
324239b3e6 Typo fix: dicipline -> discipline 2018-10-28 15:06:55 +02:00
Yair Morgenstern
45e5f82478 Added Compass tech and Harbor building 2018-10-28 14:33:42 +02:00
Yair Morgenstern
9c36ae0c6b Added The Great Lighthouse 2018-10-19 15:11:14 +03:00
Yair Morgenstern
dea7775be5 Added Optics and Lighthouse 2018-10-16 21:13:29 +03:00
Yair Morgenstern
c1e070018f Added Triremes and water combat! 2018-10-15 22:57:33 +03:00
Yair Morgenstern
1111a23c14 Added Fish, Pearls and Whale resources, Work Boats unit, Sailing tech and Fishing Boats impovement 2018-10-11 23:03:31 +03:00
Yair Morgenstern
64359a794e Added random land\sea division using Perlin noise 
Can now divide undecided parts of maps into random terrain regions
 2018-10-11 13:00:23 +03:00
Yair Morgenstern
50c2ad4573 Added America civ 2018-10-04 23:33:08 +03:00
Yair Morgenstern
4280df329f Added all tech icons 2018-10-04 23:15:47 +03:00
Yair Morgenstern
a8bb9f53b7 Added medieval tech icons 2018-10-03 23:03:53 +03:00
Yair Morgenstern
8c7e8437ec Added tech icons for ancient & classical technologies 2018-09-30 00:24:09 +03:00
Yair Morgenstern
fdd9481535 Fog is now done using crosshatching - maybe it looks better, hard for me to tell. 2018-09-23 15:27:38 +03:00
Yair Morgenstern
7b2bf48e04 Added City Ruins when a city is razed (no effects, just game flavour) 2018-09-23 11:03:03 +03:00
Yair Morgenstern
c1e6c8e894 Added "Sleep" action for units that can't fortify 
Added tutorial after constructing the apollo program
 2018-09-16 13:58:35 +03:00
Yair Morgenstern
68b64ca66f Added Honor and Autocracy policies 2018-09-05 17:17:30 +03:00