Commit Graph

7486 Commits

Author SHA1 Message Date
Yair Morgenstern
315adb7648 4.1.13 2022-06-22 09:47:51 +03:00
Yair Morgenstern
147b73fad2
Version rollout (#7259)
* Bump version and create initial changelog entry

* Update French.properties (#7258)

* translation (#7253)

* Update Simplified_Chinese.properties (#7251)

* Update Simplified_Chinese.properties

Imcomplete. A save commit only.

* Update android/assets/jsons/translations/Simplified_Chinese.properties

* Update Italian.properties (#7245)

* Update Filipino.properties (#7235)

* Improve German.properties (#7231)

* Update Lithuanian.properties (#7229)

* Update Catalan.properties (#7225)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: alexban011 <alexban011@gmail.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Timo T <azzurite@gmail.com>
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
2022-06-22 09:36:33 +03:00
Timo T
68cc4303ec
Make popups and text fields nicer to interact with on Android (#7211)
* Make popups and text fields nicer to interact with on Android

* Refactor: Rename createTextField to UncivTextField.create

* Fix multiplayer save delete text
2022-06-22 09:32:20 +03:00
SomeTroglodyte
a13a39293f
Rework Policy and Diplomacy buttons (#7027)
* WordScreenTopBar rework, portrait-friendlier

* WordScreenTopBar rework, portrait-friendlier - NotificationsScroll

* WordScreenTopBar rework, portrait-friendlier - Rounded corners

* WordScreenTopBar rework, portrait-friendlier - Tweak padding

* WordScreenTopBar rework, portrait-friendlier - review

* Worldscreen reorg 1 - Tech policy Diplomacy

* Tech Policy Diplomacy buttons - postmerge fix and 7130 simpler
2022-06-22 09:31:07 +03:00
OptimizedForDensity
50e479b21d
Fix cases where AI great people get stuck trying to build a great improvement (#7239) 2022-06-22 09:29:43 +03:00
alexban011
8f53262fc4
CityScreen plays a sound when opened (#7163)
* added sounds to cityScreen

* changes? ..don't know how to name this commit

* removed try block

* improved era1 sound and added slider for city enter sounds

* added Information Era sound

* added Future Era sound

* better option name + translation

* added Atomic Era sound

* normalized sounds

* prevent spam + better era 0 and 1 sounds

* cleanup

* sound improvements to medieval and atomic

* volume now tied to sound effects

* improved information sound

* improved future sound

* sounds now stop if you exit the city screen

* improved Renaissance sound

* now in separate function

* now using the music controller

* better file names

* WLTK day sound + sounds are now configurable in Eras.json

* removed redundant setting and fixed comment

* added PlaySingle

* musicController no longer used

* Gdx.audio.newMusic is now used

* function name

* function are now in their own class

* CitySoundPlayer now has 1 instance in UncivGame and is hooked

* credits

* sounds loop

* loopable sounds

* updated credits

* fixed sound not stopping when changing city without leaving cityScreen

* changed WLTKNew sound

* added toggle for the sounds

* changed WLTK sound, removed music and made all tracks have the same volume

* addressed some of the issues

* addressed more issues

* increased sounds volume + volume slider

* made WLTK sound slightly quieter

* removed entry from Vanilla eras

* revert back to CitySoundPlayer.kt

* no more hooks

* removed unused stuff

* changees

* completly reverted MusicController

* and the MusicTrackChooserFlags

* fixed ESC not stopping sounds

* updated credits to mention the sounds are modified

* dispose()

* removed try block
2022-06-22 09:11:03 +03:00
OptimizedForDensity
7de3fdf452
Fix disappearing terrain when switching between mods (#7257) 2022-06-22 09:08:38 +03:00
OptimizedForDensity
83926eac7c
Fix policies not contributing stats from city-states (#7237) 2022-06-21 01:18:42 +02:00
OptimizedForDensity
954d0e4fe0
AI missionaries avoid cities with inquisitors (#7218) 2022-06-20 22:46:11 +03:00
Azzurite
18b91bba1e Change all translation test output checking for translator's errors back to println 2022-06-20 14:27:52 +02:00
Yair Morgenstern
a51302778f 4.1.12-patch1 2022-06-20 09:51:04 +03:00
alexban011
2224e65707
fixed crash in NextTurnAutomation (#7227)
* fixed crash

* redone

* reviews

* reviews 2
2022-06-20 09:50:03 +03:00
Yair Morgenstern
f10bf8bfbe Resolved crash for victory condition not in ruleset 2022-06-20 09:49:22 +03:00
Yair Morgenstern
5b5e4137db Resolved crash for stats not in statCostModifiers 2022-06-20 09:46:57 +03:00
Azzurite
9d5b3d4e4a Refactor: Remove unnecessary float conversion 2022-06-19 21:50:06 +02:00
alexban011
363d241691
Fix a religion to be a majority when it's over 50% of the cities, not equal to 50% (#7223) 2022-06-19 21:48:54 +02:00
Yair Morgenstern
8d742eef38 4.1.12 2022-06-19 21:55:28 +03:00
Yair Morgenstern
806135586d
Version rollout (#7222)
* Bump version and create initial changelog entry

* Update Catalan.properties (#7204)

* Update Catalan.properties

* Update Catalan.properties

* Update Catalan.properties

* Update Catalan.properties

* Update Lithuanian.properties (#7203)

* Update Filipino.properties (#7192)

* Update Filipino.properties

* Update Filipino.properties

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
2022-06-19 21:49:20 +03:00
Timo T
6d6b390ef8
Nicer multiplayer settings (#7198)
* Nicer multiplayer settings

* Refactor: use shortcut method
2022-06-19 21:47:36 +03:00
OptimizedForDensity
c2c991f8b8
Population reassignment bug fixes (#7221)
* Fix locked tiles not being unassigned after population decrease

* Fix assigned specialists not updating after a building is removed
2022-06-19 21:46:58 +03:00
OptimizedForDensity
4955d35efb
Moddable game speed backwards compatibility (#7212)
* Move GameSpeed definition to JSON files

* Minor cleanup and some corrections

* Round down tribute gold to match old when statement

* Small variable name changes

* Some typos

* Reduce number of speed modifiers plus code improvements

* Catch missing game speed

* Found a better place for the check

* More tweaks

* Added a startYear mod constant and some tweaks

* Cleanup old GameSpeed file references

* Fix tests

* Add game speeds civilopedia page

* Remove one last todo

* Fix translation

* New icon for game speeds

* More game speed modifiers

* Fix error

* Update Speeds.json files and move tutorial to docs

* Rename GameSpeed class to Speed

* Rename GameSpeed -> Speed and other reviews

* Forgot a file

* Add start year to civilopedia

* Remove decimal from default starting years

* Fix backwards compatibility

* Unused import

Co-authored-by: OptimizedForDensity <>
2022-06-19 10:23:56 +03:00
SomeTroglodyte
9683e27526
Civilopedia tweaks (#7051)
* Civilopedia Files Split

* Central showReligionInCivilopedia function

* ConstructImprovementConsumingUnit with Conditional for Prophet

* Show Units capable of building an Improvement

* "Needs removal of terrain features to be built"
2022-06-19 02:29:07 +02:00
Azzurite
672b804ac5 Refactor: Fix doc comments 2022-06-19 01:13:45 +02:00
Timo T
197241b2e0
Various UX improvements (#7207)
* Refactor: Format JSON

* Change button hover color to be darker

* Refactor: Change disabled buttons to always look disabled, even if they don't have the default style

* Make disabled style a little grayer

* Refactor: Make addCloseButton not start a new row

* Refactor: Remove "...inRow" popup button methods & add button style parameter

* Reorder "ok/cancel" popups to have "ok" on the right side

* Fix pointer enter/exit events being disabled by default

* Fix equalizeLastTwoButtonWidths not setting the cells to be equal size

* Change YesNoPopup to ConfirmPopup

* Add ConfirmPopup to deletion of save files
2022-06-19 00:53:30 +02:00
Azzurite
35c68b47d5 Regenerate atlas & update uniques.md 2022-06-18 23:39:08 +02:00
Joan Josep
c9f0d19555
Victory status window should translate "Technologies" entry. (#7210)
There is no "Techs" string in the translation files. Use "Technologies" instead.
2022-06-19 00:31:50 +03:00
Joan Josep
7614cc01c4
Translate search help text in Mod filter (#7202) 2022-06-18 23:31:24 +02:00
OptimizedForDensity
c922f134e6
Moddable game speeds (#6856)
* Move GameSpeed definition to JSON files

* Add game speeds civilopedia page
2022-06-18 23:27:46 +02:00
Timo T
06198f2e2c
Scroll WorldScreen immediately to the city when exiting it (#7195) 2022-06-18 21:39:06 +02:00
Timo T
488f12be9c
Fix civilopedia not showing any victory type entries when opening it without any game open (#7194) 2022-06-18 21:50:34 +03:00
Timo T
7481e5aa13
Allow clearing the multiplayer server text field with the "Backspace" key (#7196) 2022-06-18 21:48:59 +03:00
Timo T
378d8da4dd
Add Uncivserver.xyz community server in the wiki (#7200) 2022-06-18 21:44:54 +03:00
Jack Rainy
35a4f079b1
Do not trigger the Time Victory if it is not enabled (#7197)
* Whitespaces

* Use the proper list of victory types

* Clean up if the victory type was removed
2022-06-18 21:44:07 +03:00
Joan Josep
1facd97782
Translated strings after generating translation files from Adv Opt. (#7209)
* Translated strings after generating translation files from Adv Opt.

* Amend missing space at the end of the line
2022-06-18 21:43:30 +03:00
Timo T
c84580c71e
Fix memory leaks in BaseScreen & gdx.Stage/gdx.TextFields (#7190)
* Fix memory leaks in BaseScreen & gdx.TextFields/gdx.Stage

* Fix loading screen not showing anymore

* Make popScreen exit the game if it would try to remove the last screen
2022-06-18 21:41:15 +03:00
Skekdog
4933082088
Fix crash when base ruleset contains no strategic resources (#7193) 2022-06-18 01:54:26 +02:00
Paul Pogonyshev
d6b41c56ff
More shortcuts (#7171)
* Add shortcut 'Tab' to perform unit movement

* When no unit is selected, use 'Z' as a shortcut to select next unit
2022-06-18 01:53:45 +02:00
Paul Pogonyshev
71160b2e63
Make 'Home Home' shortcut always open capital's city screen (#7186) 2022-06-18 01:53:29 +02:00
heipizhu4
4d9f99fff3
Fix broken links in wiki (#7182) 2022-06-17 21:04:43 +02:00
Paul Pogonyshev
0533c9eaba
Restore unit action shortcuts accidentally dropped in commit 4fb2ad8fa (#7187) 2022-06-16 22:32:02 +03:00
itanasi
38b6770e84 Maintain Fortify bonus after Fortify until Healed (#6991)
* Maintain Fortify bonus after Fortify until Healed

* add in backward compatibility

* attempt

* Add in proper backwards compatibility

* Convert Fortify in BackwardCompatibility.kt instead

* Remove debug code

* Now with Regex

* remove unnecessary import
2022-06-16 21:30:31 +02:00
Yair Morgenstern
e4ab1eabc7
Create Privacy-Policy.md 2022-06-16 21:51:14 +03:00
Yair Morgenstern
f48bc94f87 4.1.11 2022-06-16 21:28:20 +03:00
Yair Morgenstern
192bc9eb46
Version rollout (#7185)
* Bump version and create initial changelog entry

* Update French.properties (#7174)

* Update Catalan.properties (#7173)

* Update Catalan.properties

* Update Catalan.properties

* Update Spanish.properties (#7172)

* Update Filipino.properties (#7166)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Italian.properties (#7165)

* Update Italian.properties

* Update Italian.properties

* Update Brazilian_Portuguese.properties (#7149)

* Update Brazilian_Portuguese.properties

* Fixed Floodfill_Abbreviation mistake

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Kalil <kalilcamera67@gmail.com>
2022-06-16 21:20:06 +03:00
OptimizedForDensity
623b84ea30
AI considers liberating city-states from other civilizations (#7157)
* AI will consider liberating a city state on conquest

* Factor in current civ happiness for liberation consideration

* Refactor foundingCiv check into function
2022-06-16 21:12:26 +03:00
Timo T
4fb2ad8fab
Fix unit action/selection overlay not being closed when performing an action with a new unit (#7184) 2022-06-16 21:07:59 +03:00
SomeTroglodyte
e2b7891248
Two new Unit Tests (#7001)
* MapGenerator fixes

* MainMenu Background Map scaled to Screen

* Easter Eggs - Code only

* Easter Eggs - Graphics
2022-06-16 21:07:30 +03:00
alexban011
564f7b476c
small fixes (#7181)
* fixes

* relaced translations with _

* better displayCutout
2022-06-16 18:56:18 +03:00
Paul Pogonyshev
d462100c19
Refactor key handling (#7042)
* Refactor keyboard shortcut handling

* Use 'userObject' for attachments instead of a WeakHashMap

* Fix shorcut vetoing when a popup is active

* Solve misc. review complaints

* Reimplement changes in UnitActionsTable to exactly repeat what the previous code did

* Fix last commit
2022-06-15 20:04:44 +03:00
Timo T
1bbc11cc47
Fix option change not reloading main menu properly (#7170) 2022-06-15 20:01:02 +03:00