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

883 commits

Author SHA1 Message Date
Yair Morgenstern
8d79cca70d Fixed Ottomans naval capture unique 2019-07-05 12:23:58 +03:00
Yair Morgenstern
185ec10f10 Can now see when city contains air units 2019-07-03 23:32:17 +03:00
Smashfanful
273b06aa3a Update Other.json 
Italian corrections.
 2019-07-02 12:15:48 +03:00
Am-per-Sand
275fa5842a Shorten city screen strings of Other.json 
Stopped population growth
...turns to lose/new population
expansion turns to, - stopped
 2019-06-30 22:25:13 +03:00
Yair Morgenstern
0eb28b9ae7 Great General bonus affects naval units (as long as we don't have Great Admirals in the game) 2019-06-30 19:48:47 +03:00
Am-per-Sand
12b9472805 Fixed same name for different units bug 2019-06-29 23:17:46 +03:00
Smashfanful
06d1bd6881 Update Nations_Italian.json 2019-06-27 11:38:33 +03:00
Smashfanful
ac664d97c9 Update Units,Promotions.json 2019-06-27 07:26:05 +03:00
Am-per-Sand
ad2704f6af typo fix in Notifications 2019-06-27 07:25:28 +03:00
Yair Morgenstern
921dd28296 Unified "Bonus vs" translations 2019-06-25 23:09:58 +03:00
Yair Morgenstern
c517dd9d64 Added the Ottomans! #703 2019-06-25 23:00:55 +03:00
Yair Morgenstern
7e50f70bd5 Resolved #899 - Added setting to disable city auto-picking construction 2019-06-24 19:35:45 +03:00
Smashfanful
2f97ed54c0 Update NewGame,SaveGame,LoadGame,Options.json 2019-06-24 14:48:55 +03:00
Smashfanful
469553de14 Update Nations.json 2019-06-24 12:35:04 +03:00
Smashfanful
78ad8a932a Update Nations_Italian.json 2019-06-24 08:11:24 +03:00
Smashfanful
be02ad5839 Update Diplomacy,Trade,Nations.json 
Added other leaders
 2019-06-24 08:11:07 +03:00
Yair Morgenstern
3b9ab43bbe Resolved #898 - added option to disable tutorials 2019-06-24 06:43:51 +03:00
Yair Morgenstern
d9bd0fa6b8 Resolved #897 - split initial tutorial, which was too long, into several parts 2019-06-24 06:37:45 +03:00
Smashfanful
18d7446fab Update Diplomacy,Trade,Nations.json 
Added Leader names
 2019-06-23 08:56:40 +03:00
Smashfanful
bc26edfe81 Update Other.json 
Added new translation lines
 2019-06-23 08:56:17 +03:00
Smashfanful
d0dc3e4bd6 Update Nations_Italian.json 2019-06-22 23:23:42 +03:00
Smashfanful
418bc140e8 Update Units.json 
I f**king messed up Ballista. HOORRAAY!
 2019-06-21 13:47:03 +03:00
Smashfanful
af295f4fab Update Units.json 
Added Composite Bowman
 2019-06-21 13:20:39 +03:00
Smashfanful
beedcc5896 Update Buildings.json 
Corrections and additions
 2019-06-20 20:44:30 +03:00
Yair Morgenstern
a1e1b91b9a Added Civ icon to cities 
Improved City Connection icon
 2019-06-19 20:13:32 +03:00
Yair Morgenstern
a6d1cdc398 Unified civ display in Overview and Victory screens 2019-06-19 19:20:25 +03:00
Yair Morgenstern
227f6627be Resolved #883 - Added Civilization icons 2019-06-19 18:43:25 +03:00
Smashfanful
d39e57bf46 Update Units,Promotions.json 
Added Landsknecht
 2019-06-19 10:40:07 +03:00
Smashfanful
353d6a6557 Update Notifications.json 2019-06-17 20:41:51 +03:00
Smashfanful
9c0995ad5a Update Nations_Italian.json 2019-06-17 20:41:07 +03:00
Smashfanful
a18616a25b Update Diplomacy,Trade,Nations.json 2019-06-17 20:40:31 +03:00
Yair Morgenstern
b2afc838a6 Resolved #533 - Added nation-dependant start location biases 2019-06-17 12:51:57 +03:00
Yair Morgenstern
853a325876 Added German nation - #703 2019-06-17 11:20:15 +03:00
Smashfanful
eb711b9a79 Update Diplomacy,Trade,Nations.json 
Added new translation lines
 2019-06-16 20:40:34 +03:00
Smashfanful
be7baaa117 Update NewGame,SaveGame,LoadGame.json 2019-06-16 18:42:54 +03:00
Smashfanful
0726e7799d Update Notifications.json 
New Translation lines
 2019-06-16 18:42:32 +03:00
david.enrique
56ff436f94 Add victory type choice on new game screen 2019-06-15 22:38:02 +03:00
Smashfanful
f50e9c186d Update Other.json 2019-06-15 22:28:16 +03:00
Yair Morgenstern
5943d1e12e Apollo Program is now a NATIONAL wonder, so multiple civs can compete for Science Victory 2019-06-13 22:10:52 +03:00
Smashfanful
5ddd4c7d7b Update Nations.json 
Added Siamese (in comments)
 2019-06-13 15:23:56 +03:00
Smashfanful
6d82e42e1c Update Nations_Italian.json (#869) 
* Update Nations_Italian.json

Corrections

* Update Nations_Italian.json

* Update Nations_Italian.json
 2019-06-13 15:23:31 +03:00
Yair Morgenstern
b7be0e7934 Each Civ now has a preferred victory type, and makes construction choices based on said type 2019-06-12 22:01:37 +03:00
Yair Morgenstern
89020c8916 Removed ThorfMaps tiles - were much uglier than the other 2 tilessets and unneccesary 2019-06-12 22:00:35 +03:00
Smashfanful
772a825cfa
Update Diplomacy,Trade,Nations.json 2019-06-10 16:02:53 +02:00
Yair Morgenstern
d5a0894f75 Added diplomatic reprecissions for demands that the other civs is unwilling to fulfil 
Removed WeAgreedNotToSettleNearThem flag - was reverse copy of AgreedNotToSettleNearUs
 2019-06-10 16:18:59 +03:00
Smashfanful
477a4c4dc4 Update Other.json 
Added some Italian translations
 2019-06-09 22:37:22 +03:00
denrique88
0803063017 Correction of french translation of the tutorial 2019-06-09 22:29:43 +03:00
Yair Morgenstern
84bcfe2d39 Added "Community" tab in the menu, with links to the Github and Discord 2019-06-07 15:55:48 +03:00
Smashfanful
8e9fc1108e Update Diplomacy,Trade,Nations.json 
New Italian translations
 2019-06-07 14:32:56 +03:00
Smashfanful
5451eb0540 Update Nations_Italian.json 
Corrections. That must be the cause for the crashes in the Italian version.
 2019-06-07 14:32:21 +03:00
Yair Morgenstern
f713d266db Implemented "Don't settle cities near us", which goes both ways - a good basis for further demands (#831) 2019-06-07 13:04:18 +03:00
Yair Morgenstern
e8bdb8a2e4 Added initial logic for promising not to settle cities near other civs - not yet activated 2019-06-05 23:21:17 +03:00
Yair Morgenstern
ab450808b2 Can no longer pass the turn when popups have not been dealt with 2019-06-05 23:18:03 +03:00
Smashfanful
0153added5 Update Nations.json 2019-06-04 18:04:11 +03:00
Smashfanful
a039c6592b Update Nations.json 
Corrections and addition of Greek unique
 2019-06-04 18:04:11 +03:00
Smashfanful
3e22cdf72d Update Nations_Italian.json 2019-06-04 18:03:34 +03:00
Smashfanful
0cedc1a5e8 Update Nations_Italian.json 
Added Greek Unique
 2019-06-04 18:03:34 +03:00
Smashfanful
9bfa71898a Update Units.json 2019-06-04 12:34:28 +03:00
Smashfanful
d8d5274c9e Update Units,Promotions.json 2019-06-04 12:33:52 +03:00
Yann
f0293b5f2a Update French Translation for Diplomacy,Trade,... 2019-06-04 12:33:05 +03:00
Smashfanful
5dcaaab0d1 Update Italian Translation Other 
Added a missing Italian translation
 2019-06-04 12:32:37 +03:00
Yann
e7bd6fb0b3 Update French Translation of NewGame,SaveGame,... 2019-06-04 12:32:04 +03:00
Yann
9b7baa6a9e Update French Translation on Notification 2019-06-04 12:31:37 +03:00
Yann
493d21ff54 Update French Translation of Buildings 2019-06-04 12:31:03 +03:00
Yann
6f0016134d Update French Translation of Units.Promotions 2019-06-04 11:13:32 +03:00
Yann
1b5960477c Update French Translation of Other 2019-06-04 11:13:04 +03:00
Yair Morgenstern
cf37122304 Translation organization 2019-06-02 23:31:16 +03:00
Smashfanful
28eb9e61d4 Update Nations.json 
Added some correction proposings
 2019-06-02 19:43:40 +03:00
Smashfanful
40831ca17d Update Nations_Italian.json 
Added Mongols and corrected some lines
 2019-06-02 19:43:12 +03:00
Smashfanful
7803d3ebdf Update Nations.json 
Added two propositions for City-States
 2019-06-02 17:25:57 +03:00
Smashfanful
ca9b39a4c6 Update Nations_Italian.json 2019-06-02 17:25:23 +03:00
Smashfanful
8fc4ed6491 Update Notifications.json 2019-06-02 17:25:06 +03:00
Yair Morgenstern
36da3359db Added denunceation 2019-06-01 23:20:02 +03:00
Yair Morgenstern
f60ebbb7e1 Civs clearing an encampment now get gold 2019-06-01 22:47:41 +03:00
Yair Morgenstern
4b4f5e77b8 Resolved #646 - Barbarians now spawn from Encampments! 2019-05-31 17:36:19 +03:00
Yair Morgenstern
b068e6f88f Minor translation changes 2019-05-30 19:57:27 +03:00
Yair Morgenstern
b9cf40487f Performance improvements for Next Turn 2019-05-29 22:10:32 +03:00
Smashfanful
85c86e0b02 Update Buildings.json 
Added some unique units and corrected some Italian lines
 2019-05-29 17:31:32 +03:00
Yair Morgenstern
3fbcc019e3 There were somes things that were in the translations files but weren't translated in-game 2019-05-28 23:43:18 +03:00
Smashfanful
8f81fd0c3d Update Tutorials_Italian.json 2019-05-28 22:54:43 +03:00
Smashfanful
a285a8031c Update Other.json 2019-05-28 16:58:25 +03:00
Smashfanful
b190524ae3 Update Notifications.json 2019-05-28 16:57:11 +03:00
Smashfanful
db99683090 Update Nations.json 
Corrections
 2019-05-28 16:56:47 +03:00
Smashfanful
a2efab3378 Update Nations_Italian.json 
Added City-States
 2019-05-28 16:56:18 +03:00
Smashfanful
c01acee372 Update Units,Promotions.json 
Added Indian unique unit
 2019-05-27 17:11:52 +03:00
Smashfanful
034b3dfa5e Update Buildings.json 
Added Indian unique building
 2019-05-27 17:11:27 +03:00
Smashfanful
147779b0e8 Update Other.json (#807) 
Italian translations to City-States
 2019-05-27 17:10:54 +03:00
Yair Morgenstern
a204333410 Added countdown to relationship change with city states 2019-05-26 18:52:32 +03:00
Yair Morgenstern
1bb62ad681 Civs respond according to neutral/hate and respond properly after peace 2019-05-26 18:32:19 +03:00
Yair Morgenstern
408dfcfc7e Final touches to City States, and they're ready to roll! 2019-05-26 16:10:09 +03:00
Smashfanful
e4125e52c0 Update Nations_Italian.json 
Added Indian intro phrases
 2019-05-26 15:32:37 +03:00
Smashfanful
a67fc9d55d Update Other.json 2019-05-25 23:14:18 +03:00
Smashfanful
89854ec195 Update Nations_Italian.json 2019-05-25 23:13:46 +03:00
Yair Morgenstern
25fc1b3c71 Last fixes for Indian nation! 
Checks for specific buildings now work for all civ-unique buildings as well
 2019-05-24 13:59:00 +03:00
Yair Morgenstern
7e6b102f27 Merge branch 'roadOnLongClick' 2019-05-23 22:21:46 +03:00
Smashfanful
f988279f1d Update Other.json 
Another Italian translation
 2019-05-23 16:27:06 +03:00
Smashfanful
fcdb609b0e Update Notifications.json 
Italian Translations
 2019-05-23 16:26:11 +03:00
martin
6bd06474bd improved overview city screen 
- dynamic layout
- cities and units sorted by name
- jump-to buttons for cities
- rounded values in statistics
 2019-05-23 16:25:47 +03:00
martin
d676c18aec adding MapUnitAction.name(), a user-readable name for actions. Eg "Moving" instead of "moveTo x,y" 2019-05-23 07:57:34 +03:00
martin
98803f0454 implementing BuildLongRoadAction 2019-05-22 22:23:03 +03:00
Yair Morgenstern
c83844f600 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-05-22 22:08:14 +03:00
Smashfanful
798adad4a9 Update Other.json 
More Italian translations.
 2019-05-22 22:07:59 +03:00
Yair Morgenstern
ea9c9da48d Added missing notification translations (#792) 2019-05-22 22:07:50 +03:00
Smashfanful
eefdb997b5 Update Notifications.json 
Italian corrections.
You also forgot to write:
"Enemy city has damaged unit"
"Enemy city has destroyed unit"
"A faraway land has built Wonder"
 2019-05-22 22:01:27 +03:00
martin
c8c3370cb9 show "rough terrain" property in Civilopedia 2019-05-22 21:57:14 +03:00
Yair Morgenstern
fd4123e15f City state icon in city button now visible and colored according to city-state color 2019-05-20 22:22:16 +03:00
Yair Morgenstern
f46baec89f Resolved #770 - City-states now colored as per original civ, with black primary color 2019-05-20 22:03:43 +03:00
sulai
f905fa8068 Single tap pickers for improvements and promotion (#765) 
* single tap picker (improvements, policies and promotions), tbd: split button

* improvement and promotion pickers: using split buttons featuring a question mark. allows single-tap choice.

* improvement picker and promotion picker: show "pick now" to the right of the button
 2019-05-20 20:38:50 +03:00
sulai
fdf95317f0 units support single-tap move (#750) 
* implemented single tap move
- units stay selected after move (to go on moving)
- and they are de-selectable by taping them again (to abort moving)

* unit movement: mark the reachable spots clearly to avoid accidental movement

* unit action: when an exclusive decision is made, deselect unit

* clicking on the unit information in the UnitTable will show that unit + minor fixes

* siege units won't show movement hints when set up, while packing up does not cost any movement points

* workers: highlight button when constructing an improvement, won't sleep then

* fixed units not being de-selected when clicking the UnitTable or "next unit" button

* zooming forwards clicks on to the map, so we need to deselect units in that case

* clean up branch

* added "Move units with a single tap" to options menu
 2019-05-20 20:08:59 +03:00
Smashfanful
d07e406510 Update Other.json 
You forgot a phrase.
 2019-05-20 19:49:57 +03:00
Smashfanful
22c45af5d8 Update Nations_Italian.json 2019-05-20 16:18:24 +03:00
Yair Morgenstern
00ef4d171c Removed portuguese misspelling 2019-05-19 22:04:56 +03:00
Smashfanful
b24d21331e Update Other.json (#773) 
Another Italian translation
 2019-05-19 17:02:25 +03:00
Yair Morgenstern
85e0f892d5 Fixes for 700caf3 2019-05-19 07:32:13 +03:00
luanrodriguesmoura
700caf3714 Portuguese translations added 
if you are going to credit someone give credit my old acount (luanrmoura55 if my memory serves me right)... like just... please.
 2019-05-19 07:06:36 +03:00
Brian Gainor
cd77074045 Fix typos in Nations.json 2019-05-18 23:20:19 +03:00
Yair Morgenstern
054b3b000d Resolved #752 - Added big friendship penalty for betraying declaration of friendship 2019-05-17 15:00:24 +03:00
Yair Morgenstern
2e16a96c4d Can no longer gift city states with gold you don't have 2019-05-16 22:08:45 +03:00
Smashfanful
1f498f3fa6 Update Other.json 
Added Italian translations
 2019-05-16 19:45:38 +03:00
Smashfanful
f6a26aaee3 Update Notifications.json 
Added Italian translations.
 2019-05-16 19:44:02 +03:00
sulai
9ce7959d32 more ui improvements (#757) 
* unit action: when an exclusive decision is made, deselect unit

* clicking on the unit information in the UnitTable will show that unit + minor fixes

* siege units won't show movement hints when set up, while packing up does not cost any movement points

* workers: highlight button when constructing an improvement, won't sleep then

* fixed broken saved game

* show messages if exploring is done or WorkerAutomation is done

* Revert "siege units won't show movement hints when set up, while packing up does not cost any movement points"

This reverts commit b805993a
 2019-05-16 17:54:58 +03:00
Smashfanful
85b7607d58 Update Other.json 
Another Italian line fixed
 2019-05-15 16:37:53 +03:00
Smashfanful
6c7edd60ac Update Notifications.json 2019-05-15 14:19:02 +03:00
Smashfanful
ced4840e8e Update Buildings.json 2019-05-15 14:18:49 +03:00
Smashfanful
be911d8903 Update Other.json 
Improved Translations
 2019-05-15 14:18:31 +03:00
Smashfanful
cc2c9c3487 Update Nations_Italian.json 2019-05-15 14:18:17 +03:00
lishaoxia1985
17a856c0a5 Update Other.json 2019-05-15 14:17:58 +03:00
lishaoxia1985
1bc40b01b4 Update Notifications.json 2019-05-15 14:17:58 +03:00
lishaoxia1985
7b34277a7e Update Other.json 2019-05-15 14:17:58 +03:00
martin
157e6e81a8 don't flood the player with similar messages about spotted enemies. instead cycle through units by clicking the message multiple times. 2019-05-14 17:07:01 +03:00
Yair Morgenstern
48af218795 Strategic resources cost more in trade from a civ who's at war and can use them for units 2019-05-13 22:23:30 +03:00
Smashfanful
5463e36cca Update Other.json 
Improved Italian translations
 2019-05-13 18:04:08 +03:00
Smashfanful
e348687bce Update Policies.json 2019-05-13 18:03:37 +03:00
Smashfanful
e9700937f7 Update Units,Promotions.json 
Improved Italian translation.
 2019-05-13 18:01:47 +03:00
martin
eaa0a9dbad when a unit is selected, use the ? button to read about it in the Civilopedia 2019-05-13 17:17:27 +03:00
Yair Morgenstern
a9a1962cec Continuation of #738 - readability, and solves case where 2 civs have unique buildings to the same base building (say Royal Library and Paper Maker) 
#729 - AddCultureBuilding now adds civ-specific building (e.g. Burial Tomb), not just checks to see if it's built
 2019-05-12 22:24:11 +03:00
Yair Morgenstern
24a71b16f2 Trade button changed to "Negotiate Peace" when at war, and peace treaties are a must when "trading" in this situation 2019-05-11 23:32:12 +03:00
lishaoxia1985
20d05aa8e0 all chinese font will show well (#739) 
* update some diplomacy words in chinese

* all chinese font can be show well

* Update Fonts.kt

* update chinese language
 2019-05-11 22:20:41 +03:00
Yann
7c146f4aea Update French Version + mark duplicated & translation that didn't work (#728) 
* Update French Version + mark duplicated & translation that didn't work

duplication mark : //duplicated
translation mark : //Don't translate in diplomacy view 
or //You misses this translation, said Smashfanful

* Update Other.json
 2019-05-11 22:16:16 +03:00
Yann
52a676f5cb Add French Tutorial 2019-05-10 18:20:54 +03:00
lishaoxia1985
656246cd10 all chinese font can be show well 2019-05-10 18:20:27 +03:00
lishaoxia1985
93bf8333ca update some diplomacy words in chinese 2019-05-10 18:20:27 +03:00
lishaoxia1985
c37983667c move some words into other translation files,the city name can be changed with setting 
although the city name can be changed with setting,it's only correct when you build a new city or start a new game.if you change the game language in game progress it will miss some font.
 2019-05-09 23:16:47 +03:00
Duan Tao
c221d50e01 Add 2 more type of city-states. 2019-05-09 18:54:43 +03:00
Smashfanful
7db1298ded Update Other.json 2019-05-08 22:01:01 +03:00
Smashfanful
d0c9f57fc9 Update Other.json 
Updated Italian translations.
 2019-05-08 22:01:01 +03:00
Yair Morgenstern
b3a4ed4c4f Declaration of Friendship is go! 
I'm sure there's stuff I've forgotten but there is just so much that happens in diplomacy that is dependant on these declarations
 2019-05-08 18:48:36 +03:00
Yair Morgenstern
75bdced3c6 Added Declaration of Friendship logic 
@ninjatao - I changed your BorderConflict into a DiplomacyFlag, and so all the logic of "removing every turn and deleting if 0" is built-in =)
 2019-05-08 17:24:56 +03:00
Smashfanful
3106127dc4 Update Units,Promotions.json 
Italian translation for Instant Cure and its effects
 2019-05-08 16:40:11 +03:00
Yair Morgenstern
8ce1613559 Resolved #698 - Added Heal Instantly 'promotion' 2019-05-08 16:03:01 +03:00