mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-09 23:07:35 +07:00
Code Issues Packages Projects Releases Wiki Activity
9,079 Commits 7 Branches 1,036 Tags 1.1 GiB
3c56319640
Commit Graph

3177 Commits

Author SHA1 Message Date
Yair Morgenstern
a1387bca29 4.7.7 2023-07-06 00:49:38 +03:00
Yair Morgenstern
d229d45298
Version rollout (#9755) 
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#9744)

* Update Italian.properties (#9737)

* Update Italian.properties

* Update Italian.properties

* Update French.properties (#9733)

* Updated Brazilian_Portuguese.properties (#9732)

* Update Dutch.properties (#9730)

* Update Dutch.properties

* Update Dutch.properties

* Update Dutch.properties

* Update Catalan.properties (#9728)

* Update German translation (#9723)

* Update Polish.properties (#9718)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: maxdu <d.darmax@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Lena Bullens <95299589+LenaBullens@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: mape6 <mape6@posteo.de>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
 2023-07-06 00:42:39 +03:00
SeventhM
5ea1d5722b
Fix buildings/units not triggering and golden age stat updates (#9731) 
* Fix buildings not triggering, golden age stat updates, and units not triggering

* Forgot import, whoops

* uodate resources and city connection when removing a building

* Move building triggers to function, added unit notification to translations

* Quick edits without android studio sucks

* Add unitActionModifier check back to hasTriggerConditional

---------

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2023-07-06 00:36:43 +03:00
Yair Morgenstern
19bf15558d Fixed India's 'double unhappiness' unique 2023-07-05 21:10:22 +03:00
Yair Morgenstern
f17d5a8d59 4.7.6 2023-07-02 15:20:38 +03:00
Yair Morgenstern
bfc2e3cd59
Version rollout (#9717) 
* Bump version and create initial changelog entry

* Various new lines added, some minor corrections. (Dutch.properties) (#9713)

* Various new lines added, some minor corrections.

* Minor correction in placeholder

* Update Spanish.properties (#9702)

* Updated Brazilian_Portuguese.properties (#9696)

* Update French.properties (#9692)

* Update Italian.properties (#9688)

* Update Italian.properties

* Update Italian.properties

* Update Simplified_Chinese.properties (#9687)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Polish.properties (#9686)

* Update Polish.properties

* Update Polish.properties

* Update Polish.properties

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Lena Bullens <95299589+LenaBullens@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
 2023-07-02 15:18:50 +03:00
Yair Morgenstern
947a1001c4 Resolves #9703 - AI only buys tiles contiguous to the current city tiles (was: contiguous to civ tiles) 2023-06-30 15:13:14 +03:00
Yair Morgenstern
1e75b44c23 4.7.5 2023-06-28 11:07:44 +03:00
Yair Morgenstern
f5d3f346b1
Version rollout (#9684) 
* Bump version and create initial changelog entry

* Update Spanish.properties (#9682)

* Updated Brazilian_Portuguese.properties (#9677)

* Updated Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update German translation (#9675)

* Update French.properties (#9674)

* Update Russian.properties (#9672)

* Update Russian.properties

* Update Russian.properties

* Update Italian.properties (#9670)

* Update Polish.properties (#9668)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: mape6 <mape6@posteo.de>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: JOGANfruit <77359522+JOGANfruit@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
 2023-06-28 11:05:23 +03:00
SomeTroglodyte
c45d3ecb7c
Promotion picker allowing picking chains in one go (#9655) 
* Try to allow chained promotion picking

* Reorg PromotionPickerScreen into own package

* Draft for new PromotionTree

* Change PromotionPickerScreen to use new tree (picking still not done)

* Finish new PromotionPickerScreen - code

* Finish new PromotionPickerScreen - assets and linting

* Finish new PromotionPickerScreen - polish positioning and lines

* Finish new PromotionPickerScreen - fix sound

* Finish new PromotionPickerScreen - little optimization

* Finish new PromotionPickerScreen - emphasize line along path

* Finish new PromotionPickerScreen - merge fix

* Finish new PromotionPickerScreen - address comments

* Finish new PromotionPickerScreen - fix sort and update wiki
 2023-06-28 10:49:35 +03:00
Yair Morgenstern
330fa6593b 4.7.4 2023-06-25 10:07:17 +03:00
Yair Morgenstern
14e1683db2
Version rollout (#9667) 
* Bump version and create initial changelog entry

* Ukrainian translations (#9663)

* Update French.properties (#9662)

* Update French.properties

* Fix wrong key

* Update Spanish.properties (#9652)

* Update Spanish.properties

* Update Spanish.properties

* Brazilian_Portuguese.properties (#9649)

* Update Italian.properties (#9647)

* Update Italian.properties

* Update Italian.properties

* Update German.properties (#9646)

* Update German.properties

* Fixed missing [spyname]

---------

Co-authored-by: Birk Birkner <birkner@bbirkner.de>

* Update Polish.properties + question (#9644)

* Update Polish.properties

* Update Polish.properties

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Knirps1 <52383078+Knirps1@users.noreply.github.com>
Co-authored-by: Birk Birkner <birkner@bbirkner.de>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
 2023-06-25 09:58:03 +03:00
SomeTroglodyte
1a6d8d72bb
Fix ruleset error crash (#9666) 
* Harden NewGameScreen against exceptions from getComplexRuleset

* Miscellaneous tweaks to NewGameScreen - e.g. allow it to show last used custom map
 2023-06-25 09:46:00 +03:00
Xander Lenstra
aa0fb9ed8b
More unit unique tests (#9639) 2023-06-25 09:35:31 +03:00
SeventhM
bc3f1341e1
Tech column validation and removing crashes from undefined building costs (#9664) 
* Add in tech column validation

* Negative Columns

* Forgot to add techColumns to the add and clear functiond

* Remove restrictive cokumn check

* bugfixing
 2023-06-25 09:34:23 +03:00
Yair Morgenstern
b6aa177311 4.7.3 2023-06-23 09:39:54 +03:00
Yair Morgenstern
970cb3cf3d
Version rollout (#9642) 
* Bump version and create initial changelog entry

* Update Traditional_Chinese.properties (#9634)

* Update Traditional_Chinese.properties

* Update Traditional_Chinese.properties

* Update Spanish.properties (#9628)

* Update French.properties (#9626)

* Update Italian.properties (#9624)

* Update German translation (#9623)

* Update Polish.properties (#9620)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Leslie Yu <32165704+leslieyu608@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: mape6 <mape6@posteo.de>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
 2023-06-23 09:08:38 +03:00
Xander Lenstra
47e93a86bf
Spies now occasionally steal technologies (#9629) 
* Spies now occasionally steal technologies

* Updated the UI so it doesn't show a turn counter when that cannot be provided

* Implemented changes discussed in reveiw comments

* Renamed variable

---------

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2023-06-23 08:51:34 +03:00
Xander Lenstra
3c1f0f7814
Spies in cities that are captured or destroyed now go to the hideout (#9632) 
* Spies in cities that are captured or destroyed now go home

* Turned spy flee reason string into enum
 2023-06-23 08:50:56 +03:00
SomeTroglodyte
ff54bcd493
Prevent mod conflicts better (#9586) 
* Tighten mod check severity and selectivity for unit-producing triggered Uniques

* Prettify display of mod check results by suppressing dupes and hiding conditionals from tr()

* Extra confirmation to play with errors, colors, improved handling of mod checkboxes

* Tweaks to improved mod checking in new game
 2023-06-19 19:02:09 +03:00
Yair Morgenstern
4107e081bd 4.7.2 2023-06-18 18:29:55 +03:00
Yair Morgenstern
4579e37848
Version rollout (#9618) 
* Bump version and create initial changelog entry

* Ukrainian translations :flag-ua: (#9615)

* update Simplified_Chinese (#9613)

* Updated Brazilian_Portuguese.properties (#9599)

* Update French.properties (#9597)

* Update Italian.properties (#9595)

* Update Italian.properties

* Update Italian.properties

* Update Polish.properties (#9594)

replaced symbols with polish letters

* Update Polish.properties (#9593)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: chr_56 <30681738+chr56@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
 2023-06-18 18:26:18 +03:00
Yair Morgenstern
670a08c0b9 4.7.1 2023-06-15 11:10:23 +03:00
Yair Morgenstern
11c6a88c68
Version rollout (#9592) 
* Bump version and create initial changelog entry

* Update Hungarian.properties (#9588)

* Update Spanish.properties (#9582)

* template.properties re-sort, one missing entry (#9581)

* Updated Brazilian_Portuguese.properties (#9578)

* Update French.properties (#9577)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: JurDan | Werewolf Cookie <80947706+JurDan775@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
 2023-06-15 10:59:39 +03:00
SomeTroglodyte
46a84c23b0
Make mod categories curated in Json (#9542) 
* Dynamic mod categories from online query

* Move Working string to Constants

* Move Mod categories to json

* Move Mod categories to json - UI

* Move Mod categories to json - initial json
 2023-06-14 09:12:24 +03:00
SomeTroglodyte
d666c44697
Keyboard bindings - collision check (#9580) 2023-06-13 07:31:02 +03:00
Yair Morgenstern
dc030bfbad 4.7.0 2023-06-12 19:25:40 +03:00
Yair Morgenstern
235fe86b72
Version rollout (#9573) 
* Bump version and create initial changelog entry

* Updated Brazilian_Portuguese.properties (#9572)

* Update Polish.properties (#9568)

* Update French.properties (#9567)

* Update Italian.properties (#9566)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2023-06-12 19:14:19 +03:00
SomeTroglodyte
404a148cfb
Key bindings - unit actions, world screen and grouped UI (#8986) 
* Keyboard Bindings: Simpler Widget

* Keyboard Bindings: Reset binding

* Keyboard Bindings: Simpler Widget - revert opening feature

* Keyboard Bindings Step 6: Unit Actions

* Keyboard Bindings Step 7: Grouped UI

* Keyboard Bindings Step 7: Grouped UI-TFW

* Keyboard Bindings Step 6: Unit Actions - patch

* Keyboard Bindings Step 9: World Screen

* Keyboard Bindings - German

* Keyboard Bindings: Fix merge errors

* Keyboard Bindings: Tiny forgotten things

* Merge fixes
 2023-06-12 10:13:57 +03:00
Yair Morgenstern
e669d1cd93 4.6.19 2023-06-11 12:59:59 +03:00
Yair Morgenstern
0d02100e51
Version rollout (#9565) 
* Bump version and create initial changelog entry

* Update Spanish.properties (#9530)

* Update Spanish.properties

* Update Spanish.properties

* Update Brazilian_Portuguese.properties (#9529)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
 2023-06-11 12:49:23 +03:00
SomeTroglodyte
7fb8bae251
Fix translated sorting (#9563) 
* Fix translated sorting

* Minor linting, missing pedia icon, missing tooltip template

* Wiki on icons for Beliefs
 2023-06-11 12:37:25 +03:00
Yair Morgenstern
5a652dc0d4
Version rollout (#9528) 
* Bump version and create initial changelog entry

* Update German translation (#9525)

* Update Japanese.properties (#9523)

* Update Japanese.properties

*Add new translations
*Fixed some translations

* Update Japanese.properties

*Add new translations
*Add Carthage city names
*Add translations for messages - Netherlands, Carthage
*Fix translations

* Update Japanese.properties

* Netherlands, Carthage message - revert translations to null

* Update Japanese.properties

*Fixed lack of praceholders

* Update Italian.properties (#9520)

* Update Polish.properties (#9517)

* Update French.properties (#9512)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: mape6 <mape6@posteo.de>
Co-authored-by: namazulake <130637228+namazulake@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
 2023-06-05 19:38:11 +03:00
SomeTroglodyte
13619d18a1
Upgraded music player popup (#9514) 
* Popups get the ability to scroll only the content without the buttons

* Centralize LoadingPopup

* Split non-WorldScreenMenuPopup classes off from that file

* Linting

* Nicer music playback dialog

* Translation templates
 2023-06-04 11:53:56 +03:00
SomeTroglodyte
1c830672ef
Fix translation templates / use as per #6131 (#9515) 2023-06-04 08:21:13 +03:00
Yair Morgenstern
a4fb6a1701 4.6.17 2023-06-03 23:04:24 +03:00
SomeTroglodyte
42b35bce4f
Allow image overlay and changing world wrap in map editor (#9493) 2023-06-03 22:43:35 +03:00
SomeTroglodyte
fcd309781d
Upgrading from Unit overview improved (#9485) 
* Unit upgrade tooltip in overview

* Unit upgrade tooltip in action table

* Unit upgrade tooltip in action table - colored Key

* Unit upgrade in Overview - reselect

* Fix merge problems and FormattedLine color markup ability

* Relax MarkupRenderer.render lines parameter type

* Skin has a getColor shortcut - use it

* Unit overview upgrade icons now open a menu instead of upgrading immediately

* Unit Overview upgrade - "Mid" buttons

* Unit Overview upgrade - reorg
 2023-05-31 18:41:57 +03:00
Yair Morgenstern
ebf6189c1c 4.6.16 2023-05-31 15:08:13 +03:00
Yair Morgenstern
90da09e924
Version rollout (#9491) 
* Bump version and create initial changelog entry

* Update German translation (#9489)

* Update Polish.properties (#9480)

* Update Polish.properties

* Update Polish.properties

* Update French.properties (#9479)

* Update Japanese.properties (#9478)

* Update Japanese.properties
Testament of Faith

* Update Japanese.properties
Enhancer of Faith

* Update Japanese.properties
Religions

* Update Japanese.properties
some Faith Description

* Update Japanese.properties
add Faith Description

* Update Japanese.properties
delete comment

* Update Spanish.properties (#9474)

* Updated Brazilian_Portuguese.properties (#9473)

* Update Italian.properties (#9470)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: mape6 <mape6@posteo.de>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: undo <3245867+undoroid@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2023-05-31 14:58:28 +03:00
Yair Morgenstern
c6942875bc 4.6.15 2023-05-28 09:05:34 +03:00
Yair Morgenstern
ae4719c552
Version rollout (#9469) 
* Bump version and create initial changelog entry

* Update Polish.properties (#9465)

* Update Polish.properties

* Update Polish.properties

* Update Polish.properties

* Update Italian.properties (#9464)

* Update Italian.properties

* Update Italian.properties

* [Translation] Update Simplified Chinese translation (#9452)

* update Simplified Chinese

* update Simplified Chinese

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: chr_56 <30681738+chr56@users.noreply.github.com>
 2023-05-28 09:00:01 +03:00
SomeTroglodyte
ef193babee
Map editor update - concurrency, resource amounts, file double-click (#9461) 2023-05-27 21:44:23 +03:00
Yair Morgenstern
b94321f535 4.6.14 2023-05-23 20:37:51 +03:00
Yair Morgenstern
5857301732
Version rollout (#9440) 
* Bump version and create initial changelog entry

* Update German translation (#9437)

* Update Spanish.properties (#9434)

* Update Brazilian_Portuguese.properties (#9433)

* Update French.properties (#9426)

* Update Italian.properties (#9422)

* Update Japanese.properties (#9346)

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

*Add translations
*Add city names

* Update Japanese.properties

*Add new translations
*Fixed some translations regarding tile improvements that I have translated previously

* Update Japanese.properties

*Add translation for City-Nations messages, ruin-regarding messages, and more.

* Update Japanese.properties

Add translations for 
*Sweden, Austria, and some city-states
*Multiplayer Game notifications
*Tile Improvements
*Civilopedia explanations

* Update Japanese.properties

Add translations for
*Religion beliefs
*Civilopedia descriptions
*Victory status
*and more

* Update Japanese.properties

* Edit details

* Update Japanese.properties

*add new branches

* Update Japanese.properties

Fix wrong placeholders

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: mape6 <mape6@posteo.de>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: namazulake <130637228+namazulake@users.noreply.github.com>
 2023-05-23 20:33:10 +03:00
Yair Morgenstern
95ffbd6a6e 4.6.13 2023-05-21 14:16:50 +03:00
Yair Morgenstern
9c2a9975a6
Version rollout (#9418) 
* Bump version and create initial changelog entry

* Update Greek.properties (#9407)

* Update Spanish.properties (#9397)

* Update Indonesian.properties (#9393)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: marek06072 <133993044+marek06072@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: t <73392607+tsaqibfs@users.noreply.github.com>
 2023-05-21 14:08:49 +03:00
alexban011
54f651c2fb
fix: fixed translation text (#9404) 
* fix: fixed translation text

* fix: fixed Romanian.properties
 2023-05-18 18:30:17 +03:00
Yair Morgenstern
4a7f65f281 4.6.12 2023-05-14 22:03:40 +03:00
Yair Morgenstern
3879f18288
Version rollout (#9388) 
* Bump version and create initial changelog entry

* Update Italian.properties (#9381)

* Update Italian.properties

* Update Italian.properties

* Update French.properties (#9378)

* Update Polish.properties (#9377)

* Updated Brazilian_Portuguese.properties (#9376)

* Update German translation (#9373)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: mape6 <mape6@posteo.de>
 2023-05-14 21:55:54 +03:00