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

1172 commits

Author SHA1 Message Date
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
Yair Morgenstern
39cd9c9fa7 Merge branch 'master' of https://github.com/yairm210/UnCiv 2018-08-09 19:08:25 +03:00
Yair Morgenstern
6f2b845e13 Civilization class renamd to Nation, to have it be distinct from CivilizationInfo 2018-08-09 18:44:43 +03:00
Yair Morgenstern
186feab0c6 Added notification when enemy declares war on us 2018-08-09 18:36:37 +03:00
Yair Morgenstern
e6bc3a1ab7 Added tutorials when first encountering barbarians and other civilizations 2018-08-09 18:33:47 +03:00
Yair Morgenstern
b79b682376 Added "conquer defeated city with melee unit" tutorial 2018-08-09 10:23:10 +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
Roumaan
76d80b30ca Merge remote-tracking branch 'refs/remotes/yairm210/master' 2018-08-08 22:45:15 +03:00
Roumaan
ca64d361f4 Adding Russian translation 
policies, remove actions +minor additions. I think i finnally did it
 2018-08-08 18:17:23 +03:00
Roumaan
07280104cc Merge remote-tracking branch 'refs/remotes/yairm210/master' 2018-08-08 17:23:08 +03:00
Roumaan
969e16787e Fixing out fixes 2018-08-08 17:16:49 +03:00
Yair Morgenstern
9d0035a8a6 AI now considers war on multiple civs, starting with the closest 2018-08-08 08:23:20 +03:00
Yair Morgenstern
3b83627386 Left side of diplomacy screen now scrolls 2018-08-07 07:39:44 +03:00
Yair Morgenstern
02fd349243 Massive AI combat improvements! 
Added translations
 2018-08-06 21:58:30 +03:00
Yair Morgenstern
a199801c82 Merge branch 'master' of https://github.com/yairm210/UnCiv 2018-08-06 21:23:52 +03:00
Roumaan
12d3d9f2e1 Merge remote-tracking branch 'refs/remotes/yairm210/master' 2018-08-06 19:14:08 +03:00
Roumaan
353ce16360 Fixing Ryssian translation 3 
Fixed translation of  Eras, unique buildings effects, unit types, unit
uniques, policy picker screen, trade categories.
 2018-08-06 19:09:28 +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
Roumaan
ef60f86ab0 Fixing Russian trahslation 2 
Fixed translatiaon of notifications, technologies and eras
 2018-08-06 04:28:19 +03:00
Fantaziu Ion
f302bd412b
Major translations it/ru/fr/ro 
Some units not translated cause never encountered and not know if exist. May be duplicates in other languages... Not shure.
//Check comments inside file
 2018-08-06 01:59:43 +02:00
Roumaan
1f622e01c4
My first commit trying to fix russian translation 
Just fixed some of the first lines. Commiting just to save changes from my browser, and continue working with files on my computer tomorrow. The translation we have now is very bad. And all I can do is just try to fix it with my terrible knowledge of English, enough that this translation at least started to make sense, hoping someone would be able to finish it completely. I hope you understood me.
 2018-08-06 02:18:09 +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
c3cdae12d4 Tutorials are now defined per language! 2018-08-04 23:57:53 +03:00
Yair Morgenstern
7983901435 Info on translation percentage in language picker screen 2018-08-04 21:50:56 +03:00
Yair Morgenstern
ec0ebc73f0 Expanded translation for new game screen and overview screen 2018-08-04 21:36:08 +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
82c42e8528 Trade classes re now separate files 2018-07-30 13:30:13 +03:00
Smashfanful
28e068801a
Updated translation 
Corrected Italian translation.
 2018-07-29 11:23:50 +02:00
Fantaziu Ion
556a327bc2
translated trade, civ name, difficulty, map size 
translated trade
 2018-07-28 15:23:20 +02:00
Yair Morgenstern
8b259a3db3 Added ai unhappiness modifier to difficulty 2018-07-27 10:03:44 +03:00
Yair Morgenstern
041f904f6c Added language picker screen 2018-07-26 23:46:14 +03:00
Am-per-Sand
9e7c3e0b08
added commas! 2018-07-26 18:10:45 +02: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
b1f14761ad Merge branch 'master' of https://github.com/yairm210/UnCiv 2018-07-20 15:58:38 +03:00
Am-per-Sand
b653829547 units.json commas 
easy to find with syntax highlighting
 2018-07-20 15:56:57 +03:00
Am-per-Sand
eb63ae4c5d Policies.json commas 
Credits to github syntax highlighting
 2018-07-20 15:56:26 +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
68781ed5f7 Units can only upgrade within your borders (thanks Noam!) 2018-07-13 17:28:08 +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
949d64c53c Added tutorials for strategic and luxury resources 2018-07-09 22:51:50 +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
fdcce8287f Merge branch 'master' of https://github.com/yairm210/UnCiv 2018-07-09 22:20:16 +03:00
Yair Morgenstern
a193be18b3 Free Religion policy is now pickable 2018-07-09 17:28:25 +03:00
Am-per-Sand
8479074e84 added units and combat (#193) 
and corrected typos and omitted words
 2018-07-07 21:36:28 +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
Fantaziu Ion
d7a8f52c86
minor translations finished (it, ru, ro, fr) 2018-07-02 13:27:42 +02:00
Yair Morgenstern
62246ff1c9 More translation stuff 
When will the madness end?
 2018-07-01 17:27:52 +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
4593bed7dc Future tech can now be constantly researched! 2018-07-01 17:05:30 +03:00
Yair Morgenstern
837195293c Fixed minor merge conflict between dutch and other languages 2018-07-01 16:59:41 +03:00
jorick44
a9b33f1322 Dutch translation (#185) 
An almost complete Dutch translation for UnCiv I wasn't able to translate everything but I do hope that this will Improve the game from a 10/10 to a 11/10
 2018-07-01 16:41:10 +03:00
Fantaziu Ion
16e762c15e
minor tranlations 
added comments on what eras are one word translated + finished the other minor translations
 2018-07-01 01:47:00 +02:00
Yair Morgenstern
e81df16317 Added Yes/No popup (we'll need it when we have diplomacy and you tell a unit to enter enemy territory) 
Added opttion to disband unit (as a test for the popup)
 2018-06-27 22:43:15 +03:00
Fantaziu Ion
853f86b613
Basic translations 
We need to review the era translations as they are gender sensitive and sometimes there's one word translations (ex: renaissance era [it] Rinascimento)
 2018-06-27 19:07:14 +02:00
Yair Morgenstern
805fc5c739 Oligarchy policy now works as intended 
More translation stuff
 2018-06-25 23:11:22 +03:00
Yair Morgenstern
4bbffe318b More translation stuff 2018-06-25 21:50:56 +03:00
Yair Morgenstern
a59d6e7a46 Translation stuff 
Fixed ultra rare bug where a unit that expends all its movement points on roads right before attacking will think that it can attack when it can't
 2018-06-25 20:08:57 +03:00
Yair Morgenstern
15be9daf88 Merge branch 'master' of https://github.com/yairm210/UnCiv 2018-06-25 19:27:35 +03:00
Yair Morgenstern
1388aec34a Tech manager now shows eras of technologies! 2018-06-25 19:27:27 +03:00
Yair Morgenstern
c5f127e555 Policy branches are unlocked by era 2018-06-25 18:09:38 +03:00
Yair Morgenstern
85a8e68a0a Added Rifling with Rifleman unit 2018-06-25 14:16:39 +03:00
Yair Morgenstern
7898a24ff1 Added Metallurgy with Lancer unit 2018-06-25 14:12:17 +03:00
Yair Morgenstern
fea22cc049 Added Military Science tech with Cavalry unit and Military Academy building 2018-06-25 14:07:35 +03:00
Yair Morgenstern
1dffbe2db5 Added Dynamite tech with Artillery 2018-06-25 13:59:51 +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
Fantaziu Ion
8ee81b5bd9
Finished major translations 
waiting for new entries
 2018-06-25 05:19:24 +02:00
Fantaziu Ion
94608f6cf8
Minor Translations 2018-06-25 04:25:28 +02:00
Yair Morgenstern
fe31e4121a Added Barracks and Armory buildings to increase XP of units built in the city 2018-06-24 22:09:16 +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
afd712c1c9 Added tutorials and basic help ffor capturing enemy cities and for connecting your cities to the capital with roads 2018-06-23 23:46:26 +03:00
Yair Morgenstern
a0e14ee8f8 Swords man upgrades to Longswordsman, Chariot Archer upgrades to Knight 2018-06-23 23:31:08 +03:00
Filius-Patris
908d913c25 Updated German translation (#173) 
Adjusted translation with new placeholders (THANKS!!)
Added missing and some not-sure translations
 2018-06-23 23:29:50 +03:00
Yair Morgenstern
56c5b7c1ca Added Industrialization between Economics and Steam Power 2018-06-22 15:34:47 +03:00
Yair Morgenstern
83471fb3cd Added Architecture tech 2018-06-22 15:24:22 +03:00
Yair Morgenstern
e592dc90a3 Added Steel tech 2018-06-22 13:28:24 +03:00
Yair Morgenstern
86ba484c78 Organized Physics tech, added Gunpowder 2018-06-22 13:25:42 +03:00
Yair Morgenstern
81e9cd317d Started normalizing tech tree to be like G&K - Added Guilds between Currreny and Chivalry 2018-06-22 13:07:52 +03:00
Yair Morgenstern
b8d9e432ef Fixed bug where if an enemy city expanded over your territory but you had a population working that tile, that population would be stuck there, and would remain unusable! 2018-06-22 12:21: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
415add2417 Loads of translation changes, especially for German! 
Changed font from Roboto to Arial because it contains some characters (e.g. for Romanian) that Roboto doesn't
 2018-06-20 23:11:02 +03:00
Filius-Patris
f92a64c8e3 Added German translation (#166) 2018-06-20 18:24:52 +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
1aee88c5cd Added Companion Cavalry 2018-06-18 23:48:10 +03:00
Yair Morgenstern
0af880877f Added longbowman (Engand unique unit) 
Techs now don't display units that are unique to other civs, or the base unit if you have a unique that replaces it
 2018-06-18 23:33:49 +03:00
Yair Morgenstern
fa14b6eebe Cities can now idle by producing Nothing 2018-06-18 22:00:07 +03:00
Yair Morgenstern
aa11c49eec Many more things are now translated! 
Added more things to translate to translations.json
 2018-06-18 21:41:07 +03:00
Fantaziu Ion
df82a526d4
Major interface translations 
Added translation for main interface and gameplay strings (ru/it/fr/ro)
 2018-06-18 03:40:43 +02:00
Yair Morgenstern
5df93757f2 Added Bowman as first unique unit! 2018-06-17 23:39:25 +03:00
Yair Morgenstern
ed8e664358 Added Cover, March and Charge promotions 2018-06-17 23:08:16 +03:00
Yair Morgenstern
5fa9ad0640 Normalized city strength according to original civ game 
Added Walls and Castle buildings
 2018-06-17 19:47:01 +03:00
Yair Morgenstern
80963e7eac Added damage modification from basic promotions 2018-06-16 23:35:54 +03:00
Yair Morgenstern
c6caf0cecd Added promotions mechanism! 2018-06-16 22:50:11 +03:00
Yair Morgenstern
92abe0cf73 More translations! 2018-06-15 16:48:38 +03:00
Yair Morgenstern
bcd5f02bec Razed cities now have a fire icon next to them 2018-06-15 16:48:04 +03:00
Yair Morgenstern
d429c6585b Aded terrains, resources improvements and techs to the translation file 2018-06-15 15:04:25 +03:00
Yair Morgenstern
79971b05b8 Added more translations in the code 2018-06-14 23:20:25 +03:00
Yair Morgenstern
03f5f32f36 Golden age now also provides +20% to culture; added Golden Age tutorial 2018-06-14 22:47:04 +03:00
Yair Morgenstern
c815863124 Archers now require Archery (as should be!) 2018-06-14 21:00:44 +03:00
Yair Morgenstern
d2cb7173c1 AI now moved ranged units before melee, so that it will attack wil the ranged units first =) 2018-06-14 20:47:23 +03:00
Yair Morgenstern
b3a15d9d6e Merge branch 'master' of https://github.com/yairm210/UnCiv 2018-06-14 20:44:41 +03:00
yairm210
2e804dbd5e
Added notification text to translation json 2018-06-14 13:16:04 +03:00
Yair Morgenstern
5af940858b Added unhappiness tutorial + tutorial text is now a normal size 2018-06-14 08:42:59 +03:00
Fantaziu Ion
14ce37c932
Main translations added 
Main translations for italian/russian/french and romanian.
 2018-06-13 16:43:24 +02:00
Yair Morgenstern
0eb28ab679 Select box, text field and picker screens now look much nicer 2018-06-12 22:46:23 +03:00
Yair Morgenstern
66f2ad1f3e Merge branch 'master' of https://github.com/yairm210/UnCiv 2018-06-12 22:44:07 +03:00
Yair Morgenstern
e1df4b4840 Cached fonts for reuse - generating them takes valuable time! 2018-06-12 21:38:40 +03:00
yairm210
7261fed191
Added lots of phrases in Translations.json 2018-06-12 13:00:25 +03:00
Yair Morgenstern
a380f7aa95 Battle table now displays "Captured" when attacking a city with no resistance 2018-06-12 09:10:02 +03:00
Yair Morgenstern
c27bcb00c4 Fixed notification when capturing a civilian unit 2018-06-12 09:09:11 +03:00
Yair Morgenstern
02c74ad8ba Added Set Up action for siege units that require it 
Unit cannot attack twice a turn even if it can "move after attacking"
 2018-06-11 18:27:23 +03:00
Yair Morgenstern
8d5fd730a0 Added promotion jsons, icons and organized unit types (scout is now its own!) 2018-06-10 17:44:05 +03:00
Yair Morgenstern
adeaa5907a Added city health in text description of tile 2018-06-10 17:42:16 +03:00
Yair Morgenstern
0edbaac53d Changed "Archery" units to "Ranged" because it will also include machine gun in the future 2018-06-08 17:44:49 +03:00
Yair Morgenstern
95bdcf8dcb Notification scroll height is now limited 2018-06-08 15:28:02 +03:00
Yair Morgenstern
7002b8d55e Fixed save/load game Clipboard problems 2018-06-06 14:47:37 +03:00
Yair Morgenstern
d81768047f Added base for translations - we should now be able to add fan translations for different languages! 2018-06-05 21:58:02 +03:00
Yair Morgenstern
c088c02b1e Added Roboto font and finally figured out how to make TrueType fonts look good! 2018-06-05 21:53:51 +03:00
Yair Morgenstern
aa0ddd4128 Added colors to notifications, depending on the context (attack, culture growth, tech, city growth, etc.) 2018-05-29 23:43:54 +03:00
Yair Morgenstern
e1bd1c271e Load screen displays civ, turns and save time; Save screen now displays random noun-adjective combination as default save name 2018-05-29 22:37:31 +03:00
Yair Morgenstern
ba320552e2 Added Englandd and France civs 2018-05-29 22:01:48 +03:00
Yair Morgenstern
14a1bc5626 Fixed crash caused by trebuchet listing "cannon" as upgrade, but the cannon doesn't exist yet 0_0 2018-05-28 22:03:56 +03:00
Yair Morgenstern
75627928b3 Slightly modified tech tree, added raw info for cannon and musketman, but the tech tree needs to be changed in order for musketman to be viable 2018-05-27 18:34:13 +03:00
Yair Morgenstern
4d520c8466 Added "unit upgrade" action for old units 2018-05-25 18:27:54 +03:00
Yair Morgenstern
c984704af1 The "Construct improvement" action is now disabled when the unit has no movement or there are no improvements to pick 2018-05-25 13:04:31 +03:00
Yair Morgenstern
389c489faf Added icons to improvement picker screen 2018-05-25 12:01:06 +03:00
Yair Morgenstern
7ee62b7d1c Moved star,circle,shield icons to OtherIcons folder 2018-05-24 22:31:06 +03:00
Yair Morgenstern
c8ddf6dc63 Added icons for unit actions 2018-05-23 22:59:05 +03:00
Yair Morgenstern
2a2cc9a873 Removed final sum of combat values from BattleTable 2018-05-23 00:55:55 +03:00
Yair Morgenstern
db4ad20264 Added Fortification action 2018-05-23 00:37:53 +03:00
Yair Morgenstern
1bebeab0c4 Added Knight 2018-05-23 00:21:08 +03:00
Yair Morgenstern
03d452fd42 Added fog on non-viewable tiles 2018-05-22 23:07:12 +03:00
Yair Morgenstern
1b2fa7317e Added unit obsolesence 2018-05-21 23:00:09 +03:00
Yair Morgenstern
1de4c2c9f2 Techs display short info on buildings and units 2018-05-21 22:07:30 +03:00
Yair Morgenstern
398b612d8c Added Medieval era units 
Techs now display imformation baed on what's dependant on them
Buildings uniques now in humanspeak
 2018-05-18 17:18:47 +03:00
Yair Morgenstern
017d1f3f89 Added star icon to capital city 2018-05-18 15:53:12 +03:00
Yair Morgenstern
cb537b0f84 Icons shrunk (slightly) with pngCrush 
Organized Unit table
Added bonus vs barbarians
 2018-05-18 15:30:29 +03:00
Yair Morgenstern
318931b902 Added extra stat icons 2018-05-17 22:02:11 +03:00
Yair Morgenstern
f546a49c49 Added icons for Medieval and Renaissance era units 2018-05-17 21:28:41 +03:00
Yair Morgenstern
4267d5b1be Added Crossbowman 2018-05-17 15:56:25 +03:00
Yair Morgenstern
3e0e1b2a43 In-game year is displayed by the number of turns 2018-05-17 15:15:28 +03:00
Yair Morgenstern
d3799a0c64 When settlers have no viable spots within 5 tiles, they random walk to edges of walking ability 2018-05-16 23:45:25 +03:00
Yair Morgenstern
2c2a4e5da3 The tiles the unit can move to are now displayed when selecting a unit, 
The hex borders have been changed to points
Thanks to Mihail Pastuhov for the ideas!
 2018-05-15 23:39:04 +03:00
Yair Morgenstern
030ddafce6 Bugfixes 2018-05-14 22:45:41 +03:00
Yair Morgenstern
a4fcc3a694 Happiness label in menu bar now displays unhappy face and red text if hapiness is negative 2018-05-11 16:19:40 +03:00
Yair Morgenstern
ec760e660f Fixed crash when settler didn't find a good city spot within 5 tiles 2018-05-11 10:39:54 +03:00
Yair Morgenstern
96a0961130 UI revamp to the top bar 2018-05-11 02:45:50 +03:00
Yair Morgenstern
4c4abb452c Fixed idiotic bug that caused the game to crash =( 2018-05-10 11:01:55 +03:00
Yair Morgenstern
d12b665e83 Added extra cities for civilizations (because I actually reached 10+ cities for an AI) 
City naming is now dependant on the names of existing cities and not on the umber of cities the civ currently has
 2018-05-09 22:59:32 +03:00
Yair Morgenstern
afa6478745 Horsemen can now move after attacking 2018-05-09 18:57:03 +03:00
Yair Morgenstern
9625a12ba2 Damage calculations are now according to extrapolated Civ V rules 2018-05-09 18:24:30 +03:00
Yair Morgenstern
c3a51460b7 More unit information and combat mechanics fixes 2018-05-08 11:56:51 +03:00
Yair Morgenstern
2d302ea2da Added Horseman, Catapult and Spearman, with all that entails 2018-05-08 10:58:26 +03:00
Yair Morgenstern
8b748384af Added chariot archer - includes adding requiredTech, requiredResource, and uniques to units 2018-05-07 23:42:58 +03:00
Yair Morgenstern
8350d000b1 Added units to civilopedia 
Added more info to civilopedia
 2018-05-07 12:33:49 +03:00
Yair Morgenstern
be5cd0c334 Can now properly pick great person (when relevant. e.g after finishing Liberty 
Victory conditions screen now includes cultural victory
 2018-05-06 18:03:49 +03:00
Yair Morgenstern
4e699f917e Organized automation classes 2018-05-06 11:48:01 +03:00
Yair Morgenstern
1a6e4d30f8 Can now see the units from within the city screen 2018-05-06 09:30:20 +03:00
Yair Morgenstern
fb1f381f06 Added FreeType, which lets us use whatever fonts we want 2018-05-01 21:41:02 +03:00
Yair Morgenstern
8d2edfefc7 Civilopedia help now shows correct text 
Sped up pollicy-related actions
 2018-04-27 15:24:31 +03:00
Yair Morgenstern
ace5a6efbf Worker automation fixed - ready for big update! 2018-04-26 21:29:20 +03:00
Yair Morgenstern
4d10e11482 Added Egypt, other civs can now build wonders! 2018-04-25 23:47:03 +03:00
Yair Morgenstern
9816cd57da Added "explored tiles" to civinfo, moved worker automation to separate class 2018-04-25 22:09:24 +03:00
Yair Morgenstern
453e25ffe7 City's tiles and worked tiles are now saved in the CityInfo and not in the TileInfo 2018-04-21 22:56:52 +03:00
Yair Morgenstern
d0f3a10728 Moved notifications to CivInfo, notifications on enemy actions removed 2018-04-18 00:00:31 +03:00
Yair Morgenstern
c6ebb733a1 Added Greece to civilizations, city names no come from the Civilizations json 2018-04-17 23:57:06 +03:00
Yair Morgenstern
221a8668fa Selected unit now has a white circle around it 2018-04-17 21:56:58 +03:00
Yair Morgenstern
34c1047b65 Fixed bug where enemy units were viewable despite the tile being unexplored 2018-04-12 21:52:00 +03:00
Yair Morgenstern
ca7fb9c3be Multiple IDE-suggested fixes 2018-04-11 23:46:00 +03:00
Yair Morgenstern
dd3d4b605f Added archer 2018-04-11 22:34:20 +03:00
Yair Morgenstern
872872cdf0 Desert color more distinct 2018-04-11 22:22:19 +03:00
Yair Morgenstern
32efae340b Unit table now displays ranged strength for ranged units 2018-04-09 19:09:08 +03:00
Yair Morgenstern
4de9ee106f City button padding expanded, warrior now has 2 strength as it should 2018-04-08 16:13:54 +03:00
Yair Morgenstern
f662cd910d Added a table in city screen, to show a breakdown of the ciy stats 2018-04-05 13:59:22 +03:00
Yair Morgenstern
39cc236fae City labels are colored according to civ, and scale down when zooming in 2018-04-05 12:47:10 +03:00
Yair Morgenstern
e5e0c5daa5 Now displays defender name properly, and not attacker name 2018-04-05 11:19:31 +03:00
Yair Morgenstern
461bea0cbc Healing units now attempt to go to better tiles to heal there 
Fixed bug where units moving from A to B would move multiple times between turns, effectively "jumping" distances
 2018-04-05 11:04:40 +03:00
Yair Morgenstern
7ff9f17943 Added battle modifiers, specifically - terrain defence bonuses 2018-04-04 23:10:16 +03:00
Yair Morgenstern
4e36aa0d5a No longer attempts to attack city that contains a unit 
Battle visualization bug fixed
 2018-04-04 17:37:59 +03:00
Yair Morgenstern
5d00adb7fe Added GetTile function to MapUnit, which simplifies and normalizes a lot of the unit logic 
Battle simulation and actual battle work as expected!
 2018-04-02 15:16:28 +03:00
Yair Morgenstern
bd1a191b15 Battle tabl now shows results of battle, added Barbarian civ 2018-04-01 15:01:48 +03:00
Yair Morgenstern
0a9317f8ca Removed old unit icons 2018-03-23 11:03:34 +03:00
Yair Morgenstern
96c217fec8 Added unit icons with the background according to owner 2018-03-22 23:45:28 +02:00
Yair Morgenstern
a8051bc930 Moved CityButton from TileGroup to WorldTileGroup 2018-03-21 22:03:37 +02:00
Yair Morgenstern
e496148e21 Tiles are now larger, population and units placed in a more visually pleasing way 2018-03-19 23:30:54 +02:00
Yair Morgenstern
9debc85501 Removed old terrain icons to decrease the size of the apk 2018-03-19 23:09:31 +02:00
Yair Morgenstern
66f900e4ec Changed terrain visualization - is now plain color awith overlays for terrain feature, looks really good! 2018-03-16 13:09:43 +02:00
Yair Morgenstern
53e332e9e8 Tutorials moved to a separate json file 2018-03-12 23:33:03 +02:00
Yair Morgenstern
c4736f0467 Map generation now generates areas coontaining the same terrain, rather than have each tile be a random terrain - much closerr to what you get in the real Civ game, even though we're pretty far from there 2018-03-10 22:01:10 +02:00
Yair Morgenstern
1a4a9d416c Unit control transferred to UnitTable 2018-03-07 18:37:16 +02:00
Yair Morgenstern
9b29944c2b All coe converted to Kotlin! 2018-03-02 15:34:24 +02:00
Yair Morgenstern
18be9e37b2 Converted all GameBasics to Kotlin 2018-02-24 22:43:41 +02:00
Yair Morgenstern
9253c40085 Added Kotlin! 2018-02-23 15:36:13 +02:00
Yair Morgenstern
397556f81f Deleted unneccesary files, minor changes that were pointed out by code inspection 2018-02-23 13:31:45 +02:00
Yair Morgenstern
6a2f4a07f1 Major overhaul - all tree items now have transient pointers to their parents, eliiminating the need for static calls for Civilization.Current and the like - neccesary if we want to have multiple civilizations 2018-02-23 12:57:52 +02:00
Yair Morgenstern
4d6b5c997d Split generating the map to a separate class 
Fixed bug loading game when multiple cities
 2018-02-05 23:19:58 +02:00
Yair Morgenstern
ce7a7916c1 - Fixed bug when picking legalism with less than 4 cities 
- Added City Center indication, made population image in city screen more prominent and clickable
 2018-02-03 21:49:46 +02:00
Yair Morgenstern
7cbddd883b Split WorldScreen functionality into components - civ stats table, tile info table, tile map holder, notificaations scroll, idle unit button 
Added yield on tiles
 2018-01-31 22:45:21 +02:00
Yair Morgenstern
b6d235a4d0 Automated actions should now choose best and closest tile to work on, differentiated pre- and post- turn actions 2018-01-22 22:57:17 +02:00
Yair Morgenstern
85ffcc58ee Added CivilizationPolicies, added great person pick when completing Liberty 2018-01-11 22:50:59 +02:00
Yair Morgenstern
546472b528 Organized classes into folders 2018-01-11 22:22:51 +02:00
Yair Morgenstern
63f24db67b Implemented line-of-sight according to terrain 2018-01-11 20:51:19 +02:00
Yair Morgenstern
5b28840940 Notifications now contain location, and are clickable when appropriate 2018-01-08 22:42:09 +02:00
Yair Morgenstern
6c035c79b6 Improved visuals of science victory screen 
Added Scout to game start
Added tutorials
 2018-01-08 18:52:30 +02:00
Yair Morgenstern
439efd7a40 Legalism now works! 2018-01-03 22:52:40 +02:00
Yair Morgenstern
9dad8908d6 Added basic tutorials 2018-01-03 22:36:56 +02:00
Yair Morgenstern
08735d8e99 Improvement building no longer generates notification 
Roads that turn to railroads now change color, and railroads are gray to help them stand out against the background
Map now contains a 50px padding from the edge
 2018-01-02 21:06:50 +02:00
Yair Morgenstern
c0927cf49f Added free social policies and expanded automation choices 2018-01-01 22:37:42 +02:00
Yair Morgenstern
befb0561b5 Added unit movement to further tiles 2017-12-30 22:58:36 +02:00
Yair Morgenstern
ab2b33318b Buildings are now divided by type in city screen 2017-12-28 21:50:17 +02:00
Yair Morgenstern
7b0b0b2f3b Great Person Points added to wonder description 
Fixed bug where university science percent would keep rising
Specialists are now per-building
 2017-12-28 21:11:58 +02:00
Yair Morgenstern
367f294774 Changed policy text to reflect repurposing 2017-12-25 23:22:28 +02:00
Yair Morgenstern
f7e7506b7c ADDED POLICIES 2017-12-25 23:18:25 +02:00
Yair Morgenstern
3f20e9b82e Added worker automation 
Solved multiple small bugs
 2017-12-21 20:32:33 +02:00
Yair Morgenstern
5088b6a83f Moar techtree overhaul 2017-12-21 15:31:01 +02:00
Yair Morgenstern
14c75d7cc4 Tech tree total overhaul - Based it on G&K but removed all war-only techs, normalized bonuses across techs 2017-12-21 14:45:49 +02:00
Yair Morgenstern
d81cb8cda7 Added specialists and great person generation! 2017-12-21 12:25:55 +02:00
Yair Morgenstern
98dbe3b844 Split buildings and units to 2 separate files and types - both are now IConstruction, and cityBuildings has been changed to cityConstructions will all that entails 2017-12-18 19:43:34 +02:00
Yair Morgenstern
f30ade602d Split buildings and units to 2 separate files and types - both are now IConstruction, and cityBuildings has been changed to cityConstructions will all that entails 2017-12-17 19:45:09 +02:00
Yair Morgenstern
561b1b5fdc added "required nearby improved resource" limitation to some buildings 
added circus, stone works and notre dame buildings
 2017-12-13 21:54:34 +02:00
Yair Morgenstern
761b62038f Observatory now available with astronomy 
Wealth and science production fixed to 4:1
Wonder bug fixed
 2017-12-12 22:31:48 +02:00
Yair Morgenstern
ede3a92c43 Finished techs and buildings! 
Added Science victory conditions and screen!
 2017-12-11 18:21:15 +02:00
Yair Morgenstern
45869c5a0b Railroads now provide 25% production bonus to connected cities 
Added techs and builings up to middle of modern era
 2017-12-09 22:11:16 +02:00
Yair Morgenstern
48f56e2e85 Added factories and civ resource management 2017-12-08 09:39:18 +02:00
Yair Morgenstern
ea5552f3a7 Added techs and buildings up to industral era 
Added option to remove jungles, forests and marshes
 2017-12-06 23:13:49 +02:00
Yair Morgenstern
635e8ce08a Game now fits to the screen, without 'extra bits' 
Roads now make movement cost 1/2 before machinery and 1/3 after
 2017-12-05 13:47:33 +02:00
Yair Morgenstern
65bff07905 Added option to produce science and gold 
Divided buildings into regular buildings and wonders in picker screen
Added notifications table at the bttom left
 2017-12-05 10:53:53 +02:00
Yair Morgenstern
4bb4187ab1 Organized unique wonder abilities by adding "unique" string to building 
Added Machu Pichu, Angkor Wat and Aqueduct unique abilities
Expanded civilopidia entry for buildings
Merged CityPopulation into CityInfo because the division was arbitrary
 2017-12-04 19:10:25 +02:00
Yair Morgenstern
d47d59146f Added movement costs to tiles and computed tiles that unit can travel to, and the distance (including roads) 2017-12-04 16:02:27 +02:00
Yair Morgenstern
f51923b1f6 Camelcased json model field names 2017-12-01 15:14:18 +02:00
Yair Morgenstern
996204e7f5 Added roads 
Removed libGdx images
 2017-11-30 22:31:00 +02:00
Yair Morgenstern
2f9d6af693 Improvements on tiles can advance 
Cannot create adjacent cities
Standardized function and parameter names
 2017-11-30 22:25:20 +02:00
Yair Morgenstern
c8dd598438 Added education buildings 2017-11-25 23:51:58 +02:00
Yair Morgenstern
d125c6ba3e Google play-able 
Units with no turns left are now grayed out
Added culture pool to cities and tiles being added to cities when pool fills
Changed tile icon order and placing of resource icon
 2017-11-25 21:56:04 +02:00
Yair Morgenstern
0319602092 Initial commit 2017-11-22 00:09:35 +02:00