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

321 commits

Author SHA1 Message Date
Yair Morgenstern
24a71b16f2 Trade button changed to "Negotiate Peace" when at war, and peace treaties are a must when "trading" in this situation 2019-05-11 23:32:12 +03:00
Yair Morgenstern
89902bef95 Added Medic, Medic II promotions - #698 2019-05-06 23:01:28 +03:00
Yair Morgenstern
9e03893e60 Added Woodsman promotion - #698 2019-05-05 23:22:59 +03:00
Yair Morgenstern
cdfdbb40b8 More massive performance boosts 2019-05-03 16:59:46 +03:00
Yair Morgenstern
827d24c778 Resolved #694, and another crashing bug 2019-05-02 23:06:34 +03:00
Yair Morgenstern
e8f27c4ef4 Diplomacy is ready to be unleashed upon the unsuspecting public! 2019-05-02 00:11:32 +03:00
Yair Morgenstern
d5b247e2c1 Human players can no longer see each other's construction info 2019-04-29 00:36:08 +03:00
Yair Morgenstern
292297e02d Resolved #685 - loading game would clear resistance counters 2019-04-27 23:36:35 +03:00
Yair Morgenstern
d8c238bf97 Added a popup for people who try to create a game and fail 2019-04-24 21:14:53 +03:00
Yair Morgenstern
5d8d7ca89b AI can now offer you trades - this is a big step towards proper diplomacy relations! 
As of now they only offer luxury-to-luxury trades
 2019-04-23 17:07:01 +03:00
Yair Morgenstern
4576056b9f Number of strategic resources now directly dependant on the number of settlable land tiles 2019-04-17 20:34:03 +03:00
Yair Morgenstern
089f8ac49f "Map Editor" button now takes the current map to edit 2019-04-14 22:33:19 +03:00
Yair Morgenstern
dc2f88765b Added Foreign Legion unique unit - #563 2019-04-12 13:33:59 +03:00
Yair Morgenstern
06b44140b8 Resolved #603 - Move unit icons back above city label 2019-04-09 16:49:24 +03:00
Yair Morgenstern
e7f99975eb Resolved #610 - map generation assigns a set amount of each Strategic resource, which are spread across the map 2019-04-07 23:16:57 +03:00
Yair Morgenstern
e93ed68a2b Icons for units replaced by civ unique units are no longer shown in tech button 2019-04-02 21:53:36 +03:00
Yair Morgenstern
89a720f7b2 Cities now only take ownership of _unowned_ tiles around them 2019-04-01 22:38:36 +03:00
Yair Morgenstern
9eb9176b2a Units & buildings requiring resources or other needs are now displayed, but not selectable, from the city screen as constructions 2019-03-29 18:03:18 +03:00
Yair Morgenstern
e43c22a74b Apparently .replaceAll is incompatible with Android 5.1, but hey who needs them. 2019-03-24 20:27:00 +02:00
Yair Morgenstern
bba6f43943 Changed "Combat Unit" to Military Unit" for naming consistency 2019-03-23 22:04:50 +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
d6f3ab3f40 Fantasy hex tileset is go! 2019-03-19 18:35:58 +02:00
Yair Morgenstern
10d098b9de 2.13.14 2019-03-14 22:29:25 +02:00
Yair Morgenstern
81b29a5b57 Resolved #551 - Update city stats on production change 2019-03-12 19:24:50 +02:00
Yair Morgenstern
42ca98efd2 Gave up on the idea of the attack button - if the enemy moves we need to remove the button, and it's actually very difficult to determine this. 2019-03-10 23:27:19 +02:00
Yair Morgenstern
2ec8225c20 Resolved #384 - can now sell one building per city per turn 2019-03-08 13:45:12 +02:00
Yair Morgenstern
afaf4ae6da Resolved #508 - Missing and bad translations 2019-03-05 22:18:57 +02:00
Yair Morgenstern
0ef11e12cd Resolved #491 - Once Honor has been adopted, gain Culture when you kill a barbarian unit 2019-03-03 23:05:12 +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
3432f9b8c1 Rendering performance improvements - much smoother scrolling! 2019-02-27 20:17:27 +02:00
Yair Morgenstern
6cda5bb8ad Fixed #467 - popups on separate screens affected each other 2019-02-24 13:07:34 +02:00
Yair Morgenstern
80dd4c759b Added percentage bonuses to city stats drilldown 
Fixed happiness drilldown display in city screen
 2019-02-19 22:45:52 +02:00
Yair Morgenstern
df237d8686 Fixed #457 - AI naval units would fortify 2019-02-18 20:46:50 +02:00
Yair Morgenstern
6de517d4d5 Separated battle table height from the height of the tile and unit tables 2019-02-14 23:12:35 +02:00
Yair Morgenstern
ee55839557 Fixed minor problem with Egypt's neutral "let's hear it" responses 
Current construction in city better represented
 2019-02-13 19:02:11 +02:00
Yair Morgenstern
748e84f265 Resolved #449 - added "go to unit" button in unit overview 2019-02-11 22:07:34 +02:00
Yair Morgenstern
0788141054 Civs now have unique responses for introduction, greeting, trade acceptance and refusal 2019-02-11 20:46:49 +02:00
Yair Morgenstern
10e9a5e481 AI units much more cautious when attacking cities - only enter city bombard range if there's a good chance of capturing the city 
#416
 2019-02-09 21:31:16 +02:00
Yair Morgenstern
6856301504 Resolved #446 - Buildings are now created when production is completed by Great Engineers, so production of the current turn can be added to the next construction 2019-02-05 20:04:07 +02:00
Yair Morgenstern
81d1a79e19 Can now choose a map name and load a map from those existing on the phone! 2019-02-02 23:26:56 +02:00
Yair Morgenstern
8038dd4c4f Separated "Group to hold visual map based on tilegroups" to a separate class, for reuse in CityScreen, the future map editor, and maybe also in the minimap 2019-01-29 21:48:23 +02:00
Yair Morgenstern
653cb556cf Fixed errors caused by siege unit's movement points not being calculated correctly 2019-01-27 23:38:11 +02:00
Yair Morgenstern
478a9e6996 Resolved #429 - display era names only once in tech picker screen 2019-01-23 20:52:26 +02:00
Yair Morgenstern
9ba73c4a6f No height difference between hills and hills with jungle/forest 2019-01-21 23:10:03 +02:00
Yair Morgenstern
fa8f9deb2c Solved #420 - viewable tiles not updated when trading cities, kudos zivvel! 2019-01-19 23:49:46 +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
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
ee278586e7 Solved #413 probable (ANR trying to load super-huge autosave game) by disabling the update() in the initialize, instead setting shouldUpdate to true by default so it'll update in the rendering thread 2019-01-14 21:57:09 +02:00
Yair Morgenstern
53c5c6d5ab Can now choose to start a game with multiple human players! 2019-01-14 20:48:30 +02:00
Yair Morgenstern
d19861b348 Maybe solved an ANR caused by resume(), it's hard to tell 2019-01-10 20:43:32 +02:00
Yair Morgenstern
eeb494364b Resolved #407 - Add pillaging terrain improvements 2019-01-07 21:56:02 +02:00
Yair Morgenstern
567786c125 Resolved #399 - lakes act differently than in original game 2019-01-06 22:41:03 +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
Yair Morgenstern
28b52784bf Uranium revealing tech changed to Nuclear Fission 2018-12-26 20:15:14 +02:00
Yair Morgenstern
f66e54a127 Fixed "camel archer melee unit" and "sydney opera house 0 turns to build" bugs 2018-12-24 20:50:36 +02:00
Yair Morgenstern
51b62028a8 Maybe solved a concurrency-related java.lang.IllegalArgumentException from CameraStageBaseScreen.render 
It's hard to tell because it only crops extremely randomly in, like, 1 in a 1000 games, and the users just continue on with their lives,
But it's a crash record and we want 0 of those!
 2018-12-19 19:53:53 +02: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
30734c7287 Changed the basic click because the other one decided to stop working 2018-12-17 19:37:00 +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
Yair Morgenstern
406fa60f61 Unhappiness battle modifier properly capped now 2018-12-12 22:57:03 +02:00
Yair Morgenstern
7ee76771f5 Added some missing translations 
aab/apk now doesn't einclude local debug files
Maybe solved resume problem on Chrome OS (see issue 322), needs to be checked
 2018-12-10 14:09:01 +02:00
Yair Morgenstern
197d698c57 Organized Freedom policies 2018-12-10 11:55:18 +02:00
Yair Morgenstern
ff29448e06 Added translations for Ancient Ruins bonus notifications 2018-12-07 12:20:23 +02:00
Yair Morgenstern
37dc952fe6 MoveHereButton dissapears after unit has moved 2018-12-06 15:55:28 +02:00
Yair Morgenstern
44d5017f6f MoveHereButton creation deferred to main thread, in order to LibGDX errors caused by concurrent UI alteration 2018-12-06 12:30:02 +02:00
Yair Morgenstern
c706fa455a Code inspection and other general fixes - gotta clean up when there are guests ;) 2018-12-04 23:21:57 +02:00
Yair Morgenstern
bc1b1e7672 Solved a super-rare bug where the game would get stuck if you expanded the city onto a tile with an enemy that couldn't be teleported anywhere else - kudos Groundless Name! 2018-12-04 11:45:16 +02:00
Yair Morgenstern
b3b2cbe23c Organized trade table 2018-12-03 13:08:34 +02:00
Yair Morgenstern
1e17df4b1e Travis update, using 'android:components' instead of 'install' for base installations 2018-12-03 10:17:06 +02:00
Yair Morgenstern
4f0f163c00 Difficulty affects all AI yields now, which should widen the difficulty range - easy difficulties are now easier, and hard ones are harder 2018-12-03 09:57:27 +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
5099ad4db4 Kotlin version upgraded to 1.3.10 2018-12-02 15:33:30 +02:00
Yair Morgenstern
87571ee333 Added the debug keystore manually, hope this fixes the travis build... 2018-12-02 15:16:50 +02:00
Yair Morgenstern
9ea9e9f523 Upgraded BuildTools to 28.0.3, Gradle to 3.2.1 and Kotlin to 1.2.71 2018-12-02 14:12:47 +02:00
Yair Morgenstern
cd28358289 Fixed bug where you could convince AI to declare war on defeated civs - kudos ninjatao! 2018-12-01 22:40:14 +02:00
Yair Morgenstern
c807ee5098 Solved ANR problems related to moving units long distances across the map 2018-11-28 18:59:18 +02:00
Yair Morgenstern
6096bde9cd Changed Forest icon 
Narrowed hexagon edges
 2018-11-27 21:51:52 +02:00
Yair Morgenstern
556c10109d Performance improvements in both getCivUnits and canPassThrough of tile 
Fixed no embarkation & policy pick bug
 2018-11-24 22:48:42 +02:00
Yair Morgenstern
e16ea5c803 Performance: Added Transient list of researched technologies 2018-11-21 20:02:12 +02:00
Yair Morgenstern
17c98f9f46 Fixed Embarkation tutorial 2018-11-21 15:10:15 +02:00
Yair Morgenstern
3e02417838 AI units no longer attack from an embarked state (it's just not worth it) 2018-11-17 22:01:47 +02:00
Yair Morgenstern
b01ed7541e Translation fixes 2018-11-14 21:08:43 +02:00
Yair Morgenstern
42e6ab1c65 Fixed great person point generation 
Added great person points to civ overview
 2018-11-13 21:10:23 +02:00
Yair Morgenstern
d3a4952fef AI will only pay for extra luxuries if it can trade them away 2018-11-12 09:47:43 +02:00
Yair Morgenstern
f73d840a9d Silly roadbuilding crash bugfix 2018-11-06 20:26:31 +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
abc3bfcae8 Added Galleass, first ranged water unit! 2018-11-02 12:49:41 +02:00
Yair Morgenstern
5a6e5043b3 Trade routes now travel between harbors over water, and are calculated once per civilization instead of per city 2018-11-01 19:27:57 +02:00
Yair Morgenstern
4423dadefd Removed hydro plant from loaded games 2018-10-28 16:37:51 +02:00
Yair Morgenstern
cc0e76ba00 Added info of tile's unit defence bonus to tile info (not everyone is a veteren Civ player...) 2018-10-28 12:37:00 +02:00
Yair Morgenstern
230031e9f5 Fixed combat for embarked units 2018-10-23 22:08:30 +03:00
Yair Morgenstern
2c5f4e1529 Land units can embark! 2018-10-22 20:05:04 +03: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
ba144be973 Added resources and terrain features back to land-only maps 2018-10-14 21:07:01 +03:00
Yair Morgenstern
b528ef38e9 Minor improvements 2018-10-12 15:02:12 +03:00
Yair Morgenstern
4277bbc403 Added tech progress bars in tech picking screen 2018-10-06 20:19:51 +03:00
Yair Morgenstern
a8bb9f53b7 Added medieval tech icons 2018-10-03 23:03:53 +03:00
Yair Morgenstern
b99d6c67b6 Another minor bugfix 2018-10-02 00:10:11 +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
5710001715 Added "Buy tile" option to cities 2018-09-23 10:39:56 +03:00
Yair Morgenstern
a1f824842d AI units now go out and explore unseen areas 2018-09-16 23:14:35 +03:00
Yair Morgenstern
9c8e173f4e Lots off background work for future water tiles 
Resized xxxhdpi icon
 2018-09-11 23:07:12 +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
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
9e5208dd8c Fixed a bug where the unit needs the civInfo in order to calculate the moveTo even before it's put on the map. 2018-08-29 12:25:35 +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
e078590933 Fixed concurrency problems when updating city stats 2018-08-27 13:38:54 +03:00
Yair Morgenstern
94eb7198e9 Expanded city name of all civs to 30 since it's obvious there are some people who reach those numbers. 2018-08-26 09:27:08 +03:00
Yair Morgenstern
4fd9ac0f38 Added musketeer unique unit for France 2018-08-23 08:43:14 +03:00
Yair Morgenstern
5e1bccdc47 Organized clone functions 
Found one last place where the unit was destroyed manually and not using the destroy() function =\
 2018-08-20 22:36:01 +03:00
Yair Morgenstern
040866609e Added effects of Militarism, Total War and Facism 2018-08-20 21:58:01 +03:00
Yair Morgenstern
f820b75fff Json is apparently not thread safe, so we now create a new instance for each stringify 2018-08-20 09:17:40 +03:00
Yair Morgenstern
1957c4ca80 Code reorganization - separated variables, pure functions and state-changing functions in all main logic classes 2018-08-17 13:36:23 +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
bb25616b69 Fixed bug when playing with translations and constructing science, gold or nothing in a city 2018-08-12 20:45:17 +03:00
Yair Morgenstern
847bf9650d Changed the basic stat icons to not use the original Civ's 2018-08-10 18:31:18 +03:00
Yair Morgenstern
97bb4e05b9 Fixed bug where you could buy the same buildings multiple times - thanks vita10g! 2018-08-09 10:10:49 +03:00
Yair Morgenstern
3b83627386 Left side of diplomacy screen now scrolls 2018-08-07 07:39:44 +03:00
Yair Morgenstern
99c0abd24d Fixed crash when you would melee attack an enemy unit that was in a friendly civ's (unenterable) territory 2018-08-06 13:08:45 +03:00
Yair Morgenstern
2be6a5c15c AI construction choices now better and change between peacetime and wartime. 
AIs now declare war on each other if they think they can defeat the other side
(Returned movement alg. to the way it was because the new way didn't allow ais to find enemy units, added comment)
 2018-08-05 23:08:50 +03:00
Yair Morgenstern
e655d6620a Added LOADS of words to be translated - all buildings and units! 2018-08-05 16:12:46 +03:00
Yair Morgenstern
215310b413 Diplomacy screen, declaring war, no entering frienly enemy territory 2018-08-02 21:21:30 +03:00
Yair Morgenstern
bf9e06445c All diplomacy now done from a separate screen 2018-08-02 14:59:53 +03:00
Yair Morgenstern
023c4cd1c6 Trade now almost entirely separate from Trade Screen, so the Trade screen can become a Diplomacy screen! 2018-08-01 22:41:23 +03:00
Yair Morgenstern
d8bb0eb9e5 Can now trade Peace Treaty! Which leads to actual fukken peace! 2018-07-31 17:48:57 +03:00
Yair Morgenstern
041f904f6c Added language picker screen 2018-07-26 23:46:14 +03:00
Yair Morgenstern
06c68302ce Added difficulty settings! 2018-07-25 22:56:25 +03:00
Yair Morgenstern
b4614fc1f5 Railroad now looks like a railroad and visible on tundra 2018-07-24 18:22:39 +03:00
Yair Morgenstern
0d261e88bf Added list of units to empire overview 2018-07-19 13:29:52 +03:00
Yair Morgenstern
5ee0c47e22 If a unit can be promoted twice, the promotion picker remains open after you pick the first promotion 2018-07-18 13:26:29 +03:00
Yair Morgenstern
7ec95fefd9 No tile will now be in 2 cities simultaneously 
Cities can't "take over" tiles neighboring to a city
 2018-07-16 23:50:35 +03:00
Yair Morgenstern
da3d749547 When unable to support units, they disband one by one instead of all at the same time 2018-07-15 19:51:27 +03:00
Yair Morgenstern
bfb53a1940 Updating happiness happens in a different thread so it doesn't impede the update() function 2018-07-12 19:17:58 +03:00
Yair Morgenstern
3215e0eea9 Displayed happiness updated within the turn (thanks Am-Per-Sand!) 2018-07-11 21:25:23 +03:00
Yair Morgenstern
849129ac65 Added trade translation texts 
Added duration to trade screen buttons
 2018-07-09 22:43:32 +03:00
Yair Morgenstern
0c17e19ea2 Trading gold now works as well! 2018-07-06 16:42:32 +03:00
Yair Morgenstern
9f81ac6676 Defeated civs no longer have automated actions, and their remaining units are removed from the map 2018-07-03 22:25:13 +03:00
Yair Morgenstern
f08261edaf Fixed bug where (I assume) if you started a game before version 94, then you may not have any techs at all, and so wwhen you try to fund the player's Era by techs, it finds nothing and explodes 2018-07-01 17:16:56 +03:00
Yair Morgenstern
4bbffe318b More translation stuff 2018-06-25 21:50:56 +03:00
Yair Morgenstern
b166e23858 Game now longer gets an Application Not Responding when taking a long time creating a new game 2018-06-25 08:41:22 +03:00
Yair Morgenstern
a56e7e43aa Added Agriculture tech - no gameplay change, but it does tell the game's story well! 2018-06-24 21:19:57 +03:00
Yair Morgenstern
e0961e1b0b Unit table updates texts even if the unit hasn't changed 2018-06-22 10:41:53 +03:00
Yair Morgenstern
bed7a37a6b Cities connected to capital have a connected symbol next to them 
Unit information displays XP to next promotion
 2018-06-21 22:52:24 +03:00
Yair Morgenstern
3f87cfa3db Fixed silly regex bug which works differently on desktop and android 2018-06-19 20:01:49 +03:00
Yair Morgenstern
fa14b6eebe Cities can now idle by producing Nothing 2018-06-18 22:00:07 +03:00