mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-05 08:28:16 +07:00
Code Issues Packages Projects Releases Wiki Activity
5,856 Commits 6 Branches 1,048 Tags 1.1 GiB
2e43637144
Commit Graph

5856 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SomeTroglodyte
9499471986
Change defeat conditions (#4761) 
* Change defeat conditions

* Change defeat conditions - unit tests setup

* Change defeat conditions - patch1
 2021-08-05 18:12:30 +03:00
Xander Lenstra
9634f7045a
Replaced the last promotion effects with uniques (#4764) 2021-08-05 07:41:48 +03:00
Xander Lenstra
72eee5adf3
Removed $ signs from translatable strings (#4762) 2021-08-05 07:40:13 +03:00
Yair Morgenstern
000ef80c0f 3.16.0-patch1 2021-08-04 18:36:43 +03:00
Yair Morgenstern
bcf57f8562
Translations update (#4760) 
* Update Swedish.properties (#4759)

Translated the newly added lines.

* Update Indonesian.properties (#4754)

* Update Russian.properties (#4753)

* Update Spanish.properties (#4748)

* Update Spanish.properties

* Update Spanish.properties

* Update Italian.properties (#4745)

* Update Italian.properties

* Update Italian.properties

Co-authored-by: Alex25820 <50142558+Alex25820@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: sockybob <44141246+sockybob@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2021-08-04 18:12:31 +03:00
SomeTroglodyte
bed38f75e7
Allow civ-unique buildings to be created by startingEra (#4756) 2021-08-04 18:10:34 +03:00
ravignir
38a09096b4
MCO - Randomize Plains/Grasslands around deserts (#4746) 
- Deserts are a little bit more common (but now have higher chance of being stripes)
- Slightly reduced range of Tundra.
- Slightly reduced amount of Snow.
- Grasslands can now appear next to desert tiles and huge plains areas are much less likely.
 2021-08-04 14:10:23 +03:00
Xander Lenstra
2c428f8269
Bugfixes from unitTypes so promotions work again (#4744) 2021-08-04 13:55:12 +03:00
SomeTroglodyte
c1382477e0
Mod manager concurrency (#4750) 
* Mod manager concurrency

* Mod manager concurrency - tr
 2021-08-04 13:53:42 +03:00
Yair Morgenstern
a3c9214500 3.16.0 2021-08-03 22:41:10 +03:00
Xander Lenstra
4d3195ec5a
Added Diplomatic victory, United Nations, Globalization (#4619) 
* Added globalization tech

* Added united nations and backbone for diplomatic victory

* You can now vote with the united nations every 20 * gameSpeed turns, and the results will be displayed the turn after

* You can now win with diplomacy

* AI will now vote in the united nations

* Added the amount of turns till the next diplomatic vote in the diplomacy overview

* Added translatable strings

* Implemented most of the requested changes (rest coming soon)

* Implemented further requested changes
 2021-08-03 21:48:51 +03:00
Interdice
bb5392db4a
Ai now cares about city distances (#4680) 
* Ai now cares about distance from it's cities

* Ai now cares about distance from it's cities

* Ai now cares about distance from it's cities

* Ai will pay extra pay extra for bordering cities or surrounding cities

* Ai will pay extra pay extra for bordering cities or surrounding cities

* Ai will pay extra for cities that are closer to their territory

* The code is cleaner

* The code is cleaner

* The code is cleaner

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance
 2021-08-03 19:53:46 +03:00
Xander Lenstra
3b4b9a27bf
Split up unit types to its own JSON file (#4717) 
* Split off unitTypes to its own json, only containing the domain it can travel in for now

* Updated translationFileWriter to handle this file correctly

* Updated promotions file

* Implemented requested changes

* Units without a sprite use the sprite of a first unit with the same type

* Implemented proposed changes
 2021-08-03 19:06:59 +03:00
SomeTroglodyte
c33e7ae6d2
Civilopedia phase 9 - Technologies (#4737) 2021-08-03 09:36:58 +03:00
SomeTroglodyte
731aec0e65
Use stat characters in Civilopedia Unit/Building costs (#4736) 2021-08-03 09:24:31 +03:00
SomeTroglodyte
e8876e90bf
All stats available as text characters (#4734) 2021-08-02 23:35:58 +03:00
Yair Morgenstern
6370f0ac02 Solved super rare edge-case where units try to attack over hidden tiles that they can't actually move through 2021-08-02 23:26:14 +03:00
Yair Morgenstern
f773a547b3 Solved another teleportation concurrent modification exception 2021-08-02 23:17:28 +03:00
Yair Morgenstern
9ef02cb1b2 Civ no longer attempts to intercept his own nukes - #4629 2021-08-02 21:11:29 +03:00
Yair Morgenstern
775f42aa0d Resolved #4629 - atomic bomb interception works as intended 2021-08-02 21:07:08 +03:00
Yair Morgenstern
b62c56d175
Translations update (#4731) 
* Update Spanish.properties (#4730)

* Update Spanish.properties

* Update Spanish.properties

* Update Hungarian.Translate (#4729)

just the normal amount of translates

* Update Swedish.properties (#4726)

Translated the newly added lines.

* Update Indonesian.properties (#4722)

* Update Simplified_Chinese.properties (#4719)

* Update Italian.properties (#4716)

Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: JurDan775 <80947706+JurDan775@users.noreply.github.com>
Co-authored-by: Alex25820 <50142558+Alex25820@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: HoleHolo <80876542+HoleHolo@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2021-08-02 20:51:12 +03:00
SomeTroglodyte
a248a1178c
Deprecate Building.cannotBeBuiltWith (Solar/Nuclear Plant exclusion now as unique, auto-displays in Civilopedia) (#4732) 2021-08-02 20:50:56 +03:00
AdityaMH
4a434b3689
Improve Road & Railroad (again) (#4721) 2021-08-02 19:18:53 +03:00
lishaoxia1985
e993f507aa
Map size will modify policy cost, techUniques is initialized by UniqueMap(), Replace "effect" with "uniques" in UnitPromotions.json (#4507) 
* Map size will modify policy cost, techUniques is initialized by UniqueMap()

* Replace "effect" with "uniques" in UnitPromotions.json
 2021-08-02 19:17:26 +03:00
SomeTroglodyte
c9fa68f8ea
Privateer capture, plunder, and raze Notifications (#4698) 
* Privateer capture, plunder, and raze Notifications

* Privateer capture, plunder, and raze Notifications - patch1

* Privateer capture, plunder, and raze Notifications - patch2
 2021-08-02 19:14:31 +03:00
SomeTroglodyte
7d52cfbcab
Harden map editor map loader against most bad maps (#4711) 
* Harden map editor map loader against most bad maps

* Harden map editor map loader against most bad maps - patch1
 2021-08-02 19:03:16 +03:00
Miraç
5511c80eb5
remove distribution from roadmap (#4723) 2021-08-02 19:02:31 +03:00
SomeTroglodyte
e7bf1fad7c
Tweak UncivSlider and make the one on NewGameScreen permanently show the value tip (#4728) 2021-08-02 19:01:08 +03:00
Yair Morgenstern
1ac10813bc 3.15.18 2021-08-01 22:19:57 +03:00
Yair Morgenstern
f3c0c5d202
Translations update (#4714) 
* Turkish Translations (#4695)

* Turkish Translations

those translations are for 3.15.16, new lines could be added by then i dont know

* Update Turkish.properties

* Update Korean.properties (#4687)

* Update Russian.properties (#4684)

* Update Russian.properties

* Update Russian.properties

* Update Russian.properties

* Update Swedish.properties (#4683)

Translated the newly added lines.

* Update Italian.properties (#4681)

* Update Indonesian.properties (#4679)

* Fixed errors

Co-authored-by: Miraç <56484801+logicminimal@users.noreply.github.com>
Co-authored-by: Samsaek the Calico <saud2410@naver.com>
Co-authored-by: sockybob <44141246+sockybob@users.noreply.github.com>
Co-authored-by: Alex25820 <50142558+Alex25820@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
 2021-08-01 21:25:30 +03:00
Arthur van der Staaij
c4f584f98f
Updated some statements in the feature request issue template (#4715) 
Changed the feature request issue template to reflect the fact that
development is currently targeting G&K and to refer to #4697 in favor of
the deprecated #663.
 2021-08-01 20:40:02 +03:00
SomeTroglodyte
6c32d10924
TranslationFileWriter support for CivilopediaText (#4631) 
* TranslationFileWriter support for CivilopediaText

* Merge branch 'master' into TranslationWriter-Civtext - patch
 2021-08-01 20:23:13 +03:00
Xander Lenstra
78dddac962
Added modoptions unique for disabling city-state spawning with only a settler (#4691) 2021-08-01 19:21:04 +03:00
SomeTroglodyte
3cf9191d6a
Actually load and display the road texture found in FantasyHex (#4699) 
* Actually load and display the road texture found in FantasyHex

* Actually load and display the road texture found in FantasyHex - patch1
 2021-08-01 15:36:45 +03:00
Xander Lenstra
912a9dbb9d
Simplified a unique of petra (#4708) 2021-08-01 15:35:36 +03:00
Arthur van der Staaij
0c7dd9ada9
Fixed captured units not tp-ing out of illegal tiles (#4701) 
In particular, this fixes the bug where embarked units captured by a
civilization without optics would stay embarked. This therefore fixes
case 4 of #4237.

In principle, it should not even be possible that captured units can no
longer stand on the tile they were on, since the capturing unit has to
be able to move to it. However, in Unciv, it is possible to capture
units without moving to their tile. This is a different problem that
needs to be addressed some time in the future.
 2021-08-01 11:31:53 +03:00
AdityaMH
ff1a75bb13
Improve River for FantasyHex (#4704) 2021-08-01 11:30:18 +03:00
SomeTroglodyte
a427e645b9
Fix Civilopedia Unique auto-linking when Ruleset changes (#4700) 2021-08-01 11:29:02 +03:00
SomeTroglodyte
636b58d43c
Reduce atlas - The Huns was 4x larger than the other nations, and a dirty Hexagon dupe (#4689) 2021-07-31 23:56:55 +03:00
SomeTroglodyte
bb25f1fdb2
Better crude maps - zero uncovered tiles impossible (#4685) 2021-07-31 23:50:20 +03:00
Miraç
e68bc128ab
Fix Hagia Sophia and CN Tower not giving civ 5 bonuses (#4682) 
* Fix Hagia Sophia and CN Tower not giving civ 5 bonuses

i got the information about Hagia Sophia from @ravignir and CN Tower from civ wiki. i will also add faith to buildings that give faith in G&K but will do it as a commit, that so that it would be easily revertable if faith doesnt just get ignored when religion is disabled

* Create Buildings.json

* Delete Fix Hagia Sophia and CN Tower not giving the bonuses it gave in civ 5
 2021-07-31 23:49:31 +03:00
Xander Lenstra
5324eb96b5
Fixed bug where production from cutting down forests could apply to perpetual constructions (#4694) 2021-07-31 23:46:18 +03:00
Alex25820
96aad7b087
Update README.md with link to wiki guide (#4696) 
Added a guide on how to install Unciv on macOS to the wiki so I changed README.md to reflect that.
 2021-07-31 23:29:57 +03:00
Yair Morgenstern
3afe7af431 Solved crash where city states would try to gift great people without cities 2021-07-31 23:17:57 +03:00
Yair Morgenstern
692cbaa84a 3.15.17 2021-07-30 16:28:17 +03:00
JurDan775
a89d830391
Updated Hungarian Translates (#4677) 
some translates done, more soon!
 2021-07-30 15:55:29 +03:00
SomeTroglodyte
130c318ae0
Civilopedia phase 8 - Nations and Promotions (#4657) 
* Civilopedia phase 8 - Nations and Promotions

* Civilopedia phase 8 - Nations and Promotions - AS insubordination

* Civilopedia phase 8 - Nations and Promotions - OR template

* Civilopedia phase 8 - Nations and Promotions - proofread

* Civilopedia phase 8 - Nations and Promotions - revert OR
 2021-07-30 15:55:17 +03:00
Yair Morgenstern
4bcf821879 Resolved #4647 - influence-by-game-progress works as intended 2021-07-30 15:41:54 +03:00
Yair Morgenstern
3388c540d5 Resolved #4676 - one-city-challengers no longer get multiple settlers for later eras 2021-07-30 15:15:16 +03:00
Yair Morgenstern
71df35622f Resolved #4675 - Fertility Rates -> Fertility Rites 2021-07-30 15:08:32 +03:00