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

1624 commits

This branch
This branch
All branches
Author SHA1 Message Date
Duan Tao
babd29919a MapGen added type Continents. 2019-04-19 18:46:43 +08:00
Yair Morgenstern
4576056b9f Number of strategic resources now directly dependant on the number of settlable land tiles 2019-04-17 20:34:03 +03:00
Yair Morgenstern
9dabbb7946
Merge pull request #658 from ninjatao/AI_parameter 
Adjust AI parameters.
 2019-04-17 15:02:28 +03:00
Yair Morgenstern
54fc81fda7
Merge pull request #655 from Am-per-Sand/piety 
Activate Piety bonus
 2019-04-17 13:30:25 +03:00
Duan Tao
c6c3ba1e67 Adjust AI parameters. 2019-04-17 18:21:09 +08:00
Am-per-Sand
e3907e0fe1
forgot Broadcast Tower 2019-04-16 19:50:36 +02:00
Am-per-Sand
35a0dee32f
Activate Piety bonus 
N.B.
The same condition may be found in `Building.kt`, so 
- may be add a function `isCultural`
or
- add a property `cultural:true` or even `type:[military, cultural, productive, financial, scientific, wonder]` to `Buildings.json` and get rid of `isWonder` there
 2019-04-16 19:45:19 +02:00
Yair Morgenstern
010215bd10
Merge pull request #654 from Smashfanful/patch-97 
Update Nations.json
 2019-04-15 22:15:09 +03:00
Yair Morgenstern
cbf0c52d2c Barbarians no longer spawn on mountains and lakes (a bit silly) 2019-04-15 22:08:44 +03:00
Smashfanful
6723b8b717
Update Nations.json 2019-04-15 16:45:46 +02:00
Yair Morgenstern
66370400b5
Merge pull request #652 from ninjatao/BigBen 
Big ben
 2019-04-15 16:52:04 +03:00
Duan Tao
18c612dc14 Update assets. 2019-04-15 20:02:44 +08:00
Duan Tao
1a6fe1a397 Merge branch 'dev/main' into BigBen 2019-04-15 19:59:03 +08:00
Duan Tao
70241ac25b Add Big Ben. 2019-04-15 19:46:15 +08:00
Yair Morgenstern
5d77ac8b84
Merge pull request #651 from ninjatao/fix_battletable 
Fix submarines battle table.
 2019-04-15 10:56:53 +03:00
Duan Tao
e63f9297b3 Fix submarines battle table. 2019-04-15 14:05:22 +08:00
Yair Morgenstern
25455df0fd
Merge pull request #649 from divizdev/master 
Russian translation
 2019-04-15 08:22:09 +03:00
Yair Morgenstern
bafd7b2a21
Merge pull request #650 from ninjatao/fix_conquer 
Fix unassigned population when capturing city.
 2019-04-15 08:21:00 +03:00
Duan Tao
67a763ef21 Fix unassigned population when capturing city. 2019-04-15 09:27:05 +08:00
Yair Morgenstern
089f8ac49f "Map Editor" button now takes the current map to edit 2019-04-14 22:33:19 +03:00
Yair Morgenstern
8d91cb90dc Solved another rare concurrency error 2019-04-14 22:18:40 +03:00
Yair Morgenstern
8bf09420e0 Resolved #647 - Starting locations should not be on tiny Islands 2019-04-14 22:13:55 +03:00
Yair Morgenstern
7ce7c2da93 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-04-14 22:13:10 +03:00
Yair Morgenstern
cd6806d07e Removed our getRandom() extension, because it now comes built-in in Kotlin, yay! 2019-04-14 22:12:54 +03:00
divizdev
8fe889dc96
Merge branch 'master' into master 2019-04-14 21:22:14 +03:00
diviz
9647a6d64e Russian translation 2019-04-14 21:17:06 +03:00
Yair Morgenstern
a072e18081
Merge pull request #645 from Smashfanful/patch-94 
Update Units.json
 2019-04-14 07:30:20 +03:00
Yair Morgenstern
0539890a4d Added "No barbarians" starting option - part of #559 2019-04-13 22:49:17 +03:00
Smashfanful
e69a23b43e
Update Units.json 
Added Brute
 2019-04-12 16:42:27 +02:00
Yair Morgenstern
ccb9950187 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-04-12 17:05:55 +03:00
Yair Morgenstern
7228634982 Resolved #642 - pyramids unlocked with Masonry 2019-04-12 17:05:35 +03:00
Yair Morgenstern
02868dc157
Merge pull request #639 from Smashfanful/patch-91 
Update Nations.json
 2019-04-12 17:01:54 +03:00
Yair Morgenstern
8d449e5694
Merge pull request #641 from Smashfanful/patch-92 
Update Translations.json
 2019-04-12 17:01:24 +03:00
Yair Morgenstern
d86672b0c0 Organized new game screen functions 2019-04-12 16:59:56 +03:00
Smashfanful
f3e303e464
Update Translations.json 2019-04-12 15:25:51 +02:00
Smashfanful
3a16014fab
Update Nations.json 2019-04-12 15:21:01 +02:00
Yair Morgenstern
9bb4d988a3 Added Arabian unique - #563 2019-04-12 15:11:39 +03:00
Yair Morgenstern
c3bfed1bd1 Added Legion unique unit - #563 2019-04-12 14:30:53 +03:00
Yair Morgenstern
e3dcd4cb43 Added Cossack unique unit - #563 2019-04-12 14:02:15 +03:00
Yair Morgenstern
4c9ca3fd19 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-04-12 13:34:17 +03:00
Yair Morgenstern
dc2f88765b Added Foreign Legion unique unit - #563 2019-04-12 13:33:59 +03:00
Yair Morgenstern
b000fda165
Merge pull request #604 from Smashfanful/patch-79 
Update Nations_Italian.json
 2019-04-12 13:33:49 +03:00
Yair Morgenstern
f21371dfe4
Merge pull request #638 from Smashfanful/patch-89 
Update Translations.json
 2019-04-12 13:33:20 +03:00
Smashfanful
1461e0a58b
Update Translations.json 2019-04-12 11:35:26 +02:00
Yair Morgenstern
a969c8f479 Added Ship of the Line unique unit - #563 2019-04-12 09:18:01 +03:00
Yair Morgenstern
646f430636 Added War Chariot unique unit - #563 2019-04-11 23:16:14 +03:00
Yair Morgenstern
2b145db75f
Merge pull request #637 from Am-per-Sand/war-chariot 
War Chariot
 2019-04-11 22:38:12 +03:00
Am-per-Sand
b00b432bb3 War Chariot 
100x100 white on grey transparent
 2019-04-11 20:19:24 +02:00
Yair Morgenstern
2db30a247a
Merge pull request #635 from Smashfanful/patch-88 
Update Translations.json
 2019-04-10 20:41:22 +03:00
Smashfanful
edfd2a69c2
Update Translations.json 2019-04-10 19:32:01 +02:00