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

1744 commits

This branch
This branch
All branches
Author SHA1 Message Date
Yair Morgenstern
7e6b102f27 Merge branch 'roadOnLongClick' 2019-05-23 22:21:46 +03:00
Yair Morgenstern
81fcc31f2a Gradle update 2019-05-23 22:08:38 +03:00
Amper-sandd
af19d8a1b0 add Indian assets (#800) 
* War Elephant icon

* Mughal Fort icon

* credits for Indian unique icons

* bonuses for Castle apply to Mughal Fort too

* getCityHappiness() complies with the Indian unique

* getCityHappiness() complies with the Indian

missing bracket 🙄
 2019-05-23 21:50: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
c3f700ddc6 notifications with LocationAction don't select units, but only the tile 2019-05-23 16:25:08 +03:00
martin
b49270e690 moving city button with absolute coordinates to prevent it from wandering around (#794) 2019-05-23 16:25:08 +03:00
martin
eb3ba51396 allow siege units to move when set up (#797) 2019-05-23 16:25:08 +03:00
martin
c31f6bc7dd show context menu entry only if roads are researched 2019-05-23 07:57:34 +03:00
martin
73c273985f worker moves on working on road even when the path is blocked by other civilian units. Player will receive messages about those occasions. 2019-05-23 07:57:34 +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
4330508d2e using StringAction for string-encoded actions used throughout the app 2019-05-23 07:57:34 +03:00
Yair Morgenstern
29647896ce We no longer "downgrade" tiles from Railroad to Road when we try to build a Road somewhere 
Fixed error where if intermediate tiles were full (o e.g. other workers) it would try to "jump" to a tile that was out of its reach
 2019-05-22 22:55:24 +03:00
martin
98803f0454 implementing BuildLongRoadAction 2019-05-22 22:23:03 +03:00
martin
a8c3b3755b adding MapUnitAction, which is compatible to MapUnit.action 2019-05-22 22:23:03 +03:00
martin
86eda6208a show long-press context menu (move here, Construct road this way) 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
martin
0e1a7f44c4 fixed enemy city buttons not to be clickable. simplifies tile selection when attacking 2019-05-22 21:57:14 +03:00
martin
d3f7a73cf3 allow siege units to go sleeping even when set up 2019-05-22 21:57:14 +03:00
Yair Morgenstern
ca05c10016
Update README.md 2019-05-22 21:55:07 +03:00
sulai
b5138b6527 auto save on dispose (#774) 
* auto save on dispose

* auto save: clone game info outside the save-game thread

* keep autosaves for the last 10 turns
 2019-05-21 08:18:34 +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
Yair Morgenstern
bec3c2a224 City button moved back before units 2019-05-20 20:37:25 +03:00
Yair Morgenstern
d08e9fe525 Units are now selectable again - #750 2019-05-20 20:22:24 +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
Yair Morgenstern
3cfe3a7f73 Resolved #787 - when selecting bombardable enemy unit with no military unit selected, bombarding city is automatically selected 2019-05-20 20:06:08 +03:00
Smashfanful
d07e406510 Update Other.json 
You forgot a phrase.
 2019-05-20 19:49:57 +03:00
Yair Morgenstern
a54f68528f Resolved #782 - Wonders are no longer built twice under "race conditions" 2019-05-20 19:48:18 +03:00
sulai
95a3a65c34 Ui improvements (#779) 
* Notifications scroll: keep scrolling position on game update if it's still the same list

* tech picker shows current/recent technology centered on the screen

* using NotificationAction interface to attach various actions to Notifications

* tech notifications: center on tech that was discovered
 2019-05-20 16:31:04 +03:00
Smashfanful
22c45af5d8 Update Nations_Italian.json 2019-05-20 16:18:24 +03:00
sulai
db6e2faff8 CityButton: render units in front (#784) 
* CityButton: render units in front

* First click on single button: move down. Second click: open city screen.
 2019-05-20 16:17:27 +03:00
Yair Morgenstern
4a97d3ea18 Fixes to city button - now allows for units to be selected in the city (#771) 2019-05-19 22:58:24 +03:00
Yair Morgenstern
5c4be33418 Resolved #596 - unit retains focus when moved to tile with another unit already in it, if it has movement points left 2019-05-19 22:31:16 +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
Yair Morgenstern
20450250bd Resolved #778 - AI construction would generate too many workers late-game 2019-05-18 23:30:52 +03:00
Brian Gainor
081ed9dc4a Check terrain requirements for buildings first 
If a city isn't next to a mountain, it shouldn't show Observatory with
"Needs a Library".
 2019-05-18 23:22:51 +03:00
Brian Gainor
cd77074045 Fix typos in Nations.json 2019-05-18 23:20:19 +03:00
sulai
73e397c2c2 Improved city button (#771) 
* improved CityButton

* keep city button out of the way if a unit on the city tile is selected

* fixed city button to be clickable always. however this hides units behind it

* added click area for city buttons in an own layer, so the units render in front and the city button click area handles the clicks

* city button: simplified code
 2019-05-18 23:09:02 +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
0e54a1b91c City button now looks normal when being razed or in resistance - before the health bar positioning ade the entire button totally out of whack 2019-05-17 14:26:07 +03:00