wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3937 commits 7 branches 304 tags 288 MiB
Commit graph

3937 commits

This branch
This branch
All branches
Author SHA1 Message Date
Duan Tao
b2d0a10f0e Fix oil generation in sea. 2020-06-20 23:04:06 +03:00
Duan Tao
3150c1783c Fix forest display in Default tileset. 2020-06-20 22:57:10 +03:00
Yair Morgenstern
288e6877ba 3.9.4 2020-06-17 20:05:55 +03:00
uncivbot[bot]
ac59584caf
Translations update (#2738) 
* Update Japanese.properties (#2731)

* Minor update Russian.properties (#2737)

* Update Indonesian.properties (#2734)

Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: Bada <64350251+BadaTheBada@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
 2020-06-17 20:01:52 +03:00
Yair Morgenstern
1b73aab856 Opening the New Game screen from within a game saves the previous game parameters, map generation parameters work again 
@alkorolyov
 2020-06-17 19:56:20 +03:00
Yair Morgenstern
604a41ca6c Merge branch 'master' of https://github.com/yairm210/Unciv 2020-06-16 20:35:47 +03:00
Yair Morgenstern
4e0d819d01 Resolved #2662 - left side of the screen no longer becomes unresponsive to player input after changing from a selected unit to a selected city 2020-06-16 20:35:29 +03:00
Alexander Korolyov
62b7138580
Fix error during saving scenario when empty name. (#2732) 
* Fix error during saving scenario when empty name.
Safe saving and check for empty name.

* New Screen instead of popup for Game Parameters, during editing/creating scenario.

* Now game parameters information is correctly loaded with scenario.
 2020-06-16 20:26:03 +03:00
Yair Morgenstern
6900e28671 Resolved #2735 - Diplomatic "Friends with friend/enemy" modifiers are recalculated every turn 2020-06-16 20:24:11 +03:00
Yair Morgenstern
ac0c874061 Great improvements are marked as such in the Civilopedia 2020-06-15 20:20:48 +03:00
Alexander Korolyov
9547b82054
Continue work on Scenario functionality (#2726) 
* Hide all scenarios functionality behind switch in Unciv class.

* Refactoring:
1) abstract class changed to interface
2) rulset added to GameSetupInfo class

Fixed screen bug during map editing

* Added Load/Edit/Delete buttons for scenario functionality.

* Hide recently added scenario buttons behind debugSwitch.
 2020-06-15 20:12:29 +03:00
Yair Morgenstern
46dd66d343 3.9.3 2020-06-14 23:53:11 +03:00
uncivbot[bot]
a372ed7ed9
Translations update (#2728) 
* Update Russian.properties (#2709)

New lines are translated

* Update Ukrainian.properties (#2711)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Indonesian.properties (#2720)

* Update Korean.properties (#2712)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Japanese.properties (#2721)

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Brazilian_Portuguese.properties (#2727)

Co-authored-by: Bada <64350251+BadaTheBada@users.noreply.github.com>
Co-authored-by: Prosta4okua <31485341+Prosta4okua@users.noreply.github.com>
Co-authored-by: Mulaiz Jorigo <66756998+NexVanca@users.noreply.github.com>
Co-authored-by: TG <saud2410@naver.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: Werlichz <66792554+Werlichz@users.noreply.github.com>
 2020-06-14 23:39:35 +03:00
Yair Morgenstern
9b37f0a907 Resolved #2723 - resource-specific improvement bonuses are *in addition to* the regular improvement bonuses, and not instead. 2020-06-14 20:52:00 +03:00
Alexander Korolyov
c3da044c43
Adding units on map editor. (#2667) 
* Adding units to map editor.

* loadScenario checkbox Prototype added to MapOptions table.

* adds switch for Scenario and Unit editor debug

* New Scenario class

* Background step1:
1. Create a new class Scenario, containing TileMap, GameParameters and string name (doesn't really matter where, we can move it around later)
2. Create SaveScenario and LoadScenario functions in MapSaver (save to/ load from scenario name)

* Prototype of Save/Load scenario implementation.

* Add update method to NewGameOptionsTable

* First working Save/Load scenario prototype

* First working prototype of Load/Save scenario

* Added test conditions for the new debug modes

* Resolve merge conflict

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2020-06-13 22:53:04 +03:00
Yair Morgenstern
1961aa7245 Code for era-based city images is go, the current era city images hide the rivers behind them so it's temporarily disabled 2020-06-10 22:00:32 +03:00
Yair Morgenstern
86d54bd3fe Resolved #2708 - added rivers to plain tileset 2020-06-08 19:34:25 +03:00
Yair Morgenstern
41355633cd 3.9.2 2020-06-07 22:28:08 +03:00
Yair Morgenstern
21f9df63dd Clicking the menu button when it is open closes the menu - #2706 2020-06-07 22:19:22 +03:00
Yair Morgenstern
4cbd279713 Resolved #2704 - Rome starts avoid extreme temperatures 2020-06-07 21:55:31 +03:00
Yair Morgenstern
f03c0c6de2 Translation updates 2020-06-07 21:52:29 +03:00
uncivbot[bot]
258b2f587c
Translations update (#2707) 
* Update Korean.properties (#2700)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Italian.properties (#2698)

* Finish spansih translation (#2705)

* Lithuanian.properties (#2692)

* Lithuanian.properties

fixed several errors in the text, added translation of diplomacy and cities of states

* Update Lithuanian.properties

Co-authored-by: TG <saud2410@naver.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Álvaro Ferrero <alfedi3867@hotmail.com>
Co-authored-by: teodor24 <65969302+teodor24-real@users.noreply.github.com>
 2020-06-07 21:36:35 +03:00
Yair Morgenstern
bc458c72ff Move units out of cities when liberating 2020-06-07 21:27:27 +03:00
Väinö Mäkelä
05ae6fc81f
Don't draw text on worker threads (#2701) 
Drawing text requires OpenGL context if new characters need to be
rendered.
 2020-06-07 19:14:27 +03:00
Yair Morgenstern
31b9faaf23 New translations 2020-06-05 12:40:22 +03:00
uncivbot[bot]
e314475bdc
Translations update (#2697) 
* Update template.properties (#2685)

* Update template.properties

Also preparing for the Aztecs

* Update template.properties

* Update Russian.properties (#2688)

New tutorial lines are translated

* Update Italian.properties (#2695)

* Update Korean.properties (#2694)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Japanese.properties (#2693)

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Simplified_Chinese.properties (#2696)

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Bada <64350251+BadaTheBada@users.noreply.github.com>
Co-authored-by: saud2410 <64586749+saud2410@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: Doubi_TS <48427744+tianshidoubi@users.noreply.github.com>
 2020-06-05 12:37:39 +03:00
Yair Morgenstern
677a258375 3.9.1 2020-06-03 19:36:42 +03:00
uncivbot[bot]
6bb555a666
Translations update (#2687) 
* Update Japanese.properties (#2681)

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Spanish.properties (#2682)

I just checked some Grammar errors that capted my attention while playing and also translated some lines that I consider an Accurate translation

* Update Russian.properties (#2683)

* Update Russian.properties

New lines are translated

* Update Russian.properties

Translation issue closed

* Update Italian.properties (#2686)

Fix

Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: WhiteRoar <63148999+WhiteRoar@users.noreply.github.com>
Co-authored-by: Bada <64350251+BadaTheBada@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2020-06-03 19:26:53 +03:00
Yair Morgenstern
713ee08bf9 Buildings requiring a nearby resource can be constructed even when the tile belongs to another city 2020-06-03 19:26:39 +03:00
Yair Morgenstern
35ff2a38f5 Apparently I removed the nat wonders, causing tests to fail. Lucky the tests are there, or the tutorial would be gone! 2020-06-03 19:14:15 +03:00
Yair Morgenstern
d511899ed8 Resolved #2613 - added a close button to the Civ-picking popup in the New Game screen 2020-06-03 19:09:48 +03:00
Yair Morgenstern
3e31be1801 Natural wonders spawned before rivers, so we don't retroactively get rivers on coast tiles 
Other small improvements for catching and avoiding crashes
 2020-06-03 18:44:03 +03:00
Yair Morgenstern
bb9404152f #1492 - Added civilopedia info for great people and great improvements, removing terrain features, and strategic resource provision. 2020-06-03 18:11:56 +03:00
Yair Morgenstern
7566cbb24a Got the aapt options to ignore the mods! We can now add mod when testing without worrying that they will make their way into the apk =D 2020-06-01 22:30:16 +03:00
Yair Morgenstern
5eeee2215b 3.9.0-patch2 2020-06-01 22:10:22 +03:00
uncivbot[bot]
0ae9478128
Translations update (#2680) 
* Update Italian.properties (#2675)

* Update Japanese.properties (#2677)

* Update Japanese.properties

* Update Japanese.properties

* Update Ukrainian.properties (#2678)

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: Prosta4okua <31485341+Prosta4okua@users.noreply.github.com>
 2020-06-01 22:00:37 +03:00
Yair Morgenstern
b90690a24b Solved air interception defensive bonuses crashes 2020-06-01 21:57:20 +03:00
Yair Morgenstern
1c04ba50cb Basic structure of Dropbox replacement self-serving 2020-06-01 21:33:59 +03:00
Yair Morgenstern
07889130b4 test 2020-06-01 21:26:25 +03:00
Yair Morgenstern
e4661db4e3 Upgraded Gradle plugin 2020-06-01 20:23:11 +03:00
Yair Morgenstern
d77415de8d Barbarian automation's run away uses the same function as the worker's run away - solves a crash caused by bad logic in the barbarian automation 
3.9.0-patch1
 2020-06-01 01:54:26 +03:00
Yair Morgenstern
4b649825cd Battle calculation takes into account the tile that the unit will attack from 2020-06-01 01:51:11 +03:00
Yair Morgenstern
9496c4523e Fixed crashing bug where map generation would try to have rivers going off-map 2020-06-01 01:31:38 +03:00
Yair Morgenstern
22fd10498e 3.9.0 2020-05-31 23:02:07 +03:00
paontv
9c1ffb8b28
Update Japanese.properties (#2674) 
* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties
 2020-05-31 20:40:43 +03:00
Yair Morgenstern
43f8fa89c0 Game now saves save files in external storage on Android when possible. 
May the lord have mercy on our souls.
 2020-05-31 19:48:36 +03:00
Yair Morgenstern
434ded6070 Simplified multiplayer vs local save storage 2020-05-31 19:20:16 +03:00
Yair Morgenstern
ba9329963f River generation is go! =D 2020-05-31 19:14:16 +03:00
Yair Morgenstern
60aeebd3bb Separated Landmass and Natural Wonder generation from the MapGenerator class - now it's much easier to understand what's going on where. 2020-05-31 17:21:15 +03:00
Yair Morgenstern
844cdcb821 Added a river coordinate system - it's just far enough from the tile oordinate system to be incredibly annoying 2020-05-31 17:05:35 +03:00