mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-28 08:30:31 +07:00
Code Issues Packages Projects Releases Wiki Activity
4,767 Commits 6 Branches 1,043 Tags 1.2 GiB
aa944bad87
Commit Graph

2974 Commits

Author SHA1 Message Date
Yair Morgenstern
894e520319 More concurrency problems avoided by creating a second cityStats to run the values on 
This should also help speed things up, since we don't need to run the update() again to revert it!
 2021-01-26 22:34:38 +02:00
Yair Morgenstern
3199098ae8 Solved ANRs when loading large maps in map editor 2021-01-26 22:20:36 +02:00
Yair Morgenstern
83ecc9ee42 Hopefully mitigated some concurrency related crashes 2021-01-26 22:20:03 +02:00
Yair Morgenstern
0c89986af4 Resolved #3436 - parametrized "+[]% [] in all cities" 2021-01-25 20:47:50 +02:00
Yair Morgenstern
48f68c6bd0 Smoother map panning 2021-01-25 19:23:48 +02:00
GGGuenni
3037ce4141
multiple game support for TurnChecker (#3540) 
* TurnChecker now checks every multiplayer game

Not just the currently open game

* Adding game saving to turn checker

so multiplayerScreen stays up to date

* remove unused imports

* removing unused functions
 2021-01-24 16:12:44 +02:00
k4zoo
26afb16b6b
Update TileInfo.kt (#3557) 
My first real pull request :P. I saw ResourceType.Luxury and ResourceType.Bonus being used in MapGenerator.kt so I thought why not make them accessible as a parameter for uniques?
 2021-01-23 19:12:15 +02:00
Jack Rainy
8c0be488bc
Avoid overflow of the health bar in the overkill situation (#3558) 2021-01-23 19:11:41 +02:00
Yair Morgenstern
e3187148f5 Improvements with 0 turns to build are 'placeable' improvements which can only be places by corresponding uniques 2021-01-21 20:38:02 +02:00
Duan Tao
6889a60605
Fixed : great people could not build improvement. (#3553) 
* Fixed : great people could not build improvement.

* Better check for buildable.

* Revert "Better check for buildable."

This reverts commit b9fa0efbae.

* Better check for buildable.
 2021-01-21 20:17:01 +02:00
Yair Morgenstern
385e5c8e68 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-01-19 20:55:59 +02:00
GGGuenni
0a54e914ee
Fixed Crash (#3549) 
the game crashed because the UncivShowableException thrown by GameInfo, when used mods are not installed anymore, did not get catched
 2021-01-19 12:36:47 +02:00
Yair Morgenstern
3b3be47ddb Resolved #3548 - defeated civs now stack correctly in overview>diplomacy 2021-01-18 21:20:47 +02:00
Yair Morgenstern
2d1113fc5a "Create improvement" works on water improvements as well :) 2021-01-17 21:05:32 +02:00
Yair Morgenstern
1863a7d214 Code cleanup 2021-01-17 21:04:16 +02:00
Yair Morgenstern
245e7de0a1 Can handle and detect mods where the requiredBuildingInAllRuleset does not exist in the ruleset 2021-01-16 21:22:15 +02:00
Yair Morgenstern
b27c744cd2 Retrieving the construction info in a different thread now works perfectly! 2021-01-16 21:12:55 +02:00
Yair Morgenstern
7e092fdf16 Linting 2021-01-16 21:07:53 +02:00
Yair Morgenstern
942aa981ba City stats update now accepts construction - simplifies the CityConstructions.turnsToConstruction function 2021-01-16 21:05:15 +02:00
Yair Morgenstern
6f8add77e8 Resolved ANRs for slow phones when loading the construction list 2021-01-15 15:12:14 +02:00
Yair Morgenstern
3a729874c2 Constructions table reorg - each piece has a self contained update 2021-01-15 14:55:09 +02:00
Yair Morgenstern
6c66600fce Unified construction button metadata / UI split 2021-01-15 14:50:10 +02:00
Yair Morgenstern
ab262da205 Construction button creation moved to DTO for later refactoring 2021-01-15 14:38:12 +02:00
Yair Morgenstern
d91f4752e0 Hopefully made some memory errors clearer to the user 2021-01-15 14:17:30 +02:00
Yair Morgenstern
0b7f45bba0 Problems when saving game are now user-visible 2021-01-15 13:29:50 +02:00
Yair Morgenstern
0800dbba51 Resolved #3533 - Added confirmation popup when saving over existing save 2021-01-15 13:28:29 +02:00
Yair Morgenstern
13e79ac37c Fixed "Unique great person is available from Great Person picker screen" bug 2021-01-13 22:08:12 +02:00
Yair Morgenstern
a666cfa320 Resolved #3526 - stats drilldown remains when moving between city screens 2021-01-13 21:38:28 +02:00
GGGuenni
470952ea89
Improving MultiplayerScreen loading speed (#3527) 
* Improve MultiplayerScreen Loading Speed

* Refactoring

- renamed multiplayerGameList to multiplayerGames because it's not a List
- changed content of map from <GameId, Filehandle> to <FileHandle, GameInfo> because GameId is an expensive Key

* i do as yairm guides
 2021-01-13 19:46:29 +02:00
Yair Morgenstern
73c5811297 Buildings not displayed in civilopedia are not show to be obsoleted in tech tree either 2021-01-13 15:50:08 +02:00
Yair Morgenstern
088c716321 Game can handle ongoing constructions "disappearing" between mod versions 2021-01-12 18:10:41 +02:00
Yair Morgenstern
a8e0f270a0 Game can handle policies "disappearing" between mod versions 
Added policy map to ruleset for simpler policy location
 2021-01-12 17:10:38 +02:00
Yair Morgenstern
09d44bfcd2 Resolved #3520 - picker screens go back on Back button / Esc 2021-01-12 16:34:13 +02:00
Yair Morgenstern
af326100fc Resolved #3519 - Added 'exit game from back button' to main menu screen 2021-01-11 23:56:33 +02:00
Yair Morgenstern
617e7aea93 Removed placeholder science and production boost from Computers tech 
New games start by default with city states
 2021-01-11 20:56:31 +02:00
Yair Morgenstern
18ffc2ea02 Resolved #3503 - Civilopedia and Overview show what 'panel' you're currently on 2021-01-11 17:59:28 +02:00
Yair Morgenstern
92f203c5e3 Added color to civilopedia buttons per #3503 2021-01-11 17:14:50 +02:00
Yair Morgenstern
ca6b09bed1 Merge branch 'temp' 2021-01-08 00:23:22 +02:00
Yair Morgenstern
6bf6560286 3.12.7-patch1 2021-01-08 00:15:55 +02:00
Yair Morgenstern
c4f33f9373 Resolved #3501 - Added city-state toggle to diplomacy overview, clicking on civ names in overview opens diplomacy screen 2021-01-07 23:38:26 +02:00
Yair Morgenstern
ecfa38e4e7 Resolved #3473 - show city's happiness drilldown 2021-01-06 22:52:26 +02:00
Yair Morgenstern
78735bcfad Better 'conflicting tech' check for mods 2021-01-06 22:41:00 +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
17333ec0d3 Fixed crash when attempting to issue a 'connect to capital' quest for a civ with no capital 2021-01-03 19:15:27 +02:00
Yair Morgenstern
ae805284a6 3.12.6 2021-01-02 22:09:08 +02:00
9kgsofrice
65cc56b5d7
= 1F instead of += 1 (#3487) 2021-01-01 13:49:48 +02:00
Yair Morgenstern
908cae1881 Solved ANRs when loading big maps in editor screen 2021-01-01 13:40:31 +02:00
Yair Morgenstern
26c817a4a1 Resolved #3483 - settlers require at least 2 population to construct, as per Civ V 2021-01-01 13:29:03 +02:00
Yair Morgenstern
8c50e70f22 Better visual aircraft indicators 2021-01-01 13:19:15 +02:00
Yair Morgenstern
e9f1c38c8b Set a max cap on unit maintenance - does not increase past the base turn limit 2021-01-01 13:01:06 +02:00