Commit Graph

4851 Commits

Author SHA1 Message Date
e0a65fb95a Fix the fix 2022-06-23 20:01:44 +02:00
50ec861edd fix (#7281) 2022-06-23 18:27:33 +03:00
b558d92a1e Fix city ambient sounds not working on Desktop (#7271) 2022-06-23 01:08:18 +02:00
466560abba Fix city sounds not being played on released game versions (#7268) 2022-06-22 12:39:16 +02:00
884a16d632 Fix city ambience sound not being stopped when the city screen is updated via UncivGame.replaceCurrentScreen 2022-06-22 10:44:39 +02:00
7e36d62b6e Fix crash 2022-06-22 10:00:17 +02:00
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
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
50e479b21d Fix cases where AI great people get stuck trying to build a great improvement (#7239) 2022-06-22 09:29:43 +03:00
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
7de3fdf452 Fix disappearing terrain when switching between mods (#7257) 2022-06-22 09:08:38 +03:00
83926eac7c Fix policies not contributing stats from city-states (#7237) 2022-06-21 01:18:42 +02:00
954d0e4fe0 AI missionaries avoid cities with inquisitors (#7218) 2022-06-20 22:46:11 +03:00
2224e65707 fixed crash in NextTurnAutomation (#7227)
* fixed crash

* redone

* reviews

* reviews 2
2022-06-20 09:50:03 +03:00
f10bf8bfbe Resolved crash for victory condition not in ruleset 2022-06-20 09:49:22 +03:00
5b5e4137db Resolved crash for stats not in statCostModifiers 2022-06-20 09:46:57 +03:00
9d5b3d4e4a Refactor: Remove unnecessary float conversion 2022-06-19 21:50:06 +02:00
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
6d6b390ef8 Nicer multiplayer settings (#7198)
* Nicer multiplayer settings

* Refactor: use shortcut method
2022-06-19 21:47:36 +03:00
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
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
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
672b804ac5 Refactor: Fix doc comments 2022-06-19 01:13:45 +02:00
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
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
7614cc01c4 Translate search help text in Mod filter (#7202) 2022-06-18 23:31:24 +02:00
c922f134e6 Moddable game speeds (#6856)
* Move GameSpeed definition to JSON files

* Add game speeds civilopedia page
2022-06-18 23:27:46 +02:00
06198f2e2c Scroll WorldScreen immediately to the city when exiting it (#7195) 2022-06-18 21:39:06 +02:00
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
7481e5aa13 Allow clearing the multiplayer server text field with the "Backspace" key (#7196) 2022-06-18 21:48:59 +03:00
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
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
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
4933082088 Fix crash when base ruleset contains no strategic resources (#7193) 2022-06-18 01:54:26 +02:00
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
71160b2e63 Make 'Home Home' shortcut always open capital's city screen (#7186) 2022-06-18 01:53:29 +02:00
0533c9eaba Restore unit action shortcuts accidentally dropped in commit 4fb2ad8fa (#7187) 2022-06-16 22:32:02 +03:00
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
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
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
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
564f7b476c small fixes (#7181)
* fixes

* relaced translations with _

* better displayCutout
2022-06-16 18:56:18 +03:00
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
1bbc11cc47 Fix option change not reloading main menu properly (#7170) 2022-06-15 20:01:02 +03:00
89a7cc7246 Fix wrong Duration short formatting (#7167) 2022-06-15 20:00:13 +03:00
4d0230f70e Revert "Maintain Fortify bonus after Fortify until Healed (#6991)"
This reverts commit 07b7d91107.
2022-06-14 22:03:18 +03:00
59e4eb8373 increased kotlin version to latest 1.7.0 (#7151)
* updated to 1.7.0

* change to empty else

* bumped ios java to 1.8
2022-06-14 21:10:44 +03:00
07b7d91107 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-14 21:09:31 +03:00
a5f9623dbe Fix OutOfMemory error when loading game state after already having a game loaded (#7145)
* Fix OutOfMemory error when loading game state after already having a game loaded

* Fix screen resize not being handled correctly

* Add withContext shortcut functions

* Add more logging

* Fix multiplayer games sometimes being loaded twice

* Make the loading screen nicer

* Make the loading screen hide previous popups for making the screenshot

* Don't do custom rendering & dispose the texture

Sometimes it makes sense to understand the library you're using...

* Fix missing GL context

* Refactor: increase readability of loadGame function
2022-06-14 21:09:09 +03:00
b6a98e5540 Fix EventBus not being able to listen to events with more than one level of inheritance (#7009) 2022-06-14 21:08:43 +03:00