Commit Graph

213 Commits

Author SHA1 Message Date
7f386da2bc Kotlin 1.5 new warnings - partial (#5108)
* Kotlin 1.5 new warnings - partial

* Kotlin 1.5 new warnings - partial
2021-09-06 18:28:20 +03:00
9c3e621b15 Atlas reorg - packer to loader via json (#5014) 2021-08-29 23:29:24 +03:00
3b5489a3b4 Persistent new game setup (#5016)
* Persistent new game setup

* Persistent new game setup - comments
2021-08-29 20:40:13 +03:00
5403f28c77 Remove inactive server code and music (#5017) 2021-08-29 11:33:46 +03:00
cdc63f71e8 Multi-Atlas / Image packer redo (#4959)
* Atlas reorg

* Atlas reorg - resulting atlases 1

* Atlas reorg - resulting atlases 2

* Atlas reorg - merge
2021-08-24 07:31:21 +03:00
a0e0cccea8 Resolved #4970 - Removed MacOS release due to problems 2021-08-23 20:35:20 +03:00
8ef0dc99e9 MacOS release!
With the xmargs it needs to run ;)
2021-08-22 22:59:10 +03:00
fffedf9a70 MacOS release! 2021-08-22 22:49:49 +03:00
79f3aae803 Linux64 is now built with packr JAR file, thus removing the need for JAVA_HOME! 2021-08-22 21:08:26 +03:00
85ed8a27d3 Bumped sourceCompatibility to Java 7
Released in 2011 and by now technically out of support for 2 years.
Gotta roll with the times, but roll slowly.
2021-08-20 15:24:02 +03:00
79b3fb6de4 Resolved #4151 - Discord library load will now catch failed attempts properly 2021-06-25 16:46:18 +03:00
4d6b4cd957 A possible fix for #4151 2021-06-23 11:17:58 +03:00
c424c681b5 Maybe resolved #4151 2021-06-23 11:12:09 +03:00
d7865f4a81 Made atlas textures use mipmaps again (#4187)
A previous commit changed the atlas textures to use nearest filtering,
making the game look significantly jaggier. This commit makes them use
mipmap filtering again.

Using mipmaps with atlas textures can cause the edges of the images to
bleed into each other, an effect that was indeed present before the
filtering was changed to nearest. This commit adds some additional
padding and sets the padding to duplicate the edges of images to
mitigate this effect. Note that altough this makes some of the atlas
images look very strange, the in-game result is improved.
2021-06-18 09:25:11 +03:00
7e284f998b Redraw skin Images, edit skin load method (#4080) 2021-06-10 23:10:13 +03:00
e77eaf5fa5 Fix the app window changing may lead to that the app can't open in macOS (#4042) 2021-06-03 15:02:46 +03:00
9ed73d0d3f Spruced up ModManagementScreen - phase 1 (#3983)
* Spruced up ModManagementScreen - phase 1

* Spruced up ModManagementScreen - phase 1 - patch1
2021-06-01 15:21:31 +03:00
7c7d4181cc Fix custom map sizes - saves match, size obeyed, limit UI (#3965)
* Fix custom map sizes - Revive Enum MapSize and fix tech modifier for custom maps

* Fix custom map sizes - Fix saved size not matching tileset, obey custom size

* Fix custom map sizes - limiting custom size and UI

* Fix custom map sizes - linting and reduce warnings

* Fix custom map sizes - less verbose

* Popup gets a KeyPressDispatcher - templates
2021-05-20 22:17:07 +03:00
482f9ae9e5 Linting - Optimized imports 2021-05-10 22:45:29 +03:00
453f5588ac Custom map size (#2876)
* Adding custom map sizes. Initial commit

* Custom map sizes UI update

* Custom map size with rectangular shape

* Added compatibility with older Maps and Game saves

* Fixed build errors and added warning messages

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-05-06 18:39:28 +03:00
4db97dcd1a Added construction production info to city screen 2021-04-29 14:02:27 +03:00
b7d6bacc5b Added TileSetConfigs (#3766)
* First iteration of TileSet json

* Adding json support for mods

* Renamed TilesetConfig to TileSetConfig

+ changed the config for FHex to fix the mountain natural wonder problem
2021-04-13 07:49:49 +03:00
bcab751f7c Linting 2021-01-28 16:21:25 +02:00
80b470e867 Resolved #3497 - city state quests always show correctly when diplomacy screen accessed from city button
Added some scrollbars as per #3495
2021-01-03 21:37:38 +02:00
3d1e1d7936 Removed some confusing and pointless ": " at the end of translations - #3335 2020-11-22 22:41:12 +02:00
6d7d698dad Prepacked flag, unit and building images in altas files, so they'll be readable from the jar files 2020-11-22 21:47:46 +02:00
35554f3ec6 Resolved #3330 - Texture is back to 2048*2048, by taking flags buldings and units out of the main image.
The cost is that there are texture swaps, and so framerate is hurt.
2020-11-19 21:44:09 +02:00
65524cb7dd Removed exitEvent from the UncivGameParameters, since Gdx.app.exit() does the same thing :) 2020-11-04 00:09:11 +02:00
87b0af6c1c AI can no longer raze capital cities 2020-11-02 20:21:44 +02:00
3bf045d354 One high-stakes, no-holds-barred, to-the-death profiling later, and we're left with a much less laggy main screen and a much more profile-able citybutton/ 2020-10-16 00:39:58 +03:00
3e98e0c00f 3.11.0 2020-10-03 20:48:34 +03:00
ae182fb7b5 fix 'OpenGL is not supported' Exception (#3202) 2020-10-03 20:20:27 +03:00
205b5ccfea Implement custom save locations for Android and Desktop (#3160)
* Implement custom save locations for Android and Desktop

* Request write permission to save to external storage

* Fix race condition for custom saves/loads caused by autosaves

* Remove unnecessary WRITE_EXTERNAL_STORAGE permission for saving files

* Fix padding for custom save/load location buttons

* Use nullability checks as defined in coding style guide

* Use nullability checks as defined in coding style guide

* Use early return for readability

* Rename save/load completion callbacks for custom locations and implement error handling
2020-09-20 23:22:07 +03:00
bed7fe4c64 Added unit symbols for Strength, Ranged Strength, Range and Movement as 'emojis' 2020-08-24 22:48:00 +03:00
742816b759 Fix Gradle deprecation warnings (#2879)
Gradle 7 will remove some features and they need to be replaced
2020-07-24 09:30:00 +03:00
1c613ac274 Remove unnecessary try catch block. (#2869) 2020-07-22 06:29:12 +03:00
e74f7608d1 transfer simulateUntilWin from UncivGame to GameInfo class. (#2849)
* transfer simulateUntilWin from UncivGame to GameInfo class.

* update tests

* Update description comments
2020-07-16 13:52:39 +03:00
c94079c0a7 Fixed tests which broke due to console checking being dependant on UncivGame.Current 2020-07-04 23:57:45 +03:00
4bcae5f664 Console mode for multiple game automation (#2777)
* Remove ruleset from GameSetupInfo class

* Remove dependency from Gdx for file IO:
- load Ruleset
- save/init in GameSettings
- get settings in GameSaver

* Remove simulation logging from GameInfo class

* MapGenerator: add switch for RNG seed verbose

* PlayerPickerTable small refactor

* Basic console mode

* Add multithreading to console mode and refactoring.

* Merge branch 'master' into console

* Small refactor
2020-07-04 21:47:52 +03:00
5356e63249 Refactor UncivGame initialization - add UncivGameParameters. (#2779) 2020-06-29 20:05:58 +03:00
1c04ba50cb Basic structure of Dropbox replacement self-serving 2020-06-01 21:33:59 +03:00
47d7e8ef09 Gradle Kotlin DSL (#2634)
* Ease migration to Gradle Kotlin DSL by changing quotes, function calls and plugin definitions

* Migrate build scripts to Gradle Kotlin DSL
2020-05-19 00:14:01 +03:00
4b6bab523f Rewrite the font system to render the characters incrementally (#2635) 2020-05-18 23:09:38 +03:00
b7e5d8ac6e Windows 32-bit test 2020-05-17 22:13:25 +03:00
226801bfbd Texture packer conditionally (#2373)
* Bring Incas into the main game
(also changes slinger withdraw ability to inheritable)

* Update Nations.json

* Desktop debugging - skip unnecessary TexturePacker calls

* Desktop debugging - skip unnecessary TexturePacker calls patch 1
2020-04-10 10:25:34 +03:00
244d341566 Hopefully solved #2361 for real this time 2020-04-08 16:37:17 +03:00
eabf17186c Hopefully resolved #2361 - added libdiscord-rpc.so for 32-bit linux 2020-04-08 15:15:04 +03:00
cee794b29c Discord thread shutdown, last Autosave singlethreaded (#2318)
* Bring Incas into the main game
(also changes slinger withdraw ability to inheritable)

* Update Nations.json

* Discord thread is now a timer and gets notified to shut down
Solved truncated Autosaves: Made it singlethreaded within shutdown.

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-04-06 13:43:40 +03:00
4fb7e11354 Mod loader resilience (#2211)
* For #2200: Avoid MacOS tripping us

* Second hidden test in packImages

* Clearer message for a specific mod error, UI message for savegames missing mods

* Fixed obsolete imports from rejected experiments

* Tiny lint issue

* Irrelevant change to test push after rebase
2020-03-22 22:43:39 +02:00
15098d877c Translations refactoring (#2096)
* Rename "translationsByLanguage" folder

* Minor refactoring

* Generate Nations strings

* Use the nations strings while creating the translation files

* Clean up of Nations files

* Transfer existing translations

* Get rid of the nation's translated name

* Transfer just few nations' translations for languages without Nations_Language.json

* Clean up of not used greetings

* Correct marking of not translated strings
2020-03-10 10:17:05 +02:00