mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-11 03:18:18 +07:00
Code Issues Packages Projects Releases Wiki Activity
7,523 Commits 6 Branches 1,050 Tags 1.1 GiB
a6b55ca14a
Commit Graph

7523 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Timo T
89a7cc7246
Fix wrong Duration short formatting (#7167) 2022-06-15 20:00:13 +03:00
Timo T
0585194eaf
Fix cutout options crash (#7169) 2022-06-15 15:59:58 +02:00
Yair Morgenstern
4d0230f70e Revert "Maintain Fortify bonus after Fortify until Healed (#6991)" 
This reverts commit 07b7d91107.
 2022-06-14 22:03:18 +03:00
alexban011
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
itanasi
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
Timo T
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
Timo T
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
Yair Morgenstern
d562eb2dd2 4.1.10 2022-06-14 21:03:20 +03:00
Yair Morgenstern
c710b83a0d
Version rollout (#7162) 
* Bump version and create initial changelog entry

* Update Lithuanian.properties (#7153)

* Update French.properties (#7142)

* Update Catalan.properties (#7140)

* Update Romanian.properties (#7139)

* Update Traditional_Chinese.properties (#7137)

* Update Traditional_Chinese.properties

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

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>

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

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>

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

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>

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

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>

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

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>

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

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>

* Update Traditional_Chinese.properties

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>

* Update Simplified_Chinese.properties (#7136)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Indonesian.properties (#7134)

* Update Indonesian.properties

* Update Indonesian.properties

* Fetch upstream and more translations to brazilian portuguese (#7133)

* More translations to Brazilian Portuguese

* Adding more translations to Brazilian Portuguese

* Translations to Brazilian Portuguese

* Update German translation (#7132)

* Update German translation

* Update German translation

* Update Filipino.properties (#7131)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Spanish.properties (#7127)

* Update Spanish.properties

* fix some vainas

* Update Spanish.properties

* Update Spanish.properties

* Update Spanish.properties

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@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: alexban011 <alexban011@gmail.com>
Co-authored-by: Jia <31085601+Jia35@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: André Lucas C. da Silva <andr9310@gmail.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
 2022-06-14 20:52:56 +03:00
Yair Morgenstern
4633462884 Condiional fixes 2022-06-14 20:47:12 +03:00
alexban011
fc926420e8
added cutout support (#7044) 
* added support

* now toggleable in settings

* translation

* added note that it requires restart

* made it enabled by default

* padded buttons to the right if there is a cutout

* checking for cutout instead of android

* reverted button changes

* moved option to advancedTab
 2022-06-14 20:34:30 +03:00
OptimizedForDensity
cac616a97b
Fix spectator's fog of war toggle (#7130) 2022-06-14 20:32:36 +03:00
Timo T
90bdcf9329
Fix scroll to wonder in the map editor (#7154) 
* Fix scroll to wonder in the map editor

* Fix blink always happening
 2022-06-14 20:32:06 +03:00