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

3723 commits

This branch
This branch
All branches
Author SHA1 Message Date
JackRainy
1441dd49f5 Aircraft carrier is added (#1731) 
* Implemented aircraft carrier by @ltrcao in PR #1723

* New icon for the Carrier unit
 2020-01-20 22:53:59 +02:00
Timo T
b95844d2f4 Refactor: Streamline popups (#1735) 
First, `PopupTable` and all extending classes had the `Table` at the end removed. Second, the popup base classes `Popup(Table)` and `YesNoPopup(Table)` were moved from the worldscreen to the util package.

Third: The popups were inconsistent. In CameraStageBaseScreen, there was a check with 3 parts, one if any tutorial was showing, second if any child is a TradePopup, and third if the boolean field "hasPopupOpen" is true.

However, all of these checks were, in the end, `Popup(Table)`s on the screen. So, this check has simply been changed to check if any child is a `Popup(Table)`. All the other checks and their relating code could simply be removed.
 2020-01-20 19:13:21 +02:00
Marerjh
43e9ee112e Update Ukrainian translation + Missing translations (#1714) 
* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Tutorials_Ukrainian.json

* Update Nations_Ukrainian.json

* Update Ukrainian.properties

* Update template.properties

Missing translations
 2020-01-19 22:02:09 +02:00
Yair Morgenstern
f154ac1d6d 3.5.4 2020-01-19 21:58:38 +02:00
Smashfanful
f47df6d8b2 Update Italian.properties (#1716) 2020-01-19 21:45:31 +02:00
uvehj
7a0afc5c33 Update Spanish.properties (#1709) 2020-01-19 21:43:51 +02:00
LeMoonStar
f7eb5f5aa4 fixed typo in German sheep translation (#1717) 
* added German error message translation

* fixed typo in German sheep translation
 2020-01-19 21:43:40 +02:00
armandberger
4a5e15f094 small mistake correction (#1706) 2020-01-19 21:43:09 +02:00
Mayeul Cantan
2aeccb8193 Add labels to Github issue templates (#1729) 
Add "bug" and "add new feature" so that new issues are automatically
tagged with these labels.
 2020-01-19 18:44:46 +02:00
Federico Luongo
0a5aefcdd9 Fix Legalism Policy (#1724) 
Closes #1712
 2020-01-19 18:43:52 +02:00
Federico Luongo
fd765fc442 Hotfix empty entry in construction queue (#1725) 2020-01-19 18:41:25 +02:00
lyrjie
762af74b61 Barbarians don't move/attack on the turn of their spawning (#1719) 
* Barbarians don't move/attack on the turn of their spawning

* Revert "Barbarians don't move/attack on the turn of their spawning"

This reverts commit b088fb8c

* Better implementation

Co-authored-by: dumichno <57294813+dumichno@users.noreply.github.com>
 2020-01-19 18:40:44 +02:00
Yair Morgenstern
32ba55b2fe Added many more resource+improvement images 2020-01-18 22:35:18 +02:00
lyrjie
7805f90dab Fix: ships being teleported into landlocked cities (#1718) 
* Fix: ships being teleported into landlocked cities

* Proposal: extend the city teleport to all owned tiles

* Utilizing the existing method

Co-authored-by: dumichno <57294813+dumichno@users.noreply.github.com>
 2020-01-18 22:14:29 +02:00
Yair Morgenstern
014220c480 Merge tag '3.5.3-patch1' 2020-01-18 21:58:09 +02:00
lyrjie
8efe21ea57 Fix: barbarians pillaging ancient ruins (#1720) 
Co-authored-by: dumichno <57294813+dumichno@users.noreply.github.com>
 2020-01-18 21:56:22 +02:00
Yair Morgenstern
66637637f4 findFurthestTile no longer crashes when the unit has no tiles it can move to 2020-01-18 21:20:28 +02:00
Yair Morgenstern
02def2ffa9 Resource+Improvement is go! 
Added resource-specific plantations by The Bucketeer
 2020-01-17 15:07:47 +02:00
SheepYang
db5c7234f3 simplified Chinese translations (#1707) 
* simplified Chinese translations

* simplified Chinese translations
 2020-01-17 14:30:50 +02:00
Marerjh
02f57b4b09 Update Nations_Ukrainian.json (#1698) 
* Update Nations_Ukrainian.json

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Nations_Ukrainian.json

* Update Nations_Ukrainian.json

* Update Ukrainian.properties
 2020-01-16 22:08:52 +02:00
rayray61
21e47741fe Patch 1 (#1705) 
* Create Turkish.properties

* Update Turkish.properties

* Update completionPercentages.properties

* Update completionPercentages.properties

* Update Turkish.properties
 2020-01-16 14:28:11 +02:00
lyrjie
d3e88906d6 Fix: starting units being able to spawn on Ancient Ruins/Barbarian encampments (#1691) 
* Fix: starting units being able to spawn on Ancient Ruins/Barbarian encampments

* Added doc and commentary
 2020-01-16 12:06:43 +02:00
Yair Morgenstern
90abfda3a4 3.5.3 2020-01-15 23:57:52 +02:00
Yair Morgenstern
5af6dd1ad5 More resource images by The Bucketeer 2020-01-15 23:56:02 +02:00
Oleg
7b87ad01ef Update Russian.properties (#1702) 
Fixed translation
 2020-01-15 23:26:04 +02:00
Smashfanful
dc7b1464d3 Update Italian.properties (#1695) 2020-01-15 23:25:11 +02:00
Yair Morgenstern
c1c6f93f6d Ancient ruins are no longer save-scummable 2020-01-15 22:21:00 +02:00
Yair Morgenstern
b73e7100c0 Resolved #1700 - As per original civ, you no longer start with a scout. 2020-01-15 22:11:05 +02:00
lyrjie
ad1a57dd02 Map reveal after singleplayer defeat (#1681) 
* Added map reveal when the player is defeated in singleplayer

* Added victory (actually defeat) screen when the player is defeated

* Moved the victory screen navigation to an appropriate place

* Moved the map reveal logic to WorldMapHolder

* Tutorials and Diplomacy button are hidden after the defeat
 2020-01-15 19:56:01 +02:00
Timo T
8e12e059ac Fix meaning of work boat capability translation (#1694) 
"May create improvements on water resources" was translated as if it was "May create improvements on water tiles". I fixed this so the translation is correct now
 2020-01-14 18:46:46 +02:00
lyrjie
0a12062c70 Fix: "Pick construction" tutorial never completes (#1693) 2020-01-14 15:28:18 +02:00
lyrjie
81258297d5 Fix: ability to buy the same building multiple times (#1692) 2020-01-14 15:21:12 +02:00
Yair Morgenstern
525b67c7c6 3.5.2 2020-01-13 19:21:12 +02:00
armandberger
ce5afae215 new french translation (#1688) 2020-01-13 19:03:13 +02:00
Horațiu Mlendea
4886e2f259 Romanian translations (#1677) 
* Update Romanian.properties

* More romanian translations

* Update Romanian.properties

* Update Romanian.properties

* Update Romanian.properties

* Fix
 2020-01-13 19:02:58 +02:00
Oheto
32772919d0 Update Russian.properties (#1668) 
* Update Russian.properties

* Update Russian.properties
 2020-01-13 19:02:25 +02:00
Federico Luongo
f118be5d40 Adopted JSONC standard for assets files (#1674) 
* Adopted JSONC standard for assets files

* Update Nations_Ukrainian.json

* Update Nations_Ukrainian.json

* Normalized Nations_Ukrainian too

Co-authored-by: Marerjh <40261003+Marerjh@users.noreply.github.com>
 2020-01-13 19:01:27 +02:00
lyrjie
2d0aec5a26 Fix: idle units not being properly selected after settling a city (#1685) 
Closes #1682
 2020-01-13 13:29:38 +02:00
NoNZeeZ
4f0435bdc6 Create Tutorials_Thai.json (#1683) 
I still waiting for thai language release in someday. So sad man TT
 2020-01-13 12:32:58 +02:00
Duan Tao
72df6869a3 Make sure all building be built before producting science. (#1678) 2020-01-13 12:06:19 +02:00
Yair Morgenstern
9a426318ba Proper destruction notification for city states 
Added Fur resource image
 2020-01-13 00:09:09 +02:00
JackRainy
0d889989c6 Improved Ukrainian translations (#1673) 
* Improved Ukrainian translations

* Minor corrections
 2020-01-12 23:35:57 +02:00
Federico Luongo
5e003cfd64 Fix Map Editor Lag (#1670) 
In painting mode, only the last drawn tiles are updated.
 2020-01-12 23:29:26 +02:00
Horațiu Mlendea
aad18f29c8 Romanian translations (#1659) 
* Update Romanian.properties

* More romanian translations
 2020-01-12 23:27:28 +02:00
JackRainy
de7a369131 Fix of the Regex expression to heal after the battle (#1676) 2020-01-12 23:24:00 +02:00
Yair Morgenstern
08218b954e healUnit and tryPillageImprovement in BarbarianAutomation use their counterparts from UnitAutomation, because they're basically exactly the same 2020-01-12 23:21:34 +02:00
JackRainy
8a327fa7be Fix for the "Back button can't end Unciv (#1513)" (#1661) 
* Callback to exit the game by 'Back' button

* Prompt dialog for the game exit

* Additional strings for translations are generated

* Do not show exit prompt dialog twice
 2020-01-12 23:05:49 +02:00
Yair Morgenstern
ca59dc4e1f Removed redundant "else"s for less indentation and 'happy pathing' 2020-01-12 20:52:23 +02:00
Vladimir Tanakov
725edc2a31 Better barbarian automation (#1560) 2020-01-12 20:48:34 +02:00
Oheto
02ec64f14f Update Ukrainian.properties (#1667) 
* Update Ukrainian.properties

«Кіннота» is more ukrainian word then «Кавалерія»

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties
 2020-01-12 08:44:09 +02:00