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

1789 commits

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