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

486 Commits

Author SHA1 Message Date
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
alexban011
0b51fcdb92
docs: added documentation for running detekt (#9443) 
* docs: added documentation for running detekt

* docs: added note for windows users
 2023-05-23 23:15:24 +03:00
SomeTroglodyte
5f60c887f7
Next-Turn Progressbar (#9409) 
* Next-Turn Progressbar

* Next-Turn Progressbar - doc

* NextTurnProgress: Rethink max on first turn
 2023-05-22 17:59:28 +03:00
Yair Morgenstern
280025fa10 Resolved #9416 - failure to get preview image no longer causes crash 2023-05-21 12:35:57 +03:00
SomeTroglodyte
1de866c7ed
Local and/or jpg mod previews (#9394) 
* Allow mod preview image to be a jpg

* Allow preview images from WIP mods lacking github url

* Wiki preview.jpg

* Allow mod preview image to be a jpg - review
 2023-05-16 13:00:44 +03:00
Yair Morgenstern
5bbd8bce53 Allow mods to contain a "preview.png" file for visual indication 2023-05-14 14:36:46 +03:00
Skekdog
a3ef6fa314
Add May not annex cities unique (#9314) 
* Add `May not annex cities` unique, following same behaviour as Civ5 Venice. Hopefully this time I won't need to re-install windows.

* Add `May not annex cities` unique, following same behaviour as Civ5 Venice. Hopefully this time I won't need to re-install windows.

* Fix raze button being unavailable in city screen

* Fixed raze button being available in city screen, as per civ5

* Corrected indentation

* mayAnnex instead of canAnnex, hasUnique rather than getMatchingUniques

* AI will follow rules

* Replaced getMatchingUniques with hasUnique, for real this time
 2023-05-09 23:02:19 +03:00
vermontbail
bd3081f276
Changes to landing page FIXED (#9337) 
* Updated Building-Locally.md

While the underlying steps haven't changed, some of the options now have slightly different names in Android studio.

* Update index.md

* Revert "Updated Building-Locally.md"

This reverts commit e3772dad78.

* Revert "Revert "Updated Building-Locally.md""

This reverts commit e1f5960a2e.

* Update Building-Locally.md
 2023-05-07 08:09:14 +03:00
Yair Morgenstern
0b0a400f65 docs: Closer cropped icon for better viewing 2023-04-25 18:19:30 +03:00
Yair Morgenstern
c2ae308622 Custom icons for mkdocs 2023-04-25 18:10:15 +03:00
Yair Morgenstern
cb626861df docs: better unique parameter documentation 2023-04-25 17:45:40 +03:00
Yair Morgenstern
079c237547 terrainFilter now accommodates nationFilter for owner 2023-04-25 17:45:40 +03:00
Yair Morgenstern
95ee35d301 Testing: Damage animations on damaged units 2023-04-24 17:07:55 +03:00
caffidev
4dc6d50cde
fix: fix a typo in Civilization-related-JSON-files.md (#9225) 2023-04-19 19:35:41 +03:00
SomeTroglodyte
8f7db469b9
Little documentation cleanup (#9226) 2023-04-19 19:33:34 +03:00
Yair Morgenstern
32191bd57d 4.6.4 2023-04-19 11:52:57 +03:00
Yair Morgenstern
4d63f0542f Avoid font-related crash 2023-04-19 11:26:11 +03:00
Yair Morgenstern
2f25ed3053 Replaced hardcoded embarked sight with configurable 
"Normal vision when embarked" replaced by "[+1] Sight <for [Embarked] units>"
 2023-04-19 11:12:21 +03:00
Yair Morgenstern
ab1d823477 4.6.2 2023-04-16 15:01:43 +03:00
Yair Morgenstern
28f5043fcb 4.6.1 2023-04-13 16:26:43 +03:00
SomeTroglodyte
e0533e994f
Fix startBias regional assignments (#9171) 2023-04-13 15:38:19 +03:00
SomeTroglodyte
0500f73770
Victory screen and victory detection use VictoryData (#9175) 
* VictoryScreen uses VictoryData

* Victory detection no longer circumvents VictoryData
 2023-04-13 11:54:11 +03:00
Yair Morgenstern
a363edaa6a 4.6.0 2023-04-09 18:15:53 +03:00
Yair Morgenstern
adb51d9264
Resource stockpiles! (#9147) 
* Resource stockpiles!

* toString extension including sign (+/-)

* Trigger uniques to provide/consume stockpiled resources

* Fixed build

* Display 'per turn' for stockpiled resources that are consumed per turn

* "Costs [amount] [resource]" works!

* Stockpile unique costs are displayed in construction button

* Added unique to prevert certain resources from being traded
 2023-04-09 18:01:26 +03:00
itanasi
892a1bc4cc
Attempt to re-add screenshots to help new Android Studio setups. Check if rendering properly (#9144) 2023-04-09 08:35:48 +03:00
vermontbail
06ce25d87e
Updated Building-Locally.md (#9141) 
While the underlying steps haven't changed, some of the options now have slightly different names in Android studio.
 2023-04-09 01:47:17 +03:00
Yair Morgenstern
711655c786 Better wrapping for long construction item names 2023-04-09 01:20:17 +03:00
Yair Morgenstern
0d9cff0922 "<for [nationFilter]>" conditional added 2023-04-08 22:46:49 +03:00
Yair Morgenstern
243efa3988 chore: inspection performance improvements 2023-04-08 22:03:22 +03:00
SomeTroglodyte
6b084f0e6b
Victory screen score charts (#9121) 
* VictoryScreen with Charts by WhoIsJohannes

* VictoryScreen with Charts by WhoIsJohannes - atlas

* VictoryScreen with Charts by WhoIsJohannes - lost icon attribution
 2023-04-08 21:38:27 +03:00
Yair Morgenstern
cb20d91822 Battle table displays bonuses according to tile that unit will attack from, not the current tile it's on 2023-04-08 21:34:55 +03:00
SomeTroglodyte
ca06d7e54a
Main menu background map changes infrequently (#9133) 2023-04-07 16:22:46 +03:00
SomeTroglodyte
36667d9d18
Random Nations game starter - reactive UI (#9127) 
* Random Nations game starter - reactive UI

* Random Nations game starter - reactive UI continued

* Random Nations game starter - reactive UI - patch
 2023-04-07 09:53:04 +03:00
SomeTroglodyte
a4c4c5f93e
Music player controls (#9087) 
* Music controls cleanup

* Music controls cleanup - assets

* Music controls cleanup - fix incorrect attribution
 2023-04-01 22:06:46 +03:00
SomeTroglodyte
45d66f0580
Civilopedia Welcome, moddable (#8940) 2023-03-31 14:58:07 +03:00
Yair Morgenstern
837833e450 4.5.13 2023-03-26 21:55:23 +03:00
SomeTroglodyte
09cff6e55f
TechPickerScreen colors - skinnable and prettier Future Tech (#9033) 2023-03-25 21:34:49 +03:00
letstalkaboutdune
60a0a856ab
Add AbsoluteUnits license info (#9034) 2023-03-25 21:32:02 +03:00
Yair Morgenstern
4c694be94b 4.5.11 2023-03-21 14:51:53 +02:00
Yair Morgenstern
e5452f5605 modding: 'Only available when' applies to beliefs 2023-03-20 22:19:00 +02:00
Yair Morgenstern
f66076c2a4 4.5.10 2023-03-19 19:00:26 +02:00
Yair Morgenstern
20e1b9b978 Tilesets: Separated unexplored tiles from not visible tiles 2023-03-17 12:06:15 +02:00
Yair Morgenstern
f89765354a Resolved #8901 - Modding: Units from triggers respect "limited to [amount] per civilization" limits 2023-03-15 19:19:35 +02:00
SomeTroglodyte
db08c30363
Make City center minimum tile yields moddable (#8804) 
* Slight cleanup of TileStatFunctions

* Make City center minimum tile yields moddable

* Make City center minimum tile yields moddable - patch1

* Make City center minimum tile yields moddable - patch1
 2023-03-13 17:02:08 +02:00
Yair Morgenstern
cd8b68253b All units can be automated 
Modders can choose which units get it as a primary action
 2023-03-13 16:55:50 +02:00
Yair Morgenstern
22da4b29c8 4.5.6 2023-03-11 20:37:35 +02:00
SomeTroglodyte
793d3387bf
Custom key bindings (#8802) 
* Configurable key bindings - linting

* Configurable key bindings - move keyboardAvailable

* Configurable key bindings - separate KeyShortcutDispatcher

* Configurable key bindings - framework

* Configurable key bindings - save and load

* Configurable key bindings - activation

* Configurable key bindings - UI

* Configurable key bindings - more linting

* Configurable key bindings - Separate SettingsSelect

* Configurable key bindings - translation tested

* Configurable key bindings - disclaimer

* Configurable key bindings - disclaimer
 2023-03-11 20:12:00 +02:00
Yair Morgenstern
d3c084f89f Added 'additional times' to limited actions 2023-03-05 20:03:54 +02:00
Yair Morgenstern
8c24926476 Modding: global alert available as triggerable for all objects 2023-03-05 12:53:02 +02:00
SomeTroglodyte
c40b6159df
Better Religion info and some moddability (#8807) 
* Make maximum number of religions moddable

* Explain remaining religion count in Empire Overview
 2023-03-04 19:20:23 +02:00
Yair Morgenstern
253c669ba9 Added 'after which this unit is consumed' for units whose only purpose is limited actions 2023-03-03 16:37:11 +02:00
Yair Morgenstern
608e0dfb71 Added limited usage for actions! 2023-03-03 14:47:50 +02:00
Yair Morgenstern
c3a4a18bba Replace unit action for timed golden ages with a generic triggered unique 
Triggered uniques display side effects
 2023-03-03 14:13:00 +02:00
Yair Morgenstern
06fa2c2378 Added 'for [amount] movement' unit action modifier 2023-03-02 21:02:34 +02:00
Yair Morgenstern
5e85c3ca72 "by consuming this unit" is better 2023-03-01 16:35:06 +02:00
Yair Morgenstern
ae501c3750 'create improvement' action, <consuming this unit> and <as an action> modifiers 2023-03-01 16:09:44 +02:00
Yair Morgenstern
66faeb0d15 Preparation for unit action modifiers 2023-03-01 15:26:54 +02:00
SomeTroglodyte
3d84297da1
Better control over debug messages (#8748) 
* Better control over debug messages

* Better control over debug messages
 2023-02-27 11:13:34 +02:00
Yair Morgenstern
44399e770c Added triggered uniques to grant specific tech / policy 2023-02-27 10:58:08 +02:00
Yair Morgenstern
8361d68452 Added 'upon ending turn in tile' unit trigger 2023-02-26 23:41:09 +02:00
Yair Morgenstern
86a63ac578 'upon conquering' is a condition not a triggered unique 2023-02-26 22:33:00 +02:00
Yair Morgenstern
c1df32b4e7 Add new uniques to wiki 2023-02-26 22:15:15 +02:00
Yair Morgenstern
090c421f9b Introduced "upon defeating [unitFilter] unit" trigger 2023-02-26 20:31:13 +02:00
Yair Morgenstern
ad9942c532 4.5.0 2023-02-25 21:03:52 +02:00
Leonard Günther
a3f511efd2
Added password authentication as server feature (#8716) 
* Added authenticate and setPassword

* Added AuthPopup

* Added auth endpoint to UncivServer

* Fixed merge confict

* Added close button to AuthPopup

+ Fixed crash if no server is available

* Added entries to template properties

* Fixed setting password does not work

if authentication is required

+ Added server check on game startup in case the server has changed its feature set

* Added support for different passwords

on different servers

+ Cleanup for MultiplayerTab

* Added current password as hint

+ removed character hiding in auth popup
+ added popup to indicate auth success on connection check
 2023-02-25 20:42:36 +02:00
SomeTroglodyte
5d80f50d93
Show UnitTypes in Civilopedia (#8729) 
* Show UnitTypes in Civilopedia

* Show UnitTypes in Civilopedia - polish
 2023-02-25 20:40:59 +02:00
Yair Morgenstern
3278cbc904 4.4.19 2023-02-23 23:11:30 +02:00
SomeTroglodyte
5d07fd981b
Allow filters in the ModOptions "ToRemove" lists (#8730) 
* Allow "*" wildcard in the ModOptions "ToRemove" lists

* Allow filters in the ModOptions "ToRemove" lists
 2023-02-23 22:40:47 +02:00
vegeta1k95
a31e74dee2 Add "Custom Fonts" section to mod docs 2023-02-23 00:26:37 +01:00
Yair Morgenstern
06292bec64 Fix unique parameter type 2023-02-22 09:54:10 +02:00
Yair Morgenstern
7b1a5e296c modding: Added "upon gaining a [unitFilter] unit" trigger condition 2023-02-22 09:32:50 +02:00
Yair Morgenstern
a29e22f39b Added documentation for installing on mac with macport 2023-02-19 16:55:58 +02:00
Yair Morgenstern
c6b888e6ed Fix android build 2023-02-19 16:35:20 +02:00
vegeta1k95
a8a458ab48
Blockade mechanics (#8654) 
* Fix centering of unit HP bar

* Blockade mechanics: land tiles

* Blockade mechanics: water tiles

* Don't blockade water tile if it has friendly military unit

* Blockade mechanics: cities

* Added tile/city blockade tutorials. Added city blockade status icon.

---------

Co-authored-by: vegeta1k95 <vfylfhby>
 2023-02-14 22:13:25 +02:00
Yair Morgenstern
e156a08663 Removed docs section for translated images - see #8479 2023-01-31 23:16:21 +02:00
Yair Morgenstern
2e5d1bf591 Resolved #8435 - rivers remain visible after founding city 2023-01-22 19:33:27 +02:00
Yair Morgenstern
39e88d3a1a Added "upon discovering a Natural Wonder" trigger - @letstalkaboutdune 2023-01-22 19:05:17 +02:00
Yair Morgenstern
4beaaadfc8 Added conditionals for above and below resource amounts 2023-01-21 23:36:53 +02:00
Yair Morgenstern
be161d8839 Better docs for Trigger Conditions 2023-01-16 23:13:08 +02:00
Yair Morgenstern
509d179d19 War -> war with major civ 2023-01-16 23:11:17 +02:00
Yair Morgenstern
a045114dc6 Added trigger conditional for entering era 2023-01-16 22:28:42 +02:00
Yair Morgenstern
f89c2330aa Conditional triggers now work with timed uniques 2023-01-16 22:03:17 +02:00
Yair Morgenstern
358f01079c Added 'upon adopting policy' trigger 2023-01-16 21:20:14 +02:00
Yair Morgenstern
2593c35e30 Added 'upon declaring war' trigger 2023-01-16 21:13:40 +02:00
Yair Morgenstern
cbd7f7ac5c Added trigger conditions framework! 2023-01-16 21:05:59 +02:00
Yair Morgenstern
f6ddd71504 RTL language support in very first paragraph of translation docs, so as not to waste people's time 2023-01-16 15:32:40 +02:00
Yair Morgenstern
879a5b230f Resolved #8387 - Fixed Reliquary belief 
Got rid of multiple uniques with the same text
 2023-01-16 13:05:11 +02:00
Yair Morgenstern
fe1d258c05 4.4.1 2023-01-15 23:43:28 +02:00
Yair Morgenstern
b5281e20c9 4.4.0 2023-01-14 21:27:11 +02:00
itanasi
22f9936a34
Add Transform Action for mods (#8120) 
* Initial version of code

* Enable cost=0 for buttons

* Add Conditional to Transform

* Fix translation file

* Add icon
Allow other Conditionals

* Updated icon

* Add credit

* switch hotkey

* Fix icon

* Remove Conditional Costs

* Remove vestigal Stats costs for Transform

* Minor cleanup
 2023-01-14 20:43:48 +02:00
vegeta1k95
0006aaef55
Modding: allow custom ResourcePortraits (#8330) 
* Modding: allow custom ResourcePortraits

* Modding: big generification of the icons/portraits mechanism

* Resolve conflict

* Fix background fallback, remove dimming of improvement icons

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2023-01-09 21:03:00 +02:00
Yair Morgenstern
37cfc12a64 4.3.18 2023-01-08 15:11:45 +02:00
vegeta1k95
4d8f056df7
Rework of PromotionPicker UI (#8325) 
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2023-01-08 11:45:51 +02:00
Yair Morgenstern
fe6c19532a UI: Better unit table 2023-01-07 22:12:31 +02:00
vegeta1k95
0301cc89d4
Modding: allow for custom TechPortraits (#8300) 
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2023-01-03 19:48:08 +02:00
Yair Morgenstern
d20f8a53f8 Validate unique parameters for mods 2023-01-01 15:55:41 +02:00
letstalkaboutdune
5b2997df46
Added credits for trailer (#8278) 
* Added credits for trailer

* Corrected typo
 2022-12-31 20:05:41 +02:00
letstalkaboutdune
b5a021cc16
SFX Update - Arrow, Crossbow (New), Metal Hit (#8262) 
* Arrow, Crossbow, Metal Hit sound updates

Sourced from pixabay.com
https://pixabay.com/service/license/

* Update Credits.md
 2022-12-29 23:20:33 +02:00
vegeta1k95
a751c8e3dc
Fixed TechButton progress-bar padding, less rounded corners for buttons. (#8260) 
* Fixed TechButton progress-bar padding, less rounded corners for buttons.

* Removed extra padding on the right

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2022-12-29 13:52:52 +02:00
vegeta1k95
8fd561de50
Added WLTKD status icon (#8257) 
* Added WTLKD status icon

* Credits

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2022-12-29 13:52:35 +02:00