mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-02 12:24:15 +07:00
Code Issues Packages Projects Releases Wiki Activity
666 Commits 6 Branches 1,047 Tags 1.1 GiB
c1e070018f
Commit Graph

308 Commits

Author SHA1 Message Date
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