mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-20 12:48:56 +07:00
Code Issues Packages Projects Releases Wiki Activity
NaN Commits 5 Branches 1,097 Tags
cb6160c4a8f3a3a5c2755ff6e1294a55f3ee2a2c
Commit Graph

4860 Commits

Author SHA1 Message Date
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
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
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
Timo T
c3268126ee Fix unit being captured two times (#7141) 2022-06-14 20:31:47 +03:00
Jack Rainy
9ffd9b817b Do not enter the city while performing an air strikes sequence (#7148) 2022-06-14 13:42:53 +02:00
OptimizedForDensity
ed922b182d Improvements to AI military unit usage (#7147) 
* Add more opportunities for AI units to attack
 2022-06-14 13:34:24 +02:00
OptimizedForDensity
9ac019caea Prevent AI from sending a second peace treaty (#7150) 2022-06-14 01:06:29 +02:00
Yair Morgenstern
46b1516159 Fixed translation order 2022-06-13 22:22:52 +03:00
Yair Morgenstern
86f2560d7e Added test for branches which require missing eras 2022-06-13 21:39:57 +03:00
Azzurite
5506ad2cd4 Fix anchor link 2022-06-12 21:28:09 +02:00
Timo T
4da1d442e4 Fix NPE in Nation selection & editor mods popup (#7144) 2022-06-12 18:10:03 +02:00
Azzurite
dc16bba983 Add more extensive multiplayer documentation 2022-06-12 12:55:39 +02:00
Timo T
9bd8750739 Refactor: Consistent & correct usage of coroutines (#7077) 
* Refactor: Consistent usage of coroutines

* Add usage comments to the different threads

* Refactor: Properly separate crash handling into its platform-specific parts

* Fix autoSave never finishing

* Correctly handle coroutines when the GL thread is not accepting runnables anymore

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2022-06-12 00:13:49 +03:00
Timo T
9008d242a3 Refactor: Change UncivGame.worldScreen and UncivGame.gameInfo to be of nullable type (#7114) 
* Refactor: Make Popups work on Stages instead of BaseScreens

* Refactor: Change UncivGame.worldScreen and UncivGame.gameInfo to be of nullable type

* Fix "Resume" game loading not fully handling exceptions

* Fix one missed refactoring

* Refactor: remove useless postRunnable
 2022-06-11 22:14:44 +03:00
OptimizedForDensity
72b197fdc3 Stop AI puppets from building settlers and military (#7129) 
* Stop puppeted cities from building settlers and military

* Move puppet check to function
 2022-06-11 22:14:24 +03:00
Yair Morgenstern
d34fa7db3d 4.1.9 2022-06-10 16:56:19 +03:00
Timo T
3e6fc0e22a Add multiplayer turn sound notification (#6995) 
* Refactor: Extract methods & reduce code duplication

* Refactor: Rename Sounds to SoundPlayer

* Refactor: Make UncivSound a data class

As far as I can see, UncivSoundConstants served no purpose

* Refactor: Reorder sounds

* Refactor: Split up ExtensionFunctions and move into own package

* Add multiplayer turn sound notification

* Refactor: Remove unnecessary double translation

* Refactor: Reduce code duplication

* Refactor: No if for boolean logic
 2022-06-10 16:44:29 +03:00
Timo T
9918353c66 Fix crash during next turn automation (#7125) 2022-06-10 16:44:02 +03:00
alexban011
55ed226608 disable worldWrap if its disabled in settings (#7123) 2022-06-10 15:48:51 +03:00
Yair Morgenstern
5cd992a076 Resolved #7111 - Peace cooldown with city-states 2022-06-09 19:51:08 +03:00
Yair Morgenstern
538b7b8e7d refactor: Simplified city-state war declaration 2022-06-09 19:33:14 +03:00
Yair Morgenstern
467b0b2570 All "attacked city state" functions should only activate when attacking directly, not when declaring war due to alliances 2022-06-09 19:26:12 +03:00
Yair Morgenstern
6c463797d8 Resolves #7080 - tileFilter matches resource name and uniques 2022-06-08 19:52:45 +03:00
Yair Morgenstern
b15e949a33 Resolves #7103 - mapholder size reset after resize 2022-06-08 19:40:41 +03:00
OptimizedForDensity
b79246ee02 Certain projects cannot be hurried by great engineer (#7076) 2022-06-08 10:20:45 +03:00
OptimizedForDensity
207cba0844 Fix scout not upgrading through ruins (#7091) 2022-06-08 10:19:42 +03:00
SomeTroglodyte
0ac89a906d WordScreenTopBar rework, portrait-friendlier (#6945) 
* 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
 2022-06-08 10:18:30 +03:00
alexban011
29c55cd393 fixed minimap showing fog of war everywhere when you joined a mp game without being a player (#7094) 
* reveal tiles if spectator

* better formatting

* even better formatting

* removed additional new line
 2022-06-08 10:18:11 +03:00
MindaugasRumsa
b05072d0c9 Fix "Free technology" allowing you to get a technology you're not supposed to be able to get (#7083) 2022-06-08 02:16:46 +02:00
Yair Morgenstern
e5d8de6b58 Resolved crashes when centering on a city-state with no cities 2022-06-07 23:31:22 +03:00
OptimizedForDensity
c40b25a73b Fix rare case where ruins would delete an AI unit while trying to upgrade it (#7084) 
* Fix rare case where ruins could delete AI units when upgrading the unit

* Don't moveToTile if the unit is destroyed

* Update comment

* Forgot to uncomment line

* Move currentMovement = 0f to destroy()
 2022-06-07 08:27:25 +03:00
OptimizedForDensity
f5317eb53b Prevent duplicate ruin reward (#7085) 2022-06-06 22:34:23 +03:00
Yair Morgenstern
120c41dd15 Revert "Moddable prettier Tutorials - Step 1 (#7064)" 
This reverts commit e91c0ff212.
 2022-06-06 09:59:21 +03:00
OptimizedForDensity
1312140793 More rankings & demographics screen icons (#7063) 
* Add icons to demographics/rankings screen

* Unused import

* Some simplification

* Reviews

* Undelete atlas
 2022-06-06 09:33:34 +03:00
SomeTroglodyte
e91c0ff212 Moddable prettier Tutorials - Step 1 (#7064) 2022-06-06 09:32:23 +03:00
alexban011
6c990b67e2 spectators can no longer move and attack with units after selecting them (#7062) 
* less power for spectators

* better formatting
 2022-06-06 09:32:02 +03:00
OptimizedForDensity
7ae54aceb1 Fix medic promotion healing enemies (#7074) 2022-06-06 09:30:38 +03:00
SomeTroglodyte
bbe74854b4 Fix current list of un-translatables (#7057) 
* Fix current list of un-translatables

* Fix current list of un-translatables - revert tr() change and tweak map editor map parameter display
 2022-06-06 07:43:28 +03:00
alexban011
13da7c1b9e Better friends list UI (#7054) 2022-06-06 03:02:45 +02:00
Jack Rainy
862f368075 Bugfixes to the units' teleportation (#7071) 
* Allow to pass other units when teleporting

* Teleport to the closest city tile

* Additional unit tests
 2022-06-05 23:17:59 +03:00