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

832 commits

This branch
This branch
All branches
Author SHA1 Message Date
Duan Tao
fc5fc48f7d Better addCultureBuilding. 2018-12-06 11:17:35 +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
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
yairm210
7e7f5a1dbb
Merge pull request #298 from ninjatao/fix_great_person_choose 
Can no longer choose Great War Infantry as free gp.
 2018-12-03 17:39:39 +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
5099ad4db4 Kotlin version upgraded to 1.3.10 2018-12-02 15:33:30 +02:00
Yair Morgenstern
7ae79c0239 Added jcenter as dependency in allprojects.repositories, should fix the 'Could not find org.jetbrains.trove4j:trove4j:20160824' error in Travis 2018-12-02 15:25:55 +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
a0cd3e4cbd Trying to get travis to create a debug keystore... 2018-12-02 15:03:18 +02:00
Yair Morgenstern
aa3a9d7f2d Added debug keystore generation to travis yml 2018-12-02 14:52:42 +02:00
Yair Morgenstern
1e831f8c3c Added google repo to allProjects.repositories in build.grade, SO says this should fix the build 2018-12-02 14:38:53 +02:00
Yair Morgenstern
e040c3dec6 Hopefully fix broken Travis build 2018-12-02 14:21:44 +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
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
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
yairm210
5e8cf6ea84
Merge pull request #292 from flecheapolinienne/patch-3 
Update Translations.json for French
 2018-11-30 10:20:15 +02:00
flecheapolinienne
ce3258617f
Update Translations.json 2018-11-29 18:38:59 -05:00