mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-03-12 19:10:12 +07:00
Code Issues Packages Projects Releases Wiki Activity
4,322 Commits 6 Branches 1,058 Tags 1.2 GiB
e951ed8324
Commit Graph

4322 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yair Morgenstern
e951ed8324 3.11.1 2020-10-06 10:43:10 +03:00
uncivbot[bot]
7ecb059e05
Translations update (#3233) 
* Update Italian.properties (#3221)

* Update Italian.properties

* Update Italian.properties

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

* Update Simplified_Chinese.properties (#3225)

* Update German.properties (#3228)

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Czeczki <72320003+Czeczki@users.noreply.github.com>
 2020-10-06 10:35:41 +03:00
Mojtaba Rahimy
8e53be616d
Ui fixes (#3218) 
* moving close button to end of the list and setting color to red

* aligning text/icon in main screen top bar
 2020-10-06 10:28:13 +03:00
Yair Morgenstern
93bf69f3d5 Fixes for minor bugs from the previous version 2020-10-05 23:20:49 +03:00
Yair Morgenstern
0e327012a7 Fixed Windmill unique 2020-10-05 22:51:55 +03:00
Yair Morgenstern
010497e095 Don't delete existing mods when copying mods from the external diretory on Android app startup 2020-10-05 14:40:23 +03:00
Yair Morgenstern
27c8243a78 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-10-05 12:12:34 +03:00
Yair Morgenstern
256eedc7c0 Lines go behind the techs in the tech screen, and are colored so you can trace the path of the current research queue 2020-10-05 12:12:15 +03:00
Giuseppe D'Addio
5e9ffcd22a
Update Quests.json (#3224) 
* Update Quests.json

* Update Quests.json
 2020-10-05 12:01:50 +03:00
Yair Morgenstern
5553be0d67 Minimap no longer adds city indicator on every update, leading to lower framerate over time 2020-10-05 11:45:55 +03:00
Yair Morgenstern
523ed10e68 Specialist names are taken from the json files 2020-10-04 16:25:07 +03:00
Yair Morgenstern
c70c860437 All specialist slots in jsons converted to proper name 2020-10-04 16:23:35 +03:00
Yair Morgenstern
58d651bfe2 MODDABLE SPECIALISTS ARE GO! 2020-10-04 16:16:42 +03:00
Yair Morgenstern
a24dc7cc69 Completely removed usages of the old getMaxSpecialists 2020-10-04 15:47:57 +03:00
Yair Morgenstern
fd6956507d Merge tag '3.11.0-patch1' 2020-10-04 15:20:48 +03:00
Yair Morgenstern
be2dd5c068 3.11.0-patch1 
Solved some errors that occured as a result of the recent changes assuming the specialists exist, which is not true in revamp mods
 2020-10-04 15:18:26 +03:00
Federico Luongo
2d6c322856
Connect Resource Quest implemented (#3209) 
* Removed superfluous filters in getResourceForQuest
 2020-10-04 15:01:57 +03:00
givehub99
67efd6c957
Problem: Some promotions in CIV 5 have multiple effects, but Unciv promotions only allow for one effect (#3219) 
Solution: This PR adds "uniques" field to allow for multiple effects, while keeping "effect" field so that rulesets prior to this PR can still work.
 2020-10-04 10:55:42 +03:00
Jack Rainy
296da5b205
Unit tests for the TileMap.getViewableTiles() (#3222) 2020-10-04 10:54:48 +03:00
Yair Morgenstern
3e98e0c00f 3.11.0 2020-10-03 20:48:34 +03:00
uncivbot[bot]
047fba0f1d
Translations update (#3220) 
* Update Italian.properties (#3199)

* Added more translation and fix some (#3207)

* Translations update (#3212)

* Update Japanese.properties (#3213)

* Update Persian_(Pinglish-DIN).properties (#3215)

adding more translations

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: fab144 <58261459+fab144@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: Mojtaba Rahimy <mojtaba.rahimy@chmail.ir>
 2020-10-03 20:25:20 +03:00
Jack Rainy
bddded04f5
Patch of the promotion exploit (#3214) 2020-10-03 20:24:19 +03:00
CrispyXYZ
ae182fb7b5
fix 'OpenGL is not supported' Exception (#3202) 2020-10-03 20:20:27 +03:00
Federico Luongo
300c7179e7
Various Quest relted (#3206) 
* Renamed some quests to better ones (Kill Camp -> Clear Barbarian Camp and Kill City State -> Conquer City State)
* Quests names are hardcoded in a enum class
* Quests.json translations automated
 2020-10-01 21:08:26 +03:00
Yair Morgenstern
a4d1232403 Final conversion of existing specialists to the new format 2020-10-01 17:06:34 +03:00
givehub99
fab8242c6a
"[] units gain the [] promotion" (#3204) 2020-10-01 09:51:24 +03:00
Yair Morgenstern
bfa9c65700 Modding - Buildings can be rendered obsolete (unbuildable) by techs 2020-09-30 23:17:09 +03:00
Yair Morgenstern
0cb29d64f4 New unit images by The bucketeer! 2020-09-30 20:32:02 +03:00
Yair Morgenstern
aa2486c896 Great person points come from the json! The only things that still happen directly to the specialists stats is the assign/unassign, this is as close as we'll get without changing the rest of it! 2020-09-30 20:18:52 +03:00
Yair Morgenstern
e39d3e89da All specialist colors come from the json now :) 2020-09-30 19:42:47 +03:00
Yair Morgenstern
5677fb494a Added helper function colorFromRGB(List<Int>) 2020-09-30 19:26:20 +03:00
Yair Morgenstern
43f5799578 Specialist information is now hybrid 2020-09-30 18:03:26 +03:00
Federico Luongo
9f9d89af9d
resourceIsVisible to be checked before getting tile resource (#3201) 2020-09-30 17:28:05 +03:00
Yair Morgenstern
e983be0325 Started converting specialists to by-json and by-name 2020-09-30 13:10:02 +03:00
Yair Morgenstern
f411089b8d Better improvement on tile checks 2020-09-30 11:06:51 +03:00
Yair Morgenstern
f50a757069 Unified "improvement on tile" checks 2020-09-30 10:51:22 +03:00
Federico Luongo
adaee7e7ab
City State quests (#3183) 
* City State quests

* Flag to log two civ ever been friends
* Utility functions in GameInfo
* Created Diplomacy Action for notifications
* Utility functions for map
* Can be specified a custom color for surroundWithCircle
* Translation placeholder utility
* Added Quest model
* Utility function: number of researched technologies

* Image atlas rebuilt

* Localization

* Updated DiplomaticFlags and added EverBeenFriends

Slightly reworked nextTurnFlags() for code clarity and introduced the new flag EverBeenFriends that is set as soon as two civilizations are at least friends. It never expires.

* Removed quests not implemented yet from json
 2020-09-29 23:26:50 +03:00
Yair Morgenstern
847abf31d1 3.10.13 2020-09-29 15:52:39 +03:00
uncivbot[bot]
81a1bcb6ed
Translations update (#3198) 
* Update Italian.properties (#3188)

* Update Italian.properties

* Update Italian.properties

* Update Italian.properties

* Update Italian.properties

* Update Czech.properties (#3193)

new parametrised strings
Babylonian, Egyptian, English cities finished
French diplomacy and cities
Russian diplomacy and cities

* Update Spanish.properties (#3195)

* Update Indonesian.properties (#3196)

* So many hungarian translations (#3197)

* So many hungarian translations

* Fixing placeholders

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: chriscr2 <70113017+chriscr2@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Krisztian Papp <30371056+pehsa@users.noreply.github.com>
 2020-09-29 15:45:32 +03:00
Yair Morgenstern
9b3dd5058f Better checking for unloadable scenarios 2020-09-29 14:15:00 +03:00
Yair Morgenstern
6662944f32 Resolved #3085 - reconquering our cities while they were still in resistance leads to them not having resistance against us 2020-09-29 11:48:21 +03:00
givehub99
56dbd5459e
"No Maintenance costs for improvements in []" generic unique. Compatibility for Incan unique without having to edit the nations.json file. (#3194) 2020-09-28 23:34:36 +03:00
Yair Morgenstern
30396239c1 Cannot open multiple gold selection popups in trade table 2020-09-28 23:06:46 +03:00
Yair Morgenstern
fa5d2b6f49 3.10.12 2020-09-26 21:25:58 +03:00
Yair Morgenstern
e1819eb748 Scenarios that can't be loaded not displayed to users 2020-09-26 21:24:54 +03:00
uncivbot[bot]
bfadf2943b
Translations update (#3187) 
* Update Italian.properties (#3174)

* Update Italian.properties

* Update Italian.properties

* Update Italian.properties

* Update Indonesian.properties (#3176)

* Update Dutch.properties (#3182)

Added extra translations for city states, starting new game, start screen and multiplayer

* Update Czech.properties (#3185)

new strings
diplomacy and cities - Akkad, England

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Yunichi <65927826+Yunichie@users.noreply.github.com>
Co-authored-by: knoeier0 <71691687+knoeier0@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
 2020-09-26 21:16:54 +03:00
HadeanLake
0f97c5eb59
parameterized few uniques, fixed "Mass Media" tech in mods (#3184) 
* parameterized "Culture cost of adopting new Policies reduced by [10]%" and "Each city founded increases culture cost of policies [33]% less than normal"

* removed old fix for abcense of "Mass Media" tech so mods can have this tech
 2020-09-26 20:59:22 +03:00
Yair Morgenstern
33270baea2 Resolved #3186 - Diplomacy overview displays war/peace status and not relationship level. 2020-09-26 20:40:51 +03:00
Yair Morgenstern
43bef4d88d Better trade cancellation when all cities are offered (also includes player-to-player cases, not only AI) 2020-09-25 15:33:12 +03:00
Yair Morgenstern
009c59b77c Fixed modded images not loading properly 2020-09-25 13:50:02 +03:00