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

759 commits

Author SHA1 Message Date
Duan Tao
ed507ad063 Allow embarked units to attack land units, like in civ5. 2018-12-11 11:43:48 +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
ec80dcc0c0 Minor translation changes 2018-12-10 18:10:19 +02:00
Yair Morgenstern
437c422817 When exiting city, the city's unit is not selected 2018-12-10 16:26:38 +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
yairm210
2dd32b9a2c
Merge pull request #326 from ninjatao/fix_free_tech 
Fix research queue when getting free tech.
 2018-12-10 12:28:39 +02:00
Duan Tao
dc314fa315 Fix research queue when getting free tech. 2018-12-10 17:50:46 +08:00
Yair Morgenstern
6dbf6232e9 Hidden tiles no longer visible from inside the city screen - kudos flecheapolinienne! 2018-12-10 11:40:34 +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
yairm210
4ea09a71b6
Merge pull request #312 from ninjatao/auto_specialist 
Allow auto assign population to specialists.
 2018-12-10 10:52:57 +02:00
Yair Morgenstern
1ba0929869 Font download now preceded by a "requires fonts, do you want to download?" message that allows you to opt out 2018-12-10 10:41:13 +02:00
Duan Tao
d364f3896c Allow ai city to re-assign specialists. 2018-12-10 11:34:30 +08:00
Yair Morgenstern
d1df5a2fdf Chinese font downloaded per-use basis - makes the android app require Internet permissions, but that was coming anyway 2018-12-09 19:47:21 +02:00
Duan Tao
bb12fc7cdb Code style improvement. 2018-12-09 19:05:33 +08:00
Yair Morgenstern
ff29448e06 Added translations for Ancient Ruins bonus notifications 2018-12-07 12:20:23 +02:00
Yair Morgenstern
4491ae1859 Movable tiles shown again for Civilian units 2018-12-07 12:01:31 +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
Duan Tao
ca3172b2cf Give food a little bit more weight. 2018-12-07 15:59:05 +08: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
20994cb908 Dev: Save & Load screens put into separate package 2018-12-06 20:19:16 +02:00
Duan Tao
173a773271 Allow auto assign population to specialists. 2018-12-07 00:39:15 +08:00
Yair Morgenstern
7cacff0a37 Can no longer see diplomatic staus of civs you haven't met in Diplomacy Overview 2018-12-06 16:12:31 +02:00
Yair Morgenstern
37dc952fe6 MoveHereButton dissapears after unit has moved 2018-12-06 15:55:28 +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
5d56b930c1 Added Diplomacy overview! 2018-12-06 13:33:10 +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
yairm210
eb4844c48d
Merge pull request #308 from ninjatao/fix_free_building 
Free culture building now generates culture. Add map size option.
 2018-12-06 11:44:06 +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
Duan Tao
fc5fc48f7d Better addCultureBuilding. 2018-12-06 11:17:35 +08:00
Duan Tao
d1a86079a2 Add city resistance. 2018-12-06 01:03:23 +08:00
Duan Tao
b25f8751e6 Free culture building now generates culture. Add map size option. 2018-12-05 23:42:18 +08:00
Yair Morgenstern
ed1753d4ad Added small black spinning circle around selected unit, so it will be more noticable 2018-12-05 15:01:42 +02: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
Yair Morgenstern
d530740d35 Merge branch 'master' of https://github.com/yairm210/UnCiv 2018-12-05 10:31:20 +02:00
Yair Morgenstern
13ff4843c0 Civilopeida entries sorted alphabetically 2018-12-05 10:30:50 +02:00
yairm210
7800a003db
Merge pull request #305 from ninjatao/fix_acquire 
Add icon for aquirable tiles in city screen.
 2018-12-05 10:23:05 +02:00
Yair Morgenstern
93646cd74b Missing French accentuated characters now shown 2018-12-05 10:21:14 +02:00
Duan Tao
f1c27ca0ea Add icon for aquirable tiles in city screen. 2018-12-05 15:13:06 +08: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
7410cb8efe BuildingTable and UnitTable texts translated! 2018-12-04 22:41:54 +02:00
Yair Morgenstern
c359616824 General code cleanup - performance improvements on order in ||, StringBuilders replaced with line lists, added missing translations 2018-12-04 21:23:25 +02:00
Yair Morgenstern
d087a3f69a Solved 2 edge cases - one where Unciv.resume() is called with an empty GameInfo, and the other where the MoveHereButton in TileMapHolder can throw an exception if the board changed between 2 actions. 
Both impossible to replicate, both will work if the user tries again, but still better solved than unsolved.
 2018-12-04 20:47:37 +02:00
yairm210
bb78673edc
Merge pull request #302 from ninjatao/fix_acquire 
Fix : can acquire tiles that already belong to the city.
 2018-12-04 20:22:40 +02:00
Duan Tao
26a4a37389 Fix : can acquire tiles that already belong to the city. 2018-12-04 22:26:05 +08:00
Yair Morgenstern
3fe6bbeecc Unhappiness combat penalty capped at 90% - kudos anh pham-vu! 2018-12-04 13:09:38 +02:00
yairm210
eba64d38ee
Merge pull request #299 from ninjatao/fix_conquered_population 
Fix : city might have negative free population after been conquered.
 2018-12-04 12:32:25 +02:00
Duan Tao
6934ed0b0d Unassign population before conquered city given to conquerer. 2018-12-04 18:21:05 +08:00
yairm210
a2a2c2ca00
Merge pull request #300 from ninjatao/allow_tranfer_tile 
Allow city to acuqire nearby tiles from friendly cities.
 2018-12-04 12:14:45 +02:00
Duan Tao
76ecec8511 Remove wraping method for transfering tile. 2018-12-04 18:09:17 +08: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
Duan Tao
7c0179b268 Only connected tiles are acquirable. 2018-12-04 14:07:14 +08:00
Duan Tao
473bb17eba Allow city to acuqire nearby tiles from friendly cities. 2018-12-04 12:57:29 +08:00
Duan Tao
b5adf08dbe Fix city might have negative free population after been conquered. 2018-12-04 10:48:38 +08:00
Yair Morgenstern
c12906f63b Removed old StatExplainer code 2018-12-03 17:42:41 +02:00
Duan Tao
6cb965f0ad Can no longer choose Great War Infantry as free gp. 2018-12-03 22:48:37 +08:00
Yair Morgenstern
53bac34b42 Added Gatling Gun unit 
Cannon upgrades to Artillery
 2018-12-03 16:00:29 +02:00
yairm210
23e55495d4
Merge pull request #297 from ninjatao/fix_city_button_color 
City button changes color after been conquered.
 2018-12-03 15:27:34 +02:00
Duan Tao
a769678e63 City button changes color after been conquered. 2018-12-03 19:26:35 +08: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
1301b1181a City stats details in city screen moved from table to right-side scroller 2018-12-02 10:35:05 +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
8ec63f2e94 Re-added language picker, hope it won't generate negative reviews again =\ 2018-12-01 22:22:30 +02:00
Yair Morgenstern
ec65268099 AI now uses Great People properly 
Fixed bug where loading a game with a free policy would freeze everything
 2018-12-01 22:16:26 +02:00
Yair Morgenstern
8c3282ddce Ruins no longer give researched techs - kudos philn3v! 
Can no longer see over mountains
 2018-11-30 10:21:44 +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
c807ee5098 Solved ANR problems related to moving units long distances across the map 2018-11-28 18:59:18 +02:00
Yair Morgenstern
44be2b6d67 Cities now unassign speciallists when razed/starve and don't go into "negative population" - thanks am-per-sand! 2018-11-28 18:30:33 +02:00
Yair Morgenstern
87c3d18ac7 City specialists now stay through game restarts 2018-11-28 18:25:09 +02:00
Yair Morgenstern
defeb7431b Buildings requiring nearnby resources now say so - thanks zivvel! 
Promotion bonuses no longer override unit-specific ones, but are added - thanks ninjatao!
 2018-11-28 17:54:00 +02:00
Yair Morgenstern
43ec085b89 Fixed "no resources on coast" - thanks ninjatao! 2018-11-28 17:32:49 +02:00
Yair Morgenstern
de4c042dd5 Buildings that provide free buildings (e.g. The Great Library) now deal with civ uniques (e.g. Paper Maker) 2018-11-27 23:50:08 +02:00
Yair Morgenstern
324176d098 Performance: Added transient builtBuildingObjects list in cittyConstructions, so we won't have to get the list every time we want to calculate, well, loads of stuff 2018-11-27 23:31:40 +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
2cd7e5dc88 Added "declare war on X" to available trades 
Organized trades by type
 2018-11-27 19:10:27 +02:00
Yair Morgenstern
24ccd630da Can now select as many enemy civs as there are civilizations to assign to them 
Can now start the game with "Huge" maps, because "Large" wasn't big enough for everyone apparently -_-
 2018-11-26 19:50:58 +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
6c9297abc2 Performance improvement - added baseTerrain transient in tileInfo 2018-11-24 21:58:39 +02:00
Yair Morgenstern
347d329233 Moved map toggle icons near the minimap 2018-11-24 21:47:09 +02:00
Yair Morgenstern
5577022bd7 Added unit icons to battle table 2018-11-24 21:15:22 +02:00
Yair Morgenstern
254d415968 Organized minimap UI 2018-11-23 14:48:05 +02:00
Yair Morgenstern
5b66f8f0f7 Organized Unit Table UI 2018-11-23 14:36:22 +02:00
Yair Morgenstern
c71f320731 Units now unsleep after moving 2018-11-23 10:06:16 +02:00
Yair Morgenstern
e16ea5c803 Performance: Added Transient list of researched technologies 2018-11-21 20:02:12 +02:00
Yair Morgenstern
d7ddd85c32 Performance: Viewable tiles are now a transient list in civInfo 2018-11-21 19:16:06 +02:00
Yair Morgenstern
bf4d9b609d Dev: when getting tile stats, we only check the gold-per-turn of the viewing civ if its current gold is negative 2018-11-21 18:45:02 +02:00
Yair Morgenstern
71d99dce51 Improved Next Turn performance 
Dev: in tryGarrisonUnit, we now run canReach only when absolutely neccesary
Dev: Center tile of CityInfo cached, we access it a lot and it never really changes
 2018-11-21 18:07:05 +02:00
Yair Morgenstern
edada1182b Changed date notations to BC and AD, as per original Civ 2018-11-21 16:40:27 +02:00
Yair Morgenstern
49603f8852 Fixed bug where resource-requiring buildings could be built without the resource 2018-11-21 16:34:11 +02:00
Yair Morgenstern
2ab4e406aa Fixed bug where auto-assigned population in cities could work tiles outside of 3-tile range 2018-11-21 16:31:14 +02:00
Yair Morgenstern
fad7df055b It's now much easier to enter a city by clicking on the city button 2018-11-21 16:15:46 +02:00
Yair Morgenstern
9590d9890b Solved bug where AI work boats would try to create Fishing Boats on Oil in coast (thanks Pierre Wall!) 2018-11-21 15:33:12 +02:00
Yair Morgenstern
1929118732 Policy picker no longer jumps up if you manually picked the policy when you got enough points 
Buildings that increase XP now display so in construction picker screen
 2018-11-21 15:19:33 +02:00