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

1944 commits

Author SHA1 Message Date
Vladimir Tanakov
9776029376 introduce UnitActionsType (#1633) 2020-01-09 20:17:13 +02:00
r3versi
036d4058f1 Cities referenced by UUID (#1638) 
* Cities referenced by UUID

* UUID defaulted in CityInfo

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2020-01-09 19:41:55 +02:00
r3versi
065e944896 Songhai (#1636) 
* Songhai, Burial Tomb, Gold for capturing city

* Burial Tomb unique: double gold gained when city is captured

* Rebuilt Atlas and Translations

* Italian translation + fix missing translations

* Barbarian Camp Reward

Is now modified by Speed and Difficulty
 2020-01-09 19:23:00 +02:00
Yair Morgenstern
f554d8c2c4 Multiple mods work OK! 2020-01-07 19:50:36 +02:00
drwhut
a13570f109 Added a growth progress bar to CityButton. (#1626) 
* Added temporary growth number to CityButton.

* Added a growth bar to CityButton.

* Made relevant changes based on comments in pull request #1626

* Added the unicode infinity symbol to reflect no growth.

* New growth functions now return null instead of -1.

* Adjusted the population group width to account for large numbers.

* Changed the colour of the growth number.
 2020-01-07 18:55:38 +02:00
Yair Morgenstern
365dced442 Non-continuous rendering isn't quite ready yet 2020-01-06 09:47:18 +02:00
Yair Morgenstern
285c92150c Incan mod is successful! We can haz mods! =D 2020-01-05 22:55:48 +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
6a9de727ad misc. so they don't get in the way of the main work 2020-01-05 21:45:09 +02:00
Yair Morgenstern
47e998269a Allocation and runtime optimization with sequences 2020-01-04 23:02:57 +02:00
Yair Morgenstern
8f231cd6e1 Can now only start game in NewGamScreen with 2 or more players 2020-01-04 22:09:49 +02:00
Yair Morgenstern
7eb4b0db2d 3.4.8 2020-01-04 21:26:33 +02:00
Yair Morgenstern
c6b96f4f5b Resolved #1608 - added û character 2020-01-04 21:17:15 +02:00
r3versi
e61c4f5f1c Discrete rendering (#1612) 
* Named threads for debugging/profiling

* Proposal: Discrete rendering, remove black spinning circle
 2020-01-04 21:13:41 +02:00
r3versi
23cfab6001 Stop Exploration sets unit.action to null (#1613) 
* Stop Exploration sets unit.action to null

* UnitActions callback Fix #1614
 2020-01-04 21:08:23 +02:00
lyrjie
2af847b3a6 Fix: "Sell the building" button being randomly disabled (#1611) 
* Fix: "Sell the building" button being randomly disabled based on the sell price

* Fix: `sellBuildingButton` being enabled in puppet cities

Co-authored-by: dumichno <57294813+dumichno@users.noreply.github.com>
 2020-01-04 21:01:06 +02:00
r3versi
40c6934ae4 Clear current map removes natural wonders (#1607) 2020-01-04 21:00:18 +02:00
Yair Morgenstern
19c21b64f7 All GetTilesInDistance and GetTilesAtDistance are now without new vector allocation, so much faster and with much less memory! 2020-01-04 20:47:09 +02:00
Yair Morgenstern
9907e4429c Removed game settings from crash report, not very helpful 2020-01-03 15:20:38 +02:00
r3versi
f7b5a506fd HexMath is a singleton (#1603) 2020-01-03 10:33:01 +02:00
r3versi
a1b0c1dcd4 TileMapHolder refactor & Map Editor update (#1584) 
* TileMapHolder renamed to MapHolder
* EditorMapHolder and WorldMapHolder inherits from ZoomableScrollPane
* MapEditor Brush Size (from 1 to 5)
* MapEditor painting mode (dragging the pointer on screen paints continuously)
 2020-01-02 20:02:38 +02:00
Yair Morgenstern
73816dd470 Resolved #1598 - we now save map options for new games started 2020-01-02 19:37:40 +02:00
Yair Morgenstern
52165e692f Specific automation for Missile units means they won't try to move to tiles that they can't move to 2020-01-02 19:36:19 +02:00
Vladimir Tanakov
03aee45fe3 Refactor sounds and unitactions data class (#1596) 2020-01-02 19:01:51 +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
61050feca1 3.4.6 2019-12-30 18:36:05 +02:00
lyrjie
cedb6ff5e3 Added the notification for the third-party civilizations (#1558) 
* Added the notification for the third-party civilizations

If a civilizations knows about some two civilizations, it will be notified when:
* They declare the war
* They make a peace
* They sign the declaration of peace
* One denounce the other

Additionally, when civ enters a new era, all civs that know about it get a notification

* Fixed the translation `.properties`

* Cleanup

* Fix: 2 notifications for each peace treaty

Russia and America...
America and Russia...

* Typo

* Code style changes

* Resolved conflicts

* Simple getCommonKnownCivs() tests
 2019-12-30 18:12:14 +02:00
Yair Morgenstern
2132c49d55 jsonParser no longer serialized in CivilizationInfo 2019-12-30 18:07:00 +02:00
Vladimir Tanakov
1cc8227025 Fix civilopedia parsing, fix dialog does not call update to enable next turn button (#1553) 2019-12-30 18:04:12 +02:00
Yair Morgenstern
d3311b3f24 Map editor works again 2019-12-30 18:00:11 +02:00
Yair Morgenstern
d750e369a0 Resolved #1569 - "Patreon" button actually opens Patreon now 2019-12-29 18:03:59 +02:00
Yair Morgenstern
006b2d7690 External merge resolve of #1566 
Merge branch 'spain' of https://github.com/r3versi/Unciv into r3versi-spain
 2019-12-29 17:56:05 +02:00
Yair Morgenstern
4dd3a69a72 Can now display pixel resources on the map! 2019-12-29 17:51:39 +02:00
Yair Morgenstern
1143356747 Letting players see other players' policies was not a good idea, having it be unknown is part of the challenge methinks 2019-12-29 15:08:31 +02:00
r3versi
aa034d73c2 Fix natural wonders (#1550) 
* Natural Wonders Uniques

* Fix Natural Wonders in Map Editor

* Translation files

* Terrain uniques test

* GBR spawn update Fix #1552
 2019-12-28 23:11:37 +02:00
Yair Morgenstern
a55e01f004 AI no longer attempts to get rid of barbarian encampments with nuclear strikes. 2019-12-28 23:10:49 +02:00
Yair Morgenstern
e02038d4bf Fixed crashing bug from trying to move the the enemy unit instead of to the place to attack from 2019-12-28 21:15:57 +02:00
r3versi
461f285059 Moving a city to a cityless Civ flags it as capital (#1556) 2019-12-28 19:10:26 +02:00
Yair Morgenstern
9d9700b119 Welp added some lines I shouldn't have 2019-12-27 00:20:02 +02:00
Yair Morgenstern
80be3c276e Small steps towards mods 2019-12-27 00:15:42 +02:00
Yair Morgenstern
87830bf8b2 Code cleanup - ruleset maps are now lowercased 2019-12-26 22:00:49 +02:00
Yair Morgenstern
6c10d1d4f8 Code cleaning - no more direct access to the cached center tile in CityInfo 2019-12-26 18:08:11 +02:00
Yair Morgenstern
8a229c502c Can no longer purchase constructions from cities in resistance 2019-12-26 18:04:02 +02:00
lyrjie
539758b905 Translation placeholder testing (#1542) 
* Added translation string placeholders test

* Fixed the placeholder typos in all translations

* [30] to 30 migration
 2019-12-26 14:39:15 +02:00
Yair Morgenstern
94f1b074c9 Indonesian is in and has a flag 2019-12-26 12:15:26 +02:00
Yair Morgenstern
fd8528af7a All tests are properly Koltinized! 2019-12-26 12:01:23 +02:00
Vladimir Tanakov
7f06ae0cce Refactor Tutorials and fix some issues, write tests (#1524) 2019-12-26 11:40:48 +02:00
lyrjie
935f598282 Fix: automated units would advance towards enemies they can't attack without dying (#1529) 
* Fix: units would advance towards enemies they can't attack without dying

* Code quality
 2019-12-26 11:29:40 +02:00
Yair Morgenstern
a95c9ee4cd Ancient Ruins are now spread out instead of randomized 2019-12-25 23:52:09 +02:00
Yair Morgenstern
94414203ef Resolved #1533 - Defeated city states no longer "declare war" if you attack their ally 2019-12-25 23:42:32 +02:00
r3versi
00f26b1510 Fix #1531 + Indonesian.properties added (#1532) 
* Fix #1531

* Requested on Discord

* Update Indonesian.properties

Co-authored-by: hyunamae <59202601+hyunamae@users.noreply.github.com>
 2019-12-25 23:37:49 +02:00
lyrjie
be09051295 Fix: cities can be connected to capital via coast even if they don't have Harbor building (#1528) 
Reported by discord@tap wature
 2019-12-25 10:59:53 +02:00
lyrjie
2c07bae6f2 Fix: barbarians won't enter tiles owned by other civs (#1523) 
* Fix: barbarians won't enter tiles owned by other civs

* Barbarians ability to enter player tiles is now affected by difficulty setting
 2019-12-24 23:43:26 +02:00
Yair Morgenstern
97f3260047 Grand Mesa artwork by The Bucketeer means it's now in the game! 2019-12-24 15:28:59 +02:00
lyrjie
982c326ccd Polynesia ocean fix (#1522) 
yarim210/Unciv#1514
 2019-12-24 12:49:25 +02:00
r3versi
b6dbc3a833 Fix nat wonder #2 (#1519) 
* Fix Natural Wonders tile worked happiness not computed & double bonus from discovering extended (like GBR) Natural Wonder in same turn

* Bugfix Barbarians spawning on Natural Wonder + Notification on Barbarian Spawn

* Added notification text to ranslations
 2019-12-23 23:55:19 +02:00
r3versi
303e0493d8 Fix Natural Wonders tile worked happiness not computed & double bonus from discovering extended (like GBR) Natural Wonder in same turn (#1518) 2019-12-23 22:14:02 +02:00
Vladimir Tanakov
25a3467cb3 Add crash reporting controller and email sending on android (#1509) 2019-12-23 22:12:35 +02:00
Yair Morgenstern
dedb46c55c 3.4.3 2019-12-23 19:15:57 +02:00
r3versi
a1aec212bd City states influence, Bugfix Greece (#1512) 
* Fix Greece Unique wasn't effective + Added CityState relation notifications

* Greece influence to CityState benefits from unique
* Added notifications when you are about to lose (or lost) friendship and alliance with a city state. Closes #1168
* Introduced restingPoint in DiplomacyManager to support constant shifts in influence

* Autogeneration translation files
 2019-12-22 23:08:46 +02:00
Yair Morgenstern
dff886939d Many many people have said that winning cultural victory is too easy, so it's now upped from 4 to 5 policy branches 2019-12-22 22:14:04 +02:00
Yair Morgenstern
707b59cc6a Hopefully solved ANRs when first entering a large multiplayer game 2019-12-22 22:13:05 +02:00
Yair Morgenstern
3ef34f99ff Added missing translations 2019-12-22 20:00:28 +02:00
Yair Morgenstern
9838e0f3a9 Solved rare bug when razing the capital city 2019-12-22 19:58:38 +02:00
Yair Morgenstern
82d8670b16 Fixed super wierd bug where the conquering player hadn't met the civ he was conquering the city from (whaaaaat) 2019-12-22 19:00:58 +02:00
Yair Morgenstern
ca86d9d360 Hopefully fixed crash on specific devices when activating "Conduct trade mission" 2019-12-22 18:54:07 +02:00
Yair Morgenstern
fb244943fb Fixed crash when liberating cities when you haven't met their original owners 2019-12-22 18:50:40 +02:00
Yair Morgenstern
314b620405 Fixed relatively rare crash where the settings were being read but ended up null, not sure how that happened to start with... 2019-12-22 18:35:41 +02:00
r3versi
c2dc0217b6 Rejuvenation icon + Unique promotions are listed in PromotionPickerScreen (#1506) 2019-12-22 15:29:40 +02:00
Yair Morgenstern
ffd5368df4 Added Promotion information to Civilopedia 2019-12-21 21:05:54 +02:00
Yair Morgenstern
1d2bf490b5 People said in the comments they couldn't find the "Create improvement" button, so here. 2019-12-21 20:35:04 +02:00
Yair Morgenstern
884eb672e7 Merge branch 'master' of https://github.com/yairm210/Unciv 2019-12-21 20:07:43 +02:00
Yair Morgenstern
09c8cf221f Resolved #1493 - Added Nation information to Civilopedia 2019-12-21 20:06:58 +02:00
Vladimir Tanakov
0b8145cba5 Fix error due changing language on Android < 4.4 (#1502) 2019-12-21 19:56:23 +02:00
r3versi
383b39c62d Diplomacy graph size scales with screen space available (#1495) 
* Diplomacy graph size scales with screen space available

* Deleted debug option left on
 2019-12-21 19:50:01 +02:00
r3versi
2afda16095 Added missing translations of Natural Wonders and Civilopedia Tutorials entries (#1498) 
* Added missing translations natural wonders related

* Auto generation of translation files

* Missing Tutorial names translation

* Auto generation translation files

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2019-12-21 19:44:11 +02:00
r3versi
6598c76041 Fixes #891 (#1491) 
* After a zoom gesture the World Screen needs to be updated
 2019-12-21 19:35:27 +02:00
Yair Morgenstern
32621b6611 Game crash popup is no longer a tutorial, so it doesn't get affected by the "displayTutorials" settings and has migrated to the .properties files for translation. 2019-12-21 18:58:14 +02:00
Yair Morgenstern
3f0e33df89 Added try/catch on reading the translation file (some phones don't support UTF-8???) 
You can always pass the language screen even if we don't read the percentage files
We read the percentage files from the INTERNAL NOT THE LOCAL OBVIOUSLY
 2019-12-20 11:27:26 +02:00
Yair Morgenstern
7d1eaf4338 We no longer need the ugly "Missing translations" dropdown in the Options, now that all missing translations are super easy to find in the translation files themselves =) 2019-12-20 00:08:23 +02:00
Yair Morgenstern
3f1edbf308 We now generate a small "percentage complete of each language" file, so that getting that information doesn't take an entire second on Android (that's a lot at startup!) - down to a couple of ms! 2019-12-19 18:29:18 +02:00
Yair Morgenstern
a41874e1a5 We now load translation percentages on initialization so we won't need to mid-game, fixed "create" and the "resume" both trying to do the same things 2019-12-19 17:48:17 +02:00
Yair Morgenstern
ebfd79636f Natural wonders (and other terrains with no RGB) now have a golden color on the minimap 2019-12-19 17:45:20 +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
Yair Morgenstern
77d00f35bb Translation files now take a huge amount of time to load, moved their loading into a thread and put up a "loading screen" beforehand 2019-12-18 22:24:18 +02:00
Yair Morgenstern
fd7160b785 Added line spacings in the translation files, for organization 2019-12-17 22:57:39 +02:00
Kevin Fisher
52111430ef Add close icon for the UnitTable (#1472) 2019-12-17 21:44:20 +02:00
Yair Morgenstern
b0a0638e84 Hopefully solved ANR when loading the game initially 2019-12-17 20:46:30 +02:00
Yair Morgenstern
e82cdd42fa Solved Application Not Responding when downloading map 2019-12-17 20:39:46 +02:00
Yair Morgenstern
fc4eb01be8 Added tests to ensure we don't miss translations in the future 2019-12-17 19:16:31 +02:00
Yair Morgenstern
113531a695 Spanish Civ is not production-ready, and natural wonders should be opt-in at the beginning 2019-12-17 16:56:07 +02:00
Yair Morgenstern
4f03322565 Tutorial task table now becomes visible when turning displayTutorials on - kudos @r3versi 2019-12-17 14:39:32 +02:00
Yair Morgenstern
0de84e60a9 Not all Natural Wonders look good enough to enter the game as-of-now. 2019-12-17 14:23:17 +02:00
r3versi
aa02a2d321 Natural Wonders (#1456) 
* NaturalWonders initial commit
* Created models/ruleset/tile/NaturalWonder and assets/json/NaturalWonders
* MapGenerator now spawns NaturalWonders in random compatible random locations
* MapParameters has a noNaturalWonders option
* TileInfo has naturalWonder property (set to null if none)
* TileInfo and  UnitMovementAlgorithms correctly manages stats and consider the tile unpassable and unimprovable

* Notification and happiness on NaturalWonder discovery

* El Dorado discovery bonus, Spain unique

* Doubled tile yields for Spain

* NaturalWonders implemented as TerrainType + Fountain of Youth promotion

* Images issue #124

* NaturalWonder TileImages (Fantasy) and Overlay (Default)

* NaturalWonderOverlay.png : https://www.flaticon.com/free-icon/mount-fuji_2166259

* Bugfix

* Added translations

* Italian translations

* Fix translation issue
* missing space after = in template.properties breaks translations

* Improved NaturalWonder spawn logic

* Great Barrier Reef spawns on 2 contiguous tiles
* Each wonder has specific spawn requirements
* Number of wonders spawned scales with map radius

* Fix unused import
 2019-12-16 20:37:49 +02:00
Yair Morgenstern
0366233be5 Translations will always be read with UTF-8 encoding 2019-12-16 19:47:35 +02:00
Yair Morgenstern
7abd0143c6 Excess settler food to production conversion moved to CityStats, solving the "0 production for settler" bug and also it's now displayed in the stats breakdown =) 2019-12-16 19:41:17 +02:00
Yair Morgenstern
a0dd770a3a 'Show tutorials' setting now controls tutorial tasks as well 2019-12-15 23:12:34 +02:00
Yair Morgenstern
8ae0d9d191 Maybe fixed the 'no languages except Chinese' bug in Android phones, but since I can't check this, I'll stick with both of them. Better safe... 2019-12-15 22:50:51 +02:00
Yair Morgenstern
94a960abc2 All languages should work for everyone 2019-12-15 22:00:12 +02:00
Yair Morgenstern
873f578d9f Added explanations for Great Scientist and overflow things in techManager 2019-12-15 21:32:32 +02:00
Yair Morgenstern
4b99656719 Changed Great Scientist unique and action strings in all languages, and removed BasicHelp - all the important info should be in the tutorials anyway. 2019-12-15 21:21:17 +02:00
lishaoxia1985
418a4968a4 great scienstist does the job like original game (#1453) 2019-12-15 20:41:39 +02:00
lishaoxia1985
e937ea0af1 all codes are writen in Kotlin (#1452) 2019-12-15 20:28:34 +02:00
Yair Morgenstern
ddf2794902 Fixed quote typo 2019-12-14 23:37:29 +02:00
Yair Morgenstern
66af60b107 templates.properties -> template.properties 2019-12-14 23:31:11 +02:00
Yair Morgenstern
7ba5429387 Templates file is now empty for simple creation of new language files! 2019-12-14 23:26:00 +02:00
Yair Morgenstern
04ad012cd9 IT IS DONE 
Translations are now split by language, and new translations can be added to all languages by changing the templates.properties file!
 2019-12-14 23:18:46 +02:00
Yair Morgenstern
b544615643 In multiplayer, Overview screen now opens as the viewing player, not current player 2019-12-14 21:04:29 +02:00
Yair Morgenstern
7eda5e9d31 Fixed Application Not Responding when uploading map 2019-12-13 14:40:45 +02:00
Yair Morgenstern
307bccb7d0 Added tutorial task for viewing stats breakdown 
Added an animation to "Pick language" on the language picker screen, because someone actually got stuck on that 0_0
 2019-12-13 14:31:42 +02:00
Yair Morgenstern
906bf19426 Better category spacing for Civilopedia 2019-12-13 14:07:46 +02:00
Yair Morgenstern
a13d6bc82e Package move & civilopedia scroll fix 2019-12-13 13:58:05 +02:00
Yair Morgenstern
76c09ad59c Resolved #1440 - Barbarians now function again! 2019-12-12 23:57:26 +02:00
Yair Morgenstern
aa73fa130e More tutorial tasks 2019-12-12 23:57:02 +02:00
Yair Morgenstern
58d58ef3a3 Cleaned up tutorials 2019-12-12 20:58:02 +02:00
Yair Morgenstern
acf91b4e12 Solved Application Not Responding errors when saving large games 2019-12-12 20:27:46 +02:00
Yair Morgenstern
5812f2026f Added Missions, to replace wall-of-text tutorials in bite-sized pieces! Very pleased with this =D 2019-12-11 22:48:18 +02:00
Yair Morgenstern
973c8fb7f8 Auto detecting resolution was a terrible idea and I regret it entirely 2019-12-11 19:43:08 +02:00
Yair Morgenstern
a91d48c912 Load Map screen now includes Download, and can handle large map names 2019-12-09 23:21:09 +02:00
Yair Morgenstern
54bbd5d8a2 New game screen clearly split into "Map options" and "Game options" 2019-12-09 22:48:54 +02:00
Yair Morgenstern
9493ce1a2e Extracted name, type, radius and noRuins of map from GameParameters to MapParameters, so that Maps can be created and defined outside of games 2019-12-09 20:46:10 +02:00
Yair Morgenstern
a90059988b Resolved #1434 Resolved #1363 - Workers no longer build tiles on other civ's territory 2019-12-09 18:53:04 +02:00
Yair Morgenstern
caf98b8470 Silly multithreading movement problems should no longer crash the game for the user - they're rare, but when you have 50,000 users they pop up every day. 2019-12-09 18:48:48 +02:00
Yair Morgenstern
32ac709a02 Resolved #1433 - city-states immediately destroy cities upon conquering 2019-12-09 18:42:18 +02:00
Yair Morgenstern
b6bb961d7c Resolved #1422 - resources are now spread over different terrains as much as possible 2019-12-08 21:19:45 +02:00
Yair Morgenstern
026afb2c88 Android icons up-to-date 2019-12-08 18:53:41 +02:00
Yair Morgenstern
9725c0f66c Facism -> Fascism policy name change in existing save files 2019-12-08 18:44:04 +02:00
Sam Rogers
cdcd7cf116 correct spelling of "Fascism" policy (#1432) 2019-12-08 18:40:48 +02:00
Yair Morgenstern
df27cb3bdd The base resolution is auto but it can be manually set. That oughtta keep everyone happy. 2019-12-08 18:22:25 +02:00
Yair Morgenstern
66e940dd2b Revert "We now auto-detect resolution from the screen! Been a long time coming!" 
This reverts commit 7d458207b5.
 2019-12-08 17:36:02 +02:00
Yair Morgenstern
7d458207b5 We now auto-detect resolution from the screen! Been a long time coming! 2019-12-08 15:28:53 +02:00
Yair Morgenstern
34bd8155ae New icon! 2019-12-08 15:00:27 +02:00
Yair Morgenstern
297e604bbf Long translated leader names now display nicely in civ picker popup 2019-12-08 12:59:38 +02:00
Yair Morgenstern
5694877fbd Every civ damaged by a nuclear blast declares war on the attacker 2019-12-08 12:01:58 +02:00
Yair Morgenstern
02501793b3 Using nuclear weapons has large diplomatic reprecussions 2019-12-08 11:50:30 +02:00
Yair Morgenstern
736edb5069 Back to the way it was - we only need the shader if we're using GL 3.0 apparently 
Let's stick to 2.0 for now
 2019-12-08 11:22:46 +02:00
Yair Morgenstern
81e520e608 GL 3.0 should now work for mac - kudos @lishaoxia1985 2019-12-08 10:04:16 +02:00
Yair Morgenstern
9f3a943865 Resolved #1426 - starting a new game from a file-map game shows new correct options on the new game screen 2019-12-07 20:31:04 +02:00
Yair Morgenstern
440941cdea Battle simulation will no longer be dislayed for fogged-out tiles with units 2019-12-07 20:21:44 +02:00
Yair Morgenstern
69cdd0c187 Can no longer construct Apollo Program, and therefore spaceship parts, if Scientific Victory is disabled 2019-12-07 19:56:10 +02:00
Yair Morgenstern
38b9b13a0a Ruleset should have a lower-case s, because it's not, you know, a Set 
Also, Rulesets can now read rules from any json folder
 2019-12-06 13:59:12 +02:00
Yair Morgenstern
c32e3fce3c More normalization - can no longer add "everywhere" improvements on Water tiles. 2019-12-06 11:17:33 +02:00
Yair Morgenstern
6ab58fd8ab More map editor normalization, because people will doo whatever they can to break the system 2019-12-06 10:23:30 +02:00
Yair Morgenstern
3ea4f8bc82 Resolved #1420 - Menu in the map editor no longer opens multiple times on subsequent clicks 2019-12-06 10:12:16 +02:00
Yair Morgenstern
110e7b7052 Desktop no longer crashes/bugs on first initialization 2019-12-05 20:59:44 +02:00
Yair Morgenstern
b9487c1800 More ruleSet-shouldnt-come-from-static fixes 2019-12-05 20:39:57 +02:00
Yair Morgenstern
51a0d7727a Renamed gameInfo.gameBasics to ruleSet 2019-12-05 20:22:34 +02:00
Yair Morgenstern
9b6ec809b3 Map editor now works with new ruleset 2019-12-05 00:15:05 +02:00
Yair Morgenstern
b7ffdb7cc3 Renamed GameBasics to RuleSet, because that's basically what it is 2019-12-05 00:01:00 +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
b64c209218 Resolved #1361 - clicking on a unit's promotions now brings you to the promotion screen 2019-12-04 19:47:18 +02:00
Yair Morgenstern
ef272b3208 Fixed "Positive" diplomatic modifier for warmongering 2019-12-03 21:28:50 +02:00
Yair Morgenstern
87a746f79b Non-coastal cities no longer have water units missing resources in the construction list 2019-12-03 21:19:28 +02:00
Yair Morgenstern
cf4d40501e Fixed "Arial units trying to move to their own tile" crashing bug 2019-12-03 20:45:35 +02:00
Yair Morgenstern
9868749d56 Solved crashing "AI Unit upgrade" bug! 2019-12-03 19:48:16 +02:00
Yair Morgenstern
e3ac6f4e53 Resolved #1404 - AI should no longer be able to win cultural victory after being defeated 2019-12-02 22:08:57 +02:00
Yair Morgenstern
f79858e39e Tutorials will now always be read with the correct encoding 2019-12-02 22:02:21 +02:00
Yair Morgenstern
7a9fd14b13 Resolved #1405 - upgrading Spearman to Landsknecht no longer gives you gold 2019-12-02 22:01:16 +02:00
Yair Morgenstern
fa0d650362 City buttons stay the correct size upon "Next turn" 2019-12-01 21:47:40 +02:00
Yair Morgenstern
6124fd5271 Removed long click action. It was more trouble than it was worth. 2019-12-01 21:21:50 +02:00
Yair Morgenstern
dae477a870 Resolved #1374 - air units should no longer move and attack in the same turn 2019-12-01 21:20:53 +02:00
Yair Morgenstern
c992995b6f Can now pick Random civ in player picker 2019-11-30 23:11:46 +02:00
u-ndefine
6d1cfd2a9c Minor typo fix at VictoryScreen.kt (#1399) 2019-11-30 21:57:42 +02:00
Yair Morgenstern
757439f2d1 3.3.3 2019-11-30 21:56:00 +02:00
Yair Morgenstern
68ee549edb Map editor normalizes tiles, so you can't add improvements of features where they shouldn't belong 
Placing a civ starting location removes older starting locations
 2019-11-29 12:01:32 +02:00
Yair Morgenstern
5807957d32 Resolved #1369 - nuking capitals no longer crashes the game 2019-11-28 22:21:39 +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
3816014ae4 Added Great Person city location to notification 2019-11-28 21:10:36 +02:00
Yair Morgenstern
55b2da6d75 Normalized resource reveal notification 2019-11-28 21:05:36 +02:00
Yair Morgenstern
3d3b2cd3fc When choosing a tech to work towards, the order will no longer "jump" over techs 2019-11-28 20:42:25 +02:00
Yair Morgenstern
df964a5ec6 TechPickerScreen organization 2019-11-28 20:28:04 +02:00
Yair Morgenstern
008485b38c Exploring units are not considered Idle 2019-11-28 20:26:44 +02:00
Yair Morgenstern
d0975ebc38 I don't think you should be able to see other tech's tech trees from the victory screen. 2019-11-28 19:57:55 +02:00
Yair Morgenstern
ad19dd1afa Resolved #1388 - Starting era no longer automatically displayed as "Ancient" in New Game screen 2019-11-28 19:42:08 +02:00
Yair Morgenstern
8826c4e84f Resolved #1372 - AI should now build spaceship parts and be able to win a scientific victory =) 2019-11-27 21:15:16 +02:00
Yair Morgenstern
7998ed2f0c Resolved #1365 - Disabled trading cities in One City Challenge 2019-11-26 20:55:07 +02:00
Yair Morgenstern
2da7c5be8f Tutorials are now popup tables - limits the width of tutorials so they don't go off-screen 2019-11-25 14:28:32 +02:00
Yair Morgenstern
ad4bc86d52 Merge branch 'master' of https://github.com/yairm210/Unciv 2019-11-25 12:09:33 +02:00
Yair Morgenstern
aee9724765 Your voice has been heard - All units now have the Explore command 2019-11-25 12:08:22 +02:00
lishaoxia1985
7453ee637f 1. overflow science when finishing and starting research. 2. in the cityscreen unit should be not visible. 3. modifier the policy "Commerce Complete" according to original game. 4. the action of "Great Merchant" now is the same as original game. 5. translation update. (#1355) 
* update

* update

* update

* update

* update

* update
 2019-11-25 12:03:20 +02:00
Yair Morgenstern
488b733db6 Resolved #1368 - missiles can no longer be promoted 2019-11-25 11:58:02 +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
a8c98f60d7 Railroads are now much more visible! 2019-11-23 22:43:35 +02:00
Yair Morgenstern
c447bd2da8 Resolved #1359 - City name from overview screen now leads directly to the city scren 2019-11-23 22:30:25 +02:00
Yair Morgenstern
095deee125 UncivGame rename 2019-11-23 22:28:23 +02:00
Yair Morgenstern
18be826c1a Changed "help translating" initial message to point to Github 2019-11-23 21:52:43 +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
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
0ec0ee3d44 All the various clicks on the world screen can now work together as friends 2019-11-21 10:53:08 +02:00
Yair Morgenstern
cbb5db2fb8 Resolved #1231 - can now aquire tiles from eighboring cities again, kudos @klondi 2019-11-20 23:33:09 +02:00
Yair Morgenstern
e4fe43f281 Resolved #1344 - currently showing tutorials should not activate again 2019-11-19 23:19:07 +02:00
Yair Morgenstern
3ea6c63e0b Fixed annoying bug which would treat long pans and flings as long clicks 2019-11-19 23:09:36 +02:00
Yair Morgenstern
526a99fb0d Set ShowPixelImprovements to True for new players - I think the world is ready 2019-11-19 22:08:24 +02:00
Yair Morgenstern
b1868accc5 Nuclear Weapon setting moved to Options, s it can be more easily explored by players 2019-11-19 22:00:16 +02:00
lishaoxia1985
dd28711ee7 update translation (#1352) 
* update

* update

* update

* update

* update

* update

* update

* update

* update

* update
 2019-11-19 21:58:56 +02:00
Yair Morgenstern
ff3795c96f TechButton now displays units and buildings corresponding to the description 2019-11-19 20:16:53 +02:00
Yair Morgenstern
15e59b161b Technology description no longer includes Manhatten Prokect or Nuclear Missile in description when nuclear weapons are disabled 2019-11-19 19:34:48 +02:00
lishaoxia1985
1eb5ced75c add map modifier and the benefit when we research the technology other Civs have. (#1339) 
* update

* update

* update

* update

* update

* update

* update

* update
 2019-11-19 19:11:01 +02:00
Duan Tao
111030e457 Nuke your enemy! (#1318) 
* Nuke your enemy!

* Fantasy tiles. Worker automaticly clears fallout.

* Some AI improvement for choosing wonder and military unit.

* Add nuclear weapon option.
 2019-11-19 08:43:04 +02:00
Yair Morgenstern
313f55171c Lint 2019-11-18 22:03:49 +02:00