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

223 commits

Author SHA1 Message Date
Yair Morgenstern
90318ef93b Tech reorg - added Lasers and Mobile Tactics, tech tree is now almost 100% G&K 2019-07-17 22:21:05 +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
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
Yair Morgenstern
c517dd9d64 Added the Ottomans! #703 2019-06-25 23:00:55 +03:00
Yair Morgenstern
227f6627be Resolved #883 - Added Civilization icons 2019-06-19 18:43:25 +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
Yair Morgenstern
1bb62ad681 Civs respond according to neutral/hate and respond properly after peace 2019-05-26 18:32:19 +03:00
Yair Morgenstern
7e6b102f27 Merge branch 'roadOnLongClick' 2019-05-23 22:21:46 +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
Yair Morgenstern
cf2580b8ed Solved #670 - civ starting locations are given as much space as possible 2019-05-06 20:46:48 +03:00
Yair Morgenstern
9e03893e60 Added Woodsman promotion - #698 2019-05-05 23:22:59 +03:00
Duan Tao
fc4f62f555 City state icon. 2019-05-05 16:20:23 +03:00
Brian Gainor
d527ccf90e Fix spelling of colosseum 2019-05-04 21:29:02 +03:00
Yair Morgenstern
cefd50ea57 Trade table logic greatly simplified, now all trade displays are dependent only on the current trade in the TradeLogic - this paves the way for "inserting" trades into the trade table, which is required for AI-offered trades! 2019-04-20 22:44:18 +03:00
Duan Tao
18c612dc14 Update assets. 2019-04-15 20:02:44 +08:00
Duan Tao
1a6fe1a397 Merge branch 'dev/main' into BigBen 2019-04-15 19:59:03 +08:00
Duan Tao
70241ac25b Add Big Ben. 2019-04-15 19:46:15 +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
a969c8f479 Added Ship of the Line unique unit - #563 2019-04-12 09:18:01 +03:00
Yair Morgenstern
646f430636 Added War Chariot unique unit - #563 2019-04-11 23:16:14 +03: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
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
dddda38d57 City tiles no longer show "ground" area 2019-03-21 23:59:02 +02: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
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
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
a371aedf23 Changes to city screen - city summary in top-left corner like original 2019-01-19 21:01:47 +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
2fdd3e2628 Fixed #402 - couldn't build wonder if it was being built by a rival civ 2019-01-08 18:43:06 +02:00
Yair Morgenstern
eeb494364b Resolved #407 - Add pillaging terrain improvements 2019-01-07 21:56:02 +02:00
Yair Morgenstern
b776bd777c Google suspended the app because of "Impersonation" violation =( 
Changed library name from com.unciv.game to com.unciv.app for app change
 2019-01-02 22:07:47 +02:00
Duan Tao
19ce158ccb Update wolfpack bonus, icons. 2018-12-31 19:58:24 +08:00
Yair Morgenstern
8ad37530b2 Solved another 2 rare concurrency problems - CityInfo.workedTiles and CityInfo.tiles are not edited directly but switched out 2018-12-30 20:40:48 +02:00
Duan Tao
7478215353 Add great general generation, overview screen and free pickup. 2018-12-26 18:42:22 +08:00
Yair Morgenstern
6bdd0da3ea Notifications are now per-civ instead of game-wide, in preparation for multiplayer 
Added player type to civinfo, in preparation for multiplayer
 2018-12-18 18:57:13 +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
Yair Morgenstern
d1c7117c54 Mountains no longer appear in ranges - caused untenable starting positions 
Lakes now appear randomly!
 2018-12-14 13:46:52 +02:00
yairm210
ac241d2744
Merge pull request #334 from ninjatao/add_battleship 
Add Battleship. Enabled Electronics for battleship.
 2018-12-13 12:21:45 +02:00
Yair Morgenstern
9e8930c263 Multiple promotions with the same effect (e.g. Barrage I and II) will now both activate - kudos Philn3v! 2018-12-12 23:05:14 +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
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
a01173261c Upgraded Gradle to 4.6 (from 3.3) 2018-12-02 13:05:29 +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
ea68a70823 Solved concurrent modification problems from TechManager.researchedTechnologies and civInfo.exploredTiles 2018-11-27 22:48:41 +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
02b0f6e9fe Code organization - separated TechButton and IconCircleGroup to separate files &c 
Tech with special abilities now displayed with a star icon
 2018-11-04 18:42:55 +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
abc3bfcae8 Added Galleass, first ranged water unit! 2018-11-02 12:49:41 +02:00
Yair Morgenstern
0f4accb5a4 Added "missing translations" menu in display options, so translators can see which texts have not yet been translated in their language 2018-10-28 15:23:35 +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
7e6fa0e895 Fixed gold tile cost bug 2018-10-05 00:00:50 +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
Yair Morgenstern
03029e8b99 Replaced all policy icons! 2018-08-31 11:40:25 +03:00
Yair Morgenstern
056a428376 Added secondary colors for civs - applies to units, cities, minimap, and more! 2018-08-30 23:54:33 +03:00
Yair Morgenstern
2605ce6b71 Once a unit has gained more than 30 XP it won't gain XP from barbarians 
AI units now always unfortify/unsetup after moving
 2018-08-30 22:13:07 +03:00
Yair Morgenstern
17e440d557 Added building icons! 
There are now images of the current construction in the construction picker screen, the city screen and the world map!
 2018-08-29 14:03:18 +03:00
Yair Morgenstern
bd4e358bd8 Added ALL Building icons!!! 
We will no longer get errors when adopting a policy that puts things near our capital if we don't have a capital (why would you do this? I dunno but people have!)
 2018-08-29 12:36:58 +03:00
Yair Morgenstern
40db822a79 Finished off promotions, adding Formation I, Formation II, Blitz, Logistics, Mobility, and Volley promotions 2018-08-28 12:12:14 +03:00
Yair Morgenstern
b983de9599 Stat icon organization 2018-08-28 10:52:48 +03:00
Yair Morgenstern
5d4c8a618d Replaced all resource and improvement icons! 
AI disables city raze on capture/buying cities
 2018-08-28 10:35:56 +03:00
Yair Morgenstern
5d3c7a3a5e Replaced city connection icon, luxury resources now have a smiley next to them and strategic resources have a production symbol 2018-08-27 17:17:14 +03:00
Yair Morgenstern
4fd9ac0f38 Added musketeer unique unit for France 2018-08-23 08:43:14 +03:00
Yair Morgenstern
b1e17a67c6 Added Range, Sentry, Siege and Indirect Fire promotions 
Units now get experience when capturing a city
 2018-08-16 08:52:29 +03:00
Yair Morgenstern
fee0b718ec Shrunk game size by 15% by including the images only when packed 2018-08-13 08:56:15 +03:00
Renamed from android/assets/Images/game.atlas (Browse further)