mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-19 16:57:38 +07:00
Code Issues Packages Projects Releases Wiki Activity
5,228 Commits 6 Branches 1,039 Tags 1.2 GiB
ab4441ad1f
Commit Graph

5228 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SomeTroglodyte
ab4441ad1f
Fix two sound credits (#4020) 2021-05-30 21:05:46 +03:00
SomeTroglodyte
a51978c960
Smaller mp3's for the new files from #4013 (#4019) 2021-05-30 18:53:13 +03:00
SomeTroglodyte
589ed4e423
Sound upgrade - enable BaseUnit.attackSound, a few extras (#4013) 2021-05-30 10:18:42 +03:00
Xander Lenstra
432e937474
Added the amphibious promotion and the marine unit (#3987) 
* Technology and construction bars no longer extend past their maximum

* Fixed compile errors

* actually fixed the issue

* Added the marine unit

* Moved amphibious promotion effect to unique

* Added icons for Amphibious promotion and Marine unit

* aaah
 2021-05-29 23:42:04 +03:00
SomeTroglodyte
97a36c3772
Spruced up Civilopedia - phase 2 - external links (#3981) 
* Spruced up Civilopedia - phase 2 - external links

* Spruced up Civilopedia - phase 2 - patch1

* Spruced up Civilopedia - phase 2 - patch2
 2021-05-28 17:41:03 +03:00
Yair Morgenstern
c45ecebb0c Yet more swedish 2021-05-28 15:07:57 +03:00
Yair Morgenstern
42be626679 Translations generation for Swedish 2021-05-28 15:06:34 +03:00
Yair Morgenstern
cc36dabde8 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-05-28 15:03:50 +03:00
Yair Morgenstern
d7c0cc593a 3.14.12 2021-05-28 15:02:11 +03:00
Yair Morgenstern
42a75ad9cf
Translations update (#4009) 
* Swedish translation (#4006)

* Create Swedish.properties

* Update Swedish.properties

* Update Swedish.properties

* Update Swedish.properties

* Update Swedish.properties

* Update Swedish.properties

* Update Swedish.properties

* Update German.properties (#4004)

* Update German.properties

* Update German.properties

* Update German.properties

* Update Italian.properties (#4001)

* Update Spanish.properties (#4000)

Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
 2021-05-28 14:56:00 +03:00
Yair Morgenstern
4df083197b City-states get all civs known by at least half of major civs, not 'by any civ' 2021-05-28 14:54:02 +03:00
Yair Morgenstern
d7941924be Better camera square 2021-05-28 14:53:21 +03:00
Yair Morgenstern
f238cb3f3c Renamed ConstructionsTable -> CityConstructionsTable 2021-05-28 14:39:09 +03:00
Yair Morgenstern
c90a79363d Added city strength label to city button 2021-05-28 14:34:24 +03:00
Yair Morgenstern
c7334a461f Added unit action icons on map units, so it'll be immediately visible what each unit is doing 2021-05-28 14:06:30 +03:00
SomeTroglodyte
cf2be25c73
Popup gets a KeyPressDispatcher (#3973) 
* Popup gets a KeyPressDispatcher

* Popup gets a KeyPressDispatcher - patch1
 2021-05-27 21:49:40 +03:00
SomeTroglodyte
5f523cb548
Improved location notifications (#3992) 
* Improved location notifications

* Improved location notifications - patch

* Improved location notifications - patch2

* Improved location notifications - patch3
 2021-05-26 23:31:00 +03:00
Yair Morgenstern
cd6ae3dc6d 3.14.11 2021-05-26 19:37:01 +03:00
Yair Morgenstern
58d526aad0
Translations update (#3993) 
* Update Simplified_Chinese.properties (#3984)

* Update Spanish.properties (#3980)

* Teutonic Translations (#3978)

* Teutonic Translations

* Teutonic Translations patch1

* Update Italian.properties (#3972)

Co-authored-by: HoleHolo <80876542+HoleHolo@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2021-05-26 19:07:00 +03:00
ravignir
2feefeb4af
Changes to terrain combat bonuses (#3990) 
as in civ5, all base terrain have no penalty/bonuses, mountain has +25%.
 2021-05-24 20:44:53 +03:00
SomeTroglodyte
05c9813ac9
Make ImprovementPickerScreen "Pick Now" easier to hit (#3989) 2021-05-24 19:48:53 +03:00
SomeTroglodyte
8d4d05e235
Two missing translation templates (#3988) 2021-05-24 08:58:27 +03:00
SomeTroglodyte
f86a3fa47b
Spruced up Civilopedia - phase 1 - linking and category Enum (#3975) 2021-05-21 15:19:18 +03:00
Yair Morgenstern
3801a81bf4 AI much less motivated to attack city-states 2021-05-21 13:49:33 +03:00
Yair Morgenstern
e95a62126d Better peace agreement evaluations, for when there is no great power imbalance between nations 2021-05-21 13:46:44 +03:00
Yair Morgenstern
b4f588e70f Minimap slider has better values to accommodate screen sizes 2021-05-21 13:41:58 +03:00
Yair Morgenstern
7e827aebd3 Doubled ancient ruins spawn rate 2021-05-21 13:35:07 +03:00
Yair Morgenstern
502a2d57a3 Filtered out some building uniques that were activating for every city when they should have been only for the city the building was built in 2021-05-21 13:34:04 +03:00
Yair Morgenstern
eac2055b3e Better icons! 2021-05-21 12:28:56 +03:00
Yair Morgenstern
e547479c92 Added unit icons in unit overview screen 2021-05-21 12:17:22 +03:00
Yair Morgenstern
fd5125904a 3.14.10 2021-05-20 22:49:40 +03:00
Yair Morgenstern
9fd80122e0
Translations update (#3969) 
* Update Turkish.properties (#3964)

* Update Spanish.properties (#3963)

* Update Indonesian.properties (#3960)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Italian.properties (#3956)

* Update Spanish.properties (#3970)

* Fix spaceship part production boosts (#3953)

Previously, the buildings and wonders that should boost spaceship part
production (Forge, Spaceship Factory and Hubble Space Telescope) would
not provide this boost (#3952). This commit fixes the issue.

The problem was caused by the fact that the spaceship part-boosting
uniques would only boost spaceship part UNITS while spaceship parts are
currently buildings.

The added comments serve as a reminder to change the uniques if
spaceship parts are ever changed into units.

* Update Spanish.properties

I had to reopen a new pull request due to conflicts the other had.

Co-authored-by: Arthur van der Staaij <32672293+avdstaaij@users.noreply.github.com>

Co-authored-by: Nazım Gediz Aydındoğmuş <nga@hotmail.com.tr>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: chriscr2 <70113017+chriscr2@users.noreply.github.com>
Co-authored-by: Arthur van der Staaij <32672293+avdstaaij@users.noreply.github.com>
 2021-05-20 22:22:09 +03:00
SomeTroglodyte
7c7d4181cc
Fix custom map sizes - saves match, size obeyed, limit UI (#3965) 
* Fix custom map sizes - Revive Enum MapSize and fix tech modifier for custom maps

* Fix custom map sizes - Fix saved size not matching tileset, obey custom size

* Fix custom map sizes - limiting custom size and UI

* Fix custom map sizes - linting and reduce warnings

* Fix custom map sizes - less verbose

* Popup gets a KeyPressDispatcher - templates
 2021-05-20 22:17:07 +03:00
Yair Morgenstern
f07c63c07f Unified "progress bars can't go beyond 100%" 2021-05-20 22:13:58 +03:00
Arthur van der Staaij
1f2dbb9a4e
Fix spaceship part production boosts (#3953) 
Previously, the buildings and wonders that should boost spaceship part
production (Forge, Spaceship Factory and Hubble Space Telescope) would
not provide this boost (#3952). This commit fixes the issue.

The problem was caused by the fact that the spaceship part-boosting
uniques would only boost spaceship part UNITS while spaceship parts are
currently buildings.

The added comments serve as a reminder to change the uniques if
spaceship parts are ever changed into units.
 2021-05-20 18:19:33 +03:00
SomeTroglodyte
b9aeb03e1b
Correction to deprecation Version number?... (#3968) 
... in MapParameters.size: The commit adding the annotation is 9 commits below the 3.14.7 commit. Sorry I didn't include this earlier!. I *did* notice then went on for the rest of the little PR with a little nagging feeling ...
 2021-05-20 12:34:05 +03:00
Duan Tao
3d062e3424
Add guided missile which acts differently from nuclear missile. (#3957) 
* Add guided missile which acts differently from nuclear missile.

* Clean png.
 2021-05-20 12:33:39 +03:00
Yair Morgenstern
11c8a67596 Merge branch 'temp' 2021-05-20 00:54:39 +03:00
Yair Morgenstern
984293c252 3.14.9-patch1 
Apparently Float.min doesn't work on older versions of Java. Appears here: https://docs.oracle.com/javase/8/docs/api/java/lang/Float.html but not here: https://docs.oracle.com/javase/7/docs/api/java/lang/Float.html  Hate you, Java. Why do you insist on not being Kotlin.
 2021-05-20 00:46:39 +03:00
SomeTroglodyte
591087ec25
KeyPressManager now manages listener (and cityscreen usage) (#3966) 
* KeyPressManager now manages listener (and cityscreen usage)

* KeyPressManager now manages listener - patch 1
 2021-05-20 00:25:31 +03:00
SomeTroglodyte
3e3bda42e5
Follow screen rotation even to Portrait on Android with Opt-in (#3936) 2021-05-19 23:27:23 +03:00
SomeTroglodyte
929c357663
Commenting extension functions and resolve to-do (#3932) 
* Commenting extension functions and resolve to-do

* Better readability in PromotionPickerScreen enable
 2021-05-18 13:14:56 +03:00
Yair Morgenstern
106cbb79c3 3.14.9 2021-05-18 01:07:17 +03:00
Yair Morgenstern
e57e7fb7d5
Translations update (#3950) 
* Update Indonesian.properties (#3947)

* Update Russian.properties (Full Translation) (#3945)

* Update Russian.properties

* Update Russian.properties

* Update Russian.properties

case fix

* Update Russian.properties

* Update Russian.properties

* Update Russian.properties

* Update Simplified_Chinese translate (#3940)

* Update Simplified_Chinese.properties

* fix case problem

* Update Spanish.properties (#3924)

* Update German.properties (#3919)

* Update German.properties

* Update German.properties

* Update Italian.properties (#3917)

* Update Spanish.properties (#3928)

Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Maksim Klimenko <77161824+Maks-gaming@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Chris <70113017+chriscr2@users.noreply.github.com>
 2021-05-17 23:47:00 +03:00
SomeTroglodyte
7b822643d9
Fix Ctrl-S going to save game screen will not stop scrolling the map (#3949) 
* Fix Ctrl-S going to save game screen will not stop scrolling the map

* Just trying to force github to retry its build checks
 2021-05-17 22:14:49 +03:00
SomeTroglodyte
fc7859e4e7
Options screen cleanup (#3934) 
* Options popup linting and minor visual improvements

* Options popup - mod checker - missing test?
 2021-05-16 16:43:57 +03:00
Xander Lenstra
7b0ea32c47
Technology and construction bars no longer extend past their maximum (#3930) 
* Technology and construction bars no longer extend past their maximum

* Fixed compile errors

* actually fixed the issue
 2021-05-16 15:42:19 +03:00
SomeTroglodyte
abaa678e2b
Split off stuff from CameraStageBaseScreen that isn't the class itself (#3929) 2021-05-14 11:23:33 +03:00
Yair Morgenstern
d546b2b00e Caught exception when map fails to load 2021-05-13 21:43:42 +03:00
SomeTroglodyte
d92e9a1dc7
Minimap resizeable and scroll position indicator redone (#3922) 2021-05-13 20:32:45 +03:00