wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3916 commits 7 branches 304 tags 288 MiB
Commit graph

74 commits

Author SHA1 Message Date
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