Commit graph

2907 commits

Author SHA1 Message Date
Yair Morgenstern
3fad0985b4 Attempt to use GL 3.0 when possible 2019-11-25 06:34:02 +02:00
Yair Morgenstern
4277ba5c8f Yes we changed the repo name... 2019-11-24 23:48:21 +02:00
Yair Morgenstern
9580e8cb38 Let's see if it can use the local JAVA_HOME from Travis since it doesn't seem to like downloading large external files 2019-11-24 23:41:27 +02:00
Yair Morgenstern
c7de78359b Was I not running gradlew correctly? 2019-11-24 23:06:19 +02:00
Yair Morgenstern
e35ed4b983 Maybe now 2019-11-24 22:50:58 +02:00
Yair Morgenstern
b312432c37 Now with JDK from da internets 2019-11-24 22:32:16 +02:00
Yair Morgenstern
f626381c31 I think we're ready to pack! 2019-11-24 22:22:47 +02:00
matthiakl
e93e6b2bfd Update german translations (#1367) 2019-11-24 14:18:20 +02:00
StepanIvasyn
2efed72fde Update Buildings.json (#1366)
Add Ukrainian translation.
2019-11-24 13:02:46 +02:00
Yair Morgenstern
5227bcab7f
Only run packr if jar exists 2019-11-24 08:05:04 +02:00
Yair Morgenstern
c0ace9f0d4 packrWindows now dependant on dist 2019-11-24 00:28:39 +02:00
Yair Morgenstern
2a139ff732 Resolved #1364 - Policy picker screen won't appear from the world screen if there are no possible policies to pick 2019-11-24 00:02:28 +02:00
Yair Morgenstern
a8c98f60d7 Railroads are now much more visible! 2019-11-23 22:43:35 +02:00
Yair Morgenstern
c447bd2da8 Resolved #1359 - City name from overview screen now leads directly to the city scren 2019-11-23 22:30:25 +02:00
Yair Morgenstern
095deee125 UncivGame rename 2019-11-23 22:28:23 +02:00
Smashfanful
fb13147519 Update NewGame,SaveGame,LoadGame,Options.json (#1360) 2019-11-23 22:06:26 +02:00
Coruna
efc669addd added further German translation (#1357)
* Update Policies.json

some new words, some corrections

* Update Techs.json

added some words, corrected some other

* Update Terrains,Resources,Improvements.json

some new words, some corrections

* Update Units,Promotions.json

some more words and corrections

* Update Units,Promotions.json

completed

* Update Buildings.json
2019-11-23 22:06:12 +02:00
Yair Morgenstern
18be826c1a Changed "help translating" initial message to point to Github 2019-11-23 21:52:43 +02:00
Yair Morgenstern
86fdf3ebd7 3.3.0-patch1 2019-11-23 21:36:00 +02:00
Yair Morgenstern
1230b00688 Fixed crash in tile editor as a result of adding Fallout, which has no "occursOn" terrains 2019-11-23 21:35:03 +02:00
Yair Morgenstern
4844a98af1 Discord RPC now works from Desktop .Jar! 2019-11-21 23:01:38 +02:00
Yair Morgenstern
e0219036f6
Update README.md 2019-11-21 22:53:23 +02:00
Yair Morgenstern
3e603d4e2a
Changed image in Readme to new Google Play 2019-11-21 22:21:45 +02:00
Yair Morgenstern
e00bdf77d6 Apparently the Discord RPC doesn't like being run from the JAR, disabled until it can work 2019-11-21 18:50:10 +02:00
Yair Morgenstern
62fd7d8588 Desktop Unciv now sends status to Discord!
Basically stole the Discord RPC implementation outta Mindustry
2019-11-21 16:24:27 +02:00
Coruna
a4dac0f67a added German translation (again) (#1356)
* Update NewGame,SaveGame,LoadGame,Options.json

* Update Notifications.json

added a comment about exclamation and questions marks

* Update Other.json
2019-11-21 12:45:47 +02:00
Yair Morgenstern
0ec0ee3d44 All the various clicks on the world screen can now work together as friends 2019-11-21 10:53:08 +02:00
Yair Morgenstern
6772e19981 3.3.0 2019-11-20 23:40:06 +02:00
Yair Morgenstern
c921ab9b0a Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-11-20 23:34:20 +02:00
Yair Morgenstern
cbb5db2fb8 Resolved #1231 - can now aquire tiles from eighboring cities again, kudos @klondi 2019-11-20 23:33:09 +02:00
Yair Morgenstern
bfd4e735fd
Update README.md 2019-11-20 23:25:17 +02:00
Yair Morgenstern
52f8af1f5c
Update README.md 2019-11-20 23:24:45 +02:00
Smashfanful
022b388d35 Update Other.json (#1351)
Italian translations
2019-11-20 18:03:36 +02:00
Smashfanful
8c2026dcd9 Update Buildings.json (#1350)
Italian translations
2019-11-20 18:03:15 +02:00
Smashfanful
d69fc380af Update Policies.json (#1215)
* Update Policies.json

* Update Policies.json
2019-11-20 18:02:47 +02:00
Smashfanful
df2942a4ad Update Terrains,Resources,Improvements.json (#1348)
Italian translations
2019-11-20 15:59:26 +02:00
Smashfanful
90e3d72ec4 Update Units,Promotions.json (#1349)
Italian translation
2019-11-20 15:58:30 +02:00
Yair Morgenstern
e4fe43f281 Resolved #1344 - currently showing tutorials should not activate again 2019-11-19 23:19:07 +02:00
Yair Morgenstern
3ea6c63e0b Fixed annoying bug which would treat long pans and flings as long clicks 2019-11-19 23:09:36 +02:00
Yair Morgenstern
526a99fb0d Set ShowPixelImprovements to True for new players - I think the world is ready 2019-11-19 22:08:24 +02:00
Yair Morgenstern
b1868accc5 Nuclear Weapon setting moved to Options, s it can be more easily explored by players 2019-11-19 22:00:16 +02:00
lishaoxia1985
dd28711ee7 update translation (#1352)
* update

* update

* update

* update

* update

* update

* update

* update

* update

* update
2019-11-19 21:58:56 +02:00
Yair Morgenstern
ae39791385
Update README.md 2019-11-19 20:20:29 +02:00
Yair Morgenstern
ff3795c96f TechButton now displays units and buildings corresponding to the description 2019-11-19 20:16:53 +02:00
Yair Morgenstern
15e59b161b Technology description no longer includes Manhatten Prokect or Nuclear Missile in description when nuclear weapons are disabled 2019-11-19 19:34:48 +02:00
lishaoxia1985
1eb5ced75c add map modifier and the benefit when we research the technology other Civs have. (#1339)
* update

* update

* update

* update

* update

* update

* update

* update
2019-11-19 19:11:01 +02:00
Duan Tao
111030e457 Nuke your enemy! (#1318)
* Nuke your enemy!

* Fantasy tiles. Worker automaticly clears fallout.

* Some AI improvement for choosing wonder and military unit.

* Add nuclear weapon option.
2019-11-19 08:43:04 +02:00
Yair Morgenstern
bfd6376612 Set icon and title for Desktop games 2019-11-18 22:04:45 +02:00
Yair Morgenstern
313f55171c Lint 2019-11-18 22:03:49 +02:00
Yair Morgenstern
9533a35d15 3.2.4 2019-11-18 22:00:44 +02:00