mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-02 04:14:15 +07:00
Code Issues Packages Projects Releases Wiki Activity
1,072 Commits 6 Branches 1,046 Tags 1.2 GiB
c18cc2476f
Commit Graph

494 Commits

Author SHA1 Message Date
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
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
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
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
53bac34b42 Added Gatling Gun unit 
Cannon upgrades to Artillery
 2018-12-03 16:00:29 +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
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
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
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
flecheapolinienne
ce3258617f
Update Translations.json 2018-11-29 18:38:59 -05: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
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
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
5577022bd7 Added unit icons to battle table 2018-11-24 21:15:22 +02:00
Yair Morgenstern
5b66f8f0f7 Organized Unit Table UI 2018-11-23 14:36:22 +02:00
Yair Morgenstern
e16ea5c803 Performance: Added Transient list of researched technologies 2018-11-21 20:02:12 +02:00
flecheapolinienne
b7c0fee37f
Update Translations.json 2018-11-21 10:56:00 -05:00
Yair Morgenstern
17c98f9f46 Fixed Embarkation tutorial 2018-11-21 15:10:15 +02:00
Smashfanful
21338e241f
NewTranslation.json 
Finished these Italian translations, hopefully.
 2018-11-19 11:10:23 +01: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
3707758f7e Dev: added missing translation 2018-11-17 21:29:03 +02:00
Yair Morgenstern
678db24d78 All unit uniques displayed in tech tree 
Unit bonus/penalty uniques are now translated
 2018-11-17 21:19:43 +02:00
Yair Morgenstern
22e6f39caf Dev: Removed baseDescription from units, all old baseDescriptions moved to Uniques 2018-11-17 21:02:42 +02:00
Yair Morgenstern
2db768f9ed Added tutorials for siege units and embarkation 2018-11-17 20:56:30 +02:00
Yair Morgenstern
69e30ce212 Dev: Techs are now recognized by their unique abilities, not by tech name 2018-11-17 20:33:21 +02:00
Smashfanful
e631d138f6
Update Translations.json 2018-11-14 20:20:05 +01:00
Yair Morgenstern
b01ed7541e Translation fixes 2018-11-14 21:08:43 +02:00
Smashfanful
8a2d007038
Updated Translation.json 
New Italian Translations.
 2018-11-14 19:35:18 +01:00
Yair Morgenstern
7ce4d2515b Barbarians are now colored in red+black, like in the original civ 2018-11-14 19:41:53 +02:00
Yair Morgenstern
640a3b873e Ballista replaces catapult, not horseman 
When an improvement is under construction, you cannot pick to construct that improvement again
 2018-11-14 19:31:33 +02:00
flecheapolinienne
b7e9982918
Update Translations.json 
About 30% of french translations redone
 2018-11-14 11:35:54 -05: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
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
d3a4952fef AI will only pay for extra luxuries if it can trade them away 2018-11-12 09:47:43 +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
a062b02bb5 Percentage increases from buildings displayed in tech picking screen 2018-11-06 20:29:48 +02:00
Yair Morgenstern
f73d840a9d Silly roadbuilding crash bugfix 2018-11-06 20:26:31 +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
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
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
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
60b86decfb Added tutorials on injured units and workers 2018-10-31 14:00:49 +02:00
Yair Morgenstern
4423dadefd Removed hydro plant from loaded games 2018-10-28 16:37:51 +02:00
Yair Morgenstern
f86736db6d Removed Hydro Plant, since it requires rivers to be useful, and we don't yet have rivers. 2018-10-28 16:16:47 +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
c43dfd7f95 Added translation stubs for Honor and Autocracy policy branches, and other bits & bobs 2018-10-28 15:09:10 +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
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
566e555447 Merge branch 'master' of https://github.com/yairm210/UnCiv 2018-10-24 23:00:10 +03:00
Yair Morgenstern
284cc5c924 Can now see translation percent when picking language 2018-10-24 22:59:57 +03:00
RCalleti
56bcd30aa7
Update Translations.json 2018-10-24 21:31:32 +02:00
RCalleti
14d53049b9
Update Translations.json 2018-10-23 23:33:44 +02:00
Yair Morgenstern
230031e9f5 Fixed combat for embarked units 2018-10-23 22:08:30 +03:00
RCalleti
7cd903c6b9
Update Translations.json 2018-10-22 20:09:56 +02: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
b4d56e1474 Merge branch 'master' of https://github.com/yairm210/UnCiv 
# Conflicts:
#	android/assets/jsons/Translations.json
 2018-10-18 23:12:21 +03:00
Yair Morgenstern
a6b4a62abc Centeralized translations of alerts to translations file, for Spanish 2018-10-18 22:59:33 +03:00
Yair Morgenstern
f9f46391ea Fixed lighthouse & trireme problems 2018-10-18 22:57:45 +03:00
RCalleti
649fa12df6
Update Translations.json 2018-10-16 21:10:20 +02:00
Yair Morgenstern
dea7775be5 Added Optics and Lighthouse 2018-10-16 21:13:29 +03:00
RCalleti
ae33818750
Update Translations.json 2018-10-16 12:48:35 +02:00
Yair Morgenstern
c1e070018f Added Triremes and water combat! 2018-10-15 22:57:33 +03:00
yairm210
8912984e74
Merge pull request #243 from bryanwweber/fix_medical_lab_stats 
Fix medical lab stats and stasis chamber name
 2018-10-15 12:24:49 +03:00
Yair Morgenstern
ba144be973 Added resources and terrain features back to land-only maps 2018-10-14 21:07:01 +03:00
Bryan W. Weber
345f0db27e
Fix all spellings of Statis->Stasis 2018-10-14 13:55:01 -04:00
Bryan W. Weber
edc3e730b9
Change Medical Lab to use uniques 
This matches how the Aqueduct is specified. It also fixes that the
description is not available on the building picker screen.
 2018-10-14 11:18:51 -04:00
Bryan W. Weber
e816d9dbed
Fix typo in SS Stasis Chamber name 2018-10-14 11:17:37 -04:00
Yair Morgenstern
f6163f3c88 Organized policy icon credits 2018-10-13 22:31:03 +03:00
Yair Morgenstern
b4c17f7664 Organized building order and icon credits 2018-10-13 21:53:17 +03:00
Yair Morgenstern
b528ef38e9 Minor improvements 2018-10-12 15:02:12 +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
4277bbc403 Added tech progress bars in tech picking screen 2018-10-06 20:19:51 +03:00
Yair Morgenstern
7e6fa0e895 Fixed gold tile cost bug 2018-10-05 00:00:50 +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
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
a2b730a279 Can now add images to tutorials! Added images for Tile Clicked, Unit Selected and Tile Layout tutorials. 2018-09-24 22:04:39 +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
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
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
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
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
1227a47ea2 Added nations of Russia, Rome and Arabia! 2018-08-30 18:07:04 +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
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
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
0d630abc14 Added alternative resource icons 2018-08-27 15:37:15 +03:00
Yair Morgenstern
4932c627aa Changed icons to the new and non-suable version! 2018-08-27 14:35:49 +03:00
Yair Morgenstern
e078590933 Fixed concurrency problems when updating city stats 2018-08-27 13:38:54 +03:00
Yair Morgenstern
28f5ef5e4f Barbarians now destroy cities instead of capturing them 
Destroyed cities reliquish their tiles like they're supposed to
 2018-08-27 12:16:25 +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
9fbb997e63 Added burial tomb unique building for Egypt 2018-08-24 15:15:52 +03:00
Yair Morgenstern
8978d13cdc Added paper maker as first unique building! 2018-08-23 13:16:41 +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
abef1a64e5 Merge branch 'master' of https://github.com/yairm210/UnCiv 2018-08-17 11:38:42 +03:00
Roumaan
c1098c19d1 Policies Russian translation complete 2018-08-16 23:50:00 +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
26b3366d93 Added all policy translation lines 2018-08-14 19:24:47 +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
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
4c0372a8b5 When cities expand, units that aren't allowed to enter there are pushed to the closest moveable tile 2018-08-12 08:56:10 +03:00
Yair Morgenstern
4a35d2f3db Merge branch 'master' of https://github.com/yairm210/UnCiv 2018-08-10 18:31:39 +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
Roumaan
e5342de6cd I belatedly translated the tutorials +some minor translations (#227) 
* Adding tutorials Russian translation

* Oh forgot about this one

* Some new translations

* Translated some new tutorials

+one string translation at main file
 2018-08-10 13:47:36 +03:00
Yair Morgenstern
3515b0f6bd Added instructions to deal with situations where the game has crashed but we've noticed it 2018-08-10 11:35:56 +03:00
Yair Morgenstern
e51ac717d7 Better circle image, images no longer look all pixellated 2018-08-10 11:34:30 +03:00
Yair Morgenstern
c67d515ec4 Organized all game images and added TexturPacker to pack them all into a single image, with an atlas to find the texture regions - 
MASSIVE boost in rendering performance!
 2018-08-10 11:05:21 +03:00
Yair Morgenstern
4d27f7f769 Added icon to city tiles 2018-08-09 21:52:28 +03:00
Yair Morgenstern
4f727df216 Added crosshair image on attackable enemies 2018-08-09 21:04:25 +03:00