mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-13 00:04:38 +07:00
Code Issues Packages Projects Releases Wiki Activity
10,685 Commits 6 Branches 1,037 Tags 1.2 GiB
4ce6536871
Commit Graph

260 Commits

Author SHA1 Message Date
SomeTroglodyte
5403f28c77
Remove inactive server code and music (#5017) 2021-08-29 11:33:46 +03:00
SomeTroglodyte
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
yairm210
a0e0cccea8 Resolved #4970 - Removed MacOS release due to problems 2021-08-23 20:35:20 +03:00
yairm210
8ef0dc99e9 MacOS release! 
With the xmargs it needs to run ;)
 2021-08-22 22:59:10 +03:00
yairm210
fffedf9a70 MacOS release! 2021-08-22 22:49:49 +03:00
yairm210
79f3aae803 Linux64 is now built with packr JAR file, thus removing the need for JAVA_HOME! 2021-08-22 21:08:26 +03:00
yairm210
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
Yair Morgenstern
79b3fb6de4 Resolved #4151 - Discord library load will now catch failed attempts properly 2021-06-25 16:46:18 +03:00
Yair Morgenstern
4d6b4cd957 A possible fix for #4151 2021-06-23 11:17:58 +03:00
Yair Morgenstern
c424c681b5 Maybe resolved #4151 2021-06-23 11:12:09 +03:00
Arthur van der Staaij
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
lishaoxia1985
7e284f998b
Redraw skin Images, edit skin load method (#4080) 2021-06-10 23:10:13 +03:00
lishaoxia1985
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
SomeTroglodyte
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
SomeTroglodyte
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
Yair Morgenstern
482f9ae9e5 Linting - Optimized imports 2021-05-10 22:45:29 +03:00
Alexander Korolyov
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
Yair Morgenstern
4db97dcd1a Added construction production info to city screen 2021-04-29 14:02:27 +03:00
GGGuenni
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
Yair Morgenstern
bcab751f7c Linting 2021-01-28 16:21:25 +02:00
Yair Morgenstern
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
Yair Morgenstern
3d1e1d7936 Removed some confusing and pointless ": " at the end of translations - #3335 2020-11-22 22:41:12 +02:00
Yair Morgenstern
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
Yair Morgenstern
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
Yair Morgenstern
65524cb7dd Removed exitEvent from the UncivGameParameters, since Gdx.app.exit() does the same thing :) 2020-11-04 00:09:11 +02:00
Yair Morgenstern
87b0af6c1c AI can no longer raze capital cities 2020-11-02 20:21:44 +02:00
Yair Morgenstern
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
Yair Morgenstern
3e98e0c00f 3.11.0 2020-10-03 20:48:34 +03:00
CrispyXYZ
ae182fb7b5
fix 'OpenGL is not supported' Exception (#3202) 2020-10-03 20:20:27 +03:00
Billy Brawner
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
Yair Morgenstern
bed7fe4c64 Added unit symbols for Strength, Ranged Strength, Range and Movement as 'emojis' 2020-08-24 22:48:00 +03:00
Väinö Mäkelä
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
Alexander Korolyov
1c613ac274
Remove unnecessary try catch block. (#2869) 2020-07-22 06:29:12 +03:00
Alexander Korolyov
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
Yair Morgenstern
c94079c0a7 Fixed tests which broke due to console checking being dependant on UncivGame.Current 2020-07-04 23:57:45 +03:00
Alexander Korolyov
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
Alexander Korolyov
5356e63249
Refactor UncivGame initialization - add UncivGameParameters. (#2779) 2020-06-29 20:05:58 +03:00
Yair Morgenstern
1c04ba50cb Basic structure of Dropbox replacement self-serving 2020-06-01 21:33:59 +03:00
Daniel Bälz
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
Väinö Mäkelä
4b6bab523f
Rewrite the font system to render the characters incrementally (#2635) 2020-05-18 23:09:38 +03:00
Yair Morgenstern
b7e5d8ac6e Windows 32-bit test 2020-05-17 22:13:25 +03:00
proteus-anguinus
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
Yair Morgenstern
244d341566 Hopefully solved #2361 for real this time 2020-04-08 16:37:17 +03:00
Yair Morgenstern
eabf17186c Hopefully resolved #2361 - added libdiscord-rpc.so for 32-bit linux 2020-04-08 15:15:04 +03:00
proteus-anguinus
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
rh-github-2015
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
Jack Rainy
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
Yair Morgenstern
267c98be55 Resolved #1757 - Can now see version when running from a desktop Jar 2020-01-29 21:45:44 +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
ffb562c0aa Should be able to recognize Raspberry Pi and not try and load the Discord RPC (which crashes the game) 2020-01-07 20:32:59 +02:00
Yair Morgenstern
f97c230be8 Images are now packed when running from the .jar as well, so non-coding modders should never need to run from source code =) 2020-01-06 23:56:18 +02:00
Yair Morgenstern
7462aae94c Big changes to mods and rulesets - almost production ready! 
Rulesets are heavy to load so we now have a RulesetCache, which can construct "custom" rulesets with a list of mods!
We now pack mod images on Desktop run, and load the atlases for the loaded mods on load game!
 2020-01-05 22:11:10 +02:00
Yair Morgenstern
4c51e70283 Managed to load first mini mod, needs some work before this can work for users 
(what happens if we started a game with mod A and then we want to start a game with only mod B?)
 2019-12-31 17:49:07 +02:00
Yair Morgenstern
3627d4e6e2 Now load only necessary translations 
Since loading all the translation files was taking around 2.5 seconds on my phone, and I assume much longer on older phones, we now only load the translations of the currently selected file, and if we need to find the translation percentage of all the files we deal with that separately. Down to around 200-300 ms on my phone =)
Also Translations is no longer part of the Ruleset, instead meing located in UncivGame
 2019-12-18 23:32:31 +02:00
lishaoxia1985
e937ea0af1 all codes are writen in Kotlin (#1452) 2019-12-15 20:28:34 +02:00
Yair Morgenstern
a13d6bc82e Package move & civilopedia scroll fix 2019-12-13 13:58:05 +02:00
Yair Morgenstern
eace5a46b4 Disabled GL 3.0 because it causes problems in Mac computers 2019-12-08 09:10:02 +02:00
Yair Morgenstern
110e7b7052 Desktop no longer crashes/bugs on first initialization 2019-12-05 20:59:44 +02:00
Yair Morgenstern
47e214258a FINALLY managed to un-staticify GameBasics, this means the game can potentially recognize different rulesets! 2019-12-04 23:57:54 +02:00
Yair Morgenstern
975531d856 Enabled HDPI for Mac OSX 2019-12-04 19:56:09 +02:00
Yair Morgenstern
c1d3ac2604 Added timers to see what's taking so long. It's the fonts - 11 seconds to load Chinese characters. 
Specifically, putGlyph. Which makes sense, since it's basically rendering 3000 images into the memory for Chinese.
 2019-11-28 22:10:26 +02:00
Yair Morgenstern
8854cafc96 Added linux files for jar 2019-11-27 21:03:14 +02:00
Yair Morgenstern
8232ca3aee Dammit packr 2019-11-27 20:26:09 +02:00
Yair Morgenstern
3d556b6236 Use the packrConfig json again 2019-11-27 20:16:53 +02:00
Yair Morgenstern
03beb73e08 Can't use the same cache for Linux and Windows - for now lets ignore it entirely 2019-11-26 23:37:13 +02:00
Yair Morgenstern
f27611710d My entire use of Packr has been a lie - it needs a JDK corresponding to the destination platform 2019-11-26 23:11:00 +02:00
Yair Morgenstern
405536beba I think the Windows64 executables haven't been compiling well from the get-go... 2019-11-26 22:18:07 +02:00
Yair Morgenstern
d53a67802e Removed another huge JavaFX file 2019-11-26 21:38:32 +02:00
Yair Morgenstern
dac044b2f8 Forgot to set the JDK back for travis, gah 2019-11-26 20:58:17 +02:00
Yair Morgenstern
5d59f25532 Added packr config, shrinking final zip from 80MB to 50MB! 2019-11-26 20:47:31 +02:00
Yair Morgenstern
3fad0985b4 Attempt to use GL 3.0 when possible 2019-11-25 06:34:02 +02:00
Yair Morgenstern
9580e8cb38 Let's see if it can use the local JAVA_HOME from Travis since it doesn't seem to like downloading large external files 2019-11-24 23:41:27 +02:00
Yair Morgenstern
e35ed4b983 Maybe now 2019-11-24 22:50:58 +02:00
Yair Morgenstern
b312432c37 Now with JDK from da internets 2019-11-24 22:32:16 +02:00
Yair Morgenstern
f626381c31 I think we're ready to pack! 2019-11-24 22:22:47 +02:00
Yair Morgenstern
5227bcab7f
Only run packr if jar exists 2019-11-24 08:05:04 +02:00
Yair Morgenstern
c0ace9f0d4 packrWindows now dependant on dist 2019-11-24 00:28:39 +02:00
Yair Morgenstern
2a139ff732 Resolved #1364 - Policy picker screen won't appear from the world screen if there are no possible policies to pick 2019-11-24 00:02:28 +02:00
Yair Morgenstern
095deee125 UncivGame rename 2019-11-23 22:28:23 +02:00
Yair Morgenstern
1230b00688 Fixed crash in tile editor as a result of adding Fallout, which has no "occursOn" terrains 2019-11-23 21:35:03 +02:00
Yair Morgenstern
4844a98af1 Discord RPC now works from Desktop .Jar! 2019-11-21 23:01:38 +02:00
Yair Morgenstern
e00bdf77d6 Apparently the Discord RPC doesn't like being run from the JAR, disabled until it can work 2019-11-21 18:50:10 +02:00
Yair Morgenstern
62fd7d8588 Desktop Unciv now sends status to Discord! 
Basically stole the Discord RPC implementation outta Mindustry
 2019-11-21 16:24:27 +02:00
Yair Morgenstern
bfd6376612 Set icon and title for Desktop games 2019-11-18 22:04:45 +02:00
Yair Morgenstern
7a02019b7c Resolved #1340 
Apparently some chipsets, like NVIDIA Tegra 3 graphics chipset (used in Asus TF700T tablet), don't support non-power-of-two texture sizes - kudos @yuroller!
 2019-11-17 20:15:10 +02:00
Yair Morgenstern
dd8f812465 Units &c updated! 2019-11-16 19:42:34 +02:00
Yair Morgenstern
85fbbaaa6d Checking if we can remove some lines from the Travis file to speed up build time 2019-11-15 09:27:13 +02:00
Yair Morgenstern
292ca7a908 HOT DAMN Unciv now works from desktop:dist and the command line! 2019-11-14 23:54:52 +02:00
Yair Morgenstern
9ad2851b80 Gradle changes so the desktop:dist will work. still not 100% since I can't get it to recognize Kotlin yet 2019-11-11 23:17:12 +02:00
Yair Morgenstern
b0e29c5d3c City-state alliance Bugfix 2019-11-11 21:07:16 +02:00
lishaoxia1985
62a85cd14a can use native font and "WenQuanYimicroHei" in andriod and desktop (#1013) 
* Update Other.json

* Update Notifications.json

* Update Other.json

* Can Change Language With No "ttf" Font

* update

* Update AndroidLauncher.java

* repair app running slowly in using no "tff" class

* Can Change Language with No "ttf" Font (#772)

* Update Other.json

* Update Notifications.json

* Update Other.json

* Can Change Language With No "ttf" Font

* update

* Update AndroidLauncher.java

* repair app running slowly in using no "tff" class

* update nativefont for Desktop and IOS

* Delete NativeFontIOS.java

* can choose nativefont or font downloading from internet

* update

* update

* Update Fonts.kt

* Update Fonts.kt

* update

* update

* update

* update

* Update build.gradle

* update

* update

* update

* can choose native font or "WenquanYiMicroHei"

* update

* update

* update

* update
 2019-09-01 13:01:37 +03:00
Yair Morgenstern
185ec10f10 Can now see when city contains air units 2019-07-03 23:32:17 +03:00
martin
c31f6bc7dd show context menu entry only if roads are researched 2019-05-23 07:57:34 +03:00
Yair Morgenstern
d902db0af0 Updated gradle wrapper 2019-04-24 09:47:33 +03:00
Yair Morgenstern
69d3703543 Resolved #595 - Added release version to options table 2019-03-21 22:46:49 +02:00
Yair Morgenstern
baed1e50cd Returned tile info table in the city screen, construction scroll now translated, added city screen translations to translations file - #417 2019-01-22 21:48:30 +02:00
Yair Morgenstern
b776bd777c Google suspended the app because of "Impersonation" violation =( 
Changed library name from com.unciv.game to com.unciv.app for app change
 2019-01-02 22:07:47 +02:00
Yair Morgenstern
2605ce6b71 Once a unit has gained more than 30 XP it won't gain XP from barbarians 
AI units now always unfortify/unsetup after moving
 2018-08-30 22:13:07 +03:00
Yair Morgenstern
17e440d557 Added building icons! 
There are now images of the current construction in the construction picker screen, the city screen and the world map!
 2018-08-29 14:03:18 +03:00
Yair Morgenstern
5d3c7a3a5e Replaced city connection icon, luxury resources now have a smiley next to them and strategic resources have a production symbol 2018-08-27 17:17:14 +03:00
Yair Morgenstern
86464ccdb0 Many UI updates are now done on the clone, so we won't get concurrency exceptions 2018-08-25 23:15:40 +03:00
Yair Morgenstern
fee0b718ec Shrunk game size by 15% by including the images only when packed 2018-08-13 08:56:15 +03:00
Yair Morgenstern
e51ac717d7 Better circle image, images no longer look all pixellated 2018-08-10 11:34:30 +03:00
Yair Morgenstern
c67d515ec4 Organized all game images and added TexturPacker to pack them all into a single image, with an atlas to find the texture regions - 
MASSIVE boost in rendering performance!
 2018-08-10 11:05:21 +03:00
Yair Morgenstern
fb1f381f06 Added FreeType, which lets us use whatever fonts we want 2018-05-01 21:41:02 +03:00
Yair Morgenstern
ca7fb9c3be Multiple IDE-suggested fixes 2018-04-11 23:46:00 +03:00
Yair Morgenstern
9253c40085 Added Kotlin! 2018-02-23 15:36:13 +02:00
Yair Morgenstern
6a2f4a07f1 Major overhaul - all tree items now have transient pointers to their parents, eliiminating the need for static calls for Civilization.Current and the like - neccesary if we want to have multiple civilizations 2018-02-23 12:57:52 +02:00
Yair Morgenstern
546472b528 Organized classes into folders 2018-01-11 22:22:51 +02:00
Yair Morgenstern
0319602092 Initial commit 2017-11-22 00:09:35 +02:00