mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-25 22:59:12 +07:00
Code Issues Packages Projects Releases Wiki Activity
4,922 Commits 6 Branches 1,040 Tags 1.2 GiB
63b8ba2e61
Commit Graph

4922 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
apk
63b8ba2e61 NotificationsScroll: Made notifications dark blue with white text. 2021-03-10 17:29:46 -05:00
apk
d970632b20 UnitTable.kt modifications to place cancel, previous idle unit and next idle unit below unit information 
This was made in order to prevent previous idle unit and next idle unit keys' positions to change depending on how big the unit info box is.
 2021-03-10 12:04:08 -05:00
71walceli
93fca672a5 Completed Spanish translations 2021-03-10 07:52:39 -05:00
GGGuenni
7d3e2a4e78
Adding world wrap support to map editor (#3667) 
* Adding world wrap support to MapEditor

* better readability
 2021-03-08 22:19:55 +02:00
Yair Morgenstern
4324fb5a7a 3.13.6-patch1 2021-03-08 22:11:09 +02:00
Yair Morgenstern
1682c8d371 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-03-08 22:10:16 +02:00
Yair Morgenstern
4c5d8645d6
Translations update (#3669) 
* Update Czech.properties (#3666)

Fixed some translations and deleted some unnecessary text.

* Update German.properties (#3664)

* Update German translations

* Update German translations

* Update German translations

* Update German.properties

* Update German.properties

* Update Turkish.properties (#3661)

* Update Turkish.properties

* Update Turkish.properties

* Update Turkish.properties

* update German.properties (#3660)

* Update Italian.properties (#3658)

* Update Indonesian.properties (#3657)

Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: mehmetkazim0 <69713944+mehmetkazim0@users.noreply.github.com>
Co-authored-by: Joni Arida <JoniArida@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-03-08 22:10:03 +02:00
Yair Morgenstern
87c9729e52 Resolved #3663 - fixed settler automation bug 2021-03-08 22:05:59 +02:00
Yair Morgenstern
7eab616352 Added titles to mod management screen 2021-03-07 17:49:53 +02:00
Yair Morgenstern
35ed8920e9 3.13.6 2021-03-07 13:04:11 +02:00
Yair Morgenstern
e2cf60d028
Translations update (#3656) 
* update German.properties (#3650)

* update German.properties

* Update German.properties

add missing placeholder

* Update Czech.properties (#3641)

india diplomacy and cities
new strings

Co-authored-by: Joni Arida <JoniArida@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
 2021-03-07 12:57:59 +02:00
Yair Morgenstern
011c1de102 Resolved #3635 - can remove natural wonders and roads/railroads in map editor 2021-03-07 11:41:09 +02:00
Yair Morgenstern
7ddcc58955 Can convert maps between different rulesets! 2021-03-07 10:02:19 +02:00
Yair Morgenstern
a654937ad3 ImageGetter.reload() is private, you should use ImageGetter.setRuleset() from outside 2021-03-07 10:01:51 +02:00
Yair Morgenstern
d15456baa8 Fixed hurry cost modifiers, and unit gold costs scaling according to game speed 2021-03-06 23:45:50 +02:00
Yair Morgenstern
43be37a3b8 Resolved #3651 - "Free great person" unique is compatible with techs even for Spectator 2021-03-06 23:10:48 +02:00
Yair Morgenstern
b9c6874a3f Removed deprecated "kotlin-android-extensions" reference 2021-03-06 23:02:13 +02:00
Yair Morgenstern
3bdff7dec3 Merge branch 'temp' 2021-03-06 22:30:46 +02:00
Yair Morgenstern
fd207d55c6 Game can handle resources "disappearing" between versions (esp. for mods) 2021-03-06 22:30:29 +02:00
Yair Morgenstern
de9ecbed59 We need the debug keystore to check the Android package locally 2021-03-06 21:44:37 +02:00
Yair Morgenstern
9cdba66fd5 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-03-06 20:52:00 +02:00
Yair Morgenstern
d8093eb282 Resolved #3653 - Settler AI no longer aims for 'really far' tiles 2021-03-06 20:51:00 +02:00
GGGuenni
d161e8393e
Fixed wrapped tiles costing way to much gold (#3648) 2021-03-06 19:49:59 +02:00
Yair Morgenstern
ee05bc28ec 3.13.5-patch1 2021-03-04 22:57:47 +02:00
lishaoxia1985
d290ca3d33
Update translation and Android studio to 4.1.2 (#3642) 2021-03-04 18:56:05 +02:00
GGGuenni
d3ae6d600c
World Wrap Fixes (#3644) 
* Citys Screen gets unwrapped now

When a city got build on the worlds edge the city screen displayed a non wrapped world

* Fixed CityBorder getting shifted

when city gets build on on the world's edge
 2021-03-04 18:54:39 +02:00
GGGuenni
0bf7c2e07e
Fixed rectangular maps center point (#3646) 2021-03-04 18:50:34 +02:00
Yair Morgenstern
eb47272d09 Tech info can display more than one revealed resource 2021-03-03 23:49:57 +02:00
Yair Morgenstern
87e0dedaf4 "Obsolete with [techName]" unique works with improvements 2021-03-03 23:49:31 +02:00
Yair Morgenstern
153f4f98d3 3.13.5 2021-03-03 23:48:22 +02:00
Yair Morgenstern
3d0cef7af2
Translations update (#3640) 
* German Translation (#3632)

* Translation

* missing !

* Update Italian.properties (#3630)

Co-authored-by: Joni Arida <JoniArida@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2021-03-03 22:47:08 +02:00
Yair Morgenstern
0f109e31a0 Resolved #3639 - City states that can't be connected by land no longer assign road connection quests 2021-03-03 22:43:07 +02:00
Yair Morgenstern
9e98fb5b59 Added World Wrap as a game setting, so bleeding edge users can test it 
Can now create maps as World Wrap maps and play with them :)
 2021-03-03 22:30:06 +02:00
GGGuenni
25db68fa2a
World wrap Part 2 (#3609) 
* Changed map generation for hex maps

* Adding WorldWrap UI

* Is now compileable again

* Changed map gen for rec maps

well that was easy

* Units can now move and see across wrap

* well this is smarter

* World wrap checkbox commented ou

should be available only after everything has been merged

* simplify WW gen conditions

* reduced indentation

* Refactoring for better readablity
 2021-03-03 12:54:49 +02:00
GGGuenni
9a7e637891
World Wrap Part 1 (#3604) 
* Adding fake infinite scroll functionality

* improve scroll jump

* really smooth jump now

* World wrap has functionality now

This is not compileable on its own!
Needs branches WorldWrap-v1 and WorldWrap-v2 to be mergeable

* Mirror tiles rendering

* changed to run v2-alternative code

* Use generic type

* default worldWrap to false

* forward continousScrollingX as parameter

* added unit movement button for mirror tiles

* Add clickable tile layer

* Smooth wrap jump

* code a bit better to read

* Removed unnecessary overrides and catches

* mirrorTiles are stored in one HashMap now

instead of two seperate ones
 2021-03-03 12:54:21 +02:00
lishaoxia1985
f65de81c21
Fix when Trade Gold = 0 it also shows in offer. (#3637) 2021-03-02 19:32:24 +02:00
Yair Morgenstern
639be3b01d 3.13.4 2021-03-01 21:05:53 +02:00
david.howard
12e3005294
[663] Allow unit rename on promote (#3620) 
* Add nullable "instanceName" field to MapUnit to capture name for individual units
* Add "displayName" property to MapUnit which takes instanceName if set, name
  otherwise
* Add dialog to PromotionPicker to allow setting instanceName of unit, if not
  already set
 2021-03-01 20:52:46 +02:00
Yair Morgenstern
237884a60d
Translations update (#3629) 
* Update Czech.properties (#3627)

few tutorial/civilopaedia texts

* Update French.properties (#3625)

* Update German.properties (#3624)

* Update Czech.properties (#3623)

* Update Italian.properties (#3621)

Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: Subcher <70058565+Subcher@users.noreply.github.com>
Co-authored-by: Johannes Schreiber <58529898+devbeutler@users.noreply.github.com>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2021-03-01 19:05:48 +02:00
Yair Morgenstern
a390df8b36 Merged save map functionality into load map screen - now map saving is more streamlined! 2021-02-28 23:56:09 +02:00
Yair Morgenstern
29360938c6 Added color to map buttons in map loading screen 2021-02-28 23:33:55 +02:00
Yair Morgenstern
be7fd4cb01 Resolved #3626 - can rename multiplayer games now. 
Also organized multiplayer screens better.
 2021-02-28 23:21:12 +02:00
Yair Morgenstern
97546a7499 Resolved #3622 - Can no longer try to send air units into unexplored tiles 2021-02-28 23:03:12 +02:00
Yair Morgenstern
7eeeee5212 Strength bonus from capital is now part of the Palace bonuses to make it moddable 2021-02-28 22:40:54 +02:00
Yair Morgenstern
32ca9884ce 3.13.3-patch2 
Multiplayer auto-load working again
 2021-02-28 00:10:05 +02:00
Yair Morgenstern
ed8d642036 3.13.3-patch1 2021-02-27 23:47:08 +02:00
Yair Morgenstern
d6e75c7ea2 Solved crash for badly defined mods like REKmod 2021-02-25 19:25:04 +02:00
Yair Morgenstern
bfea689261 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-02-25 19:21:53 +02:00
Yair Morgenstern
0a4b55e7b1 It seems that Github Actions have fully replaced Travis for this repo, so there's no need for the Travis-specific files anymore 2021-02-25 19:21:38 +02:00
Jack Rainy
ff05fa601d
Translations update (#3618) 
* Translations update

* Minor changes to the translation
 2021-02-25 19:01:58 +02:00