Mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-20 19:56:51 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,475 Commits 6 Branches 1,054 Tags 1.1 GiB
c83a2ed73c
Commit Graph

730 Commits

Author SHA1 Message Date
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
Smashfanful
6723b8b717
Update Nations.json 2019-04-15 16:45:46 +02: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
25455df0fd
Merge pull request #649 from divizdev/master 
Russian translation
 2019-04-15 08:22:09 +03:00
Yair Morgenstern
089f8ac49f "Map Editor" button now takes the current map to edit 2019-04-14 22:33:19 +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
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
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
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
Am-per-Sand
b00b432bb3 War Chariot 
100x100 white on grey transparent
 2019-04-11 20:19:24 +02:00
Smashfanful
edfd2a69c2
Update Translations.json 2019-04-10 19:32:01 +02:00
Yair Morgenstern
6af749b77b Added Walls of Babylon unique building 
Added Chu-Ko-Nu unique unit
 2019-04-09 23:31:16 +03:00
Smashfanful
3927d8d7ab
Update Translations.json 2019-04-09 16:47:54 +02:00
Yair Morgenstern
06b44140b8 Resolved #603 - Move unit icons back above city label 2019-04-09 16:49:24 +03:00
Yair Morgenstern
7fa24a8f17 Added Neuschwanstein wonder - part of #245 2019-04-09 16:27:12 +03:00
Yair Morgenstern
472c370c8f Added Terracotta Army wonder - part of #245 2019-04-08 22:36:50 +03:00
Yair Morgenstern
6cd925cf78 Replaced "Diplomatic Incident" with more generic "Popup Alert" 2019-04-08 20:49:34 +03:00
Yair Morgenstern
86ed7c2ec3
Merge pull request #632 from Am-per-Sand/master 
Machu Picchu deresoluted
 2019-04-08 08:51:56 +03:00
Am-per-Sand
28a63d8170
Machu Picchu deresoluted 
Enlarged building to be more distinct on large screens in small scale
 2019-04-07 22:32:28 +02:00
Yair Morgenstern
e7f99975eb Resolved #610 - map generation assigns a set amount of each Strategic resource, which are spread across the map 2019-04-07 23:16:57 +03:00
Yair Morgenstern
42eb3fa297 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-04-07 20:24:15 +03:00
Yair Morgenstern
3c3c81fd88 Added Himji Castle wonder - #245 2019-04-07 20:23:57 +03:00
Smashfanful
fb77a35901
Update Translations.json 2019-04-05 10:40:51 +02:00
Yair Morgenstern
9a0baf028e Added Colossus wonder - #245 2019-04-04 16:07:16 +03:00
Yair Morgenstern
e93ed68a2b Icons for units replaced by civ unique units are no longer shown in tech button 2019-04-02 21:53:36 +03:00
Yair Morgenstern
89a720f7b2 Cities now only take ownership of _unowned_ tiles around them 2019-04-01 22:38:36 +03:00
Smashfanful
bf33bcaffc
Update Tutorials_Italian.json 
Some minor corrections
 2019-04-01 17:57:47 +02:00
Yair Morgenstern
6796c1868b Added a much better initial tutorial, so people new to the 4X genre can find their arms and legs around the game 2019-04-01 00:05:11 +03:00
Yair Morgenstern
9eb9176b2a Units & buildings requiring resources or other needs are now displayed, but not selectable, from the city screen as constructions 2019-03-29 18:03:18 +03:00
Yair Morgenstern
38f732b461 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-03-29 15:18:17 +03:00
Yair Morgenstern
12719c1e0e Added Great Wall wonder 2019-03-29 15:17:58 +03:00
Yair Morgenstern
18f96dd207
Merge pull request #611 from B5656/patch-3 
Create BasicHelp_French.json
 2019-03-29 15:10:55 +03:00
Yann
08c7671c68
Update GreatPeopleNames.json 
little update, a " was missing
 2019-03-29 12:01:33 +01:00