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

786 commits

Author SHA1 Message Date
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
Yann
d0dac336b6
Create BasicHelp_French.json 
add french version of the basic help
 2019-03-29 11:50:38 +01:00
Yair Morgenstern
2f889fb57f
Merge branch 'master' into patch-2 2019-03-27 16:18:17 +02:00
Smashfanful
e4b9597fb1
Update Translations.json 2019-03-27 11:45:37 +01:00
Smashfanful
5f344c5299
Update Translations.json 
Also added some translation you should add
 2019-03-25 18:31:25 +01:00
Yann
d0b65da424
Update Translations.json 
Update French version
 2019-03-25 11:27:37 +01:00
Yair Morgenstern
e43c22a74b Apparently .replaceAll is incompatible with Android 5.1, but hey who needs them. 2019-03-24 20:27:00 +02:00
Smashfanful
0ff3d7a5fd
Update Nations_Italian.json 2019-03-24 15:41:47 +01:00
Yair Morgenstern
bba6f43943 Changed "Combat Unit" to Military Unit" for naming consistency 2019-03-23 22:04:50 +02:00
Yair Morgenstern
a751ed6e31 Resolved #593 - Show/Hide resources and improvements button wasn't working 2019-03-22 10:57:18 +02:00
Yair Morgenstern
9b7a796a03
Merge pull request #597 from Am-per-Sand/master 
Frigate <-> Caravel icons swap
 2019-03-22 00:59:12 +02:00
Yair Morgenstern
dddda38d57 City tiles no longer show "ground" area 2019-03-21 23:59:02 +02:00
Yair Morgenstern
69d3703543 Resolved #595 - Added release version to options table 2019-03-21 22:46:49 +02:00
Am-per-Sand
e3a589ffb4
Frigate <-> Caravel icons swap 2019-03-21 15:21:03 +01:00
Am-per-Sand
36ead7a569
Delete Frigate.png 2019-03-21 15:19:17 +01:00
Am-per-Sand
c6ca334271
Delete Caravel.png 2019-03-21 15:19:07 +01:00
Yair Morgenstern
775055902f Continuation of #590 - "Machu Picchu" instead of "Machu Pichu" 
Changed info in saved games to fit the change
 2019-03-21 12:53:41 +02:00
Yair Morgenstern
3f6dead4c6
Merge pull request #590 from Am-per-Sand/master 
"Machu Picchu" typo
 2019-03-21 12:30:24 +02:00
Yair Morgenstern
080a2f7e9a
Merge branch 'master' into patch-77 2019-03-20 23:37:20 +02:00
Yair Morgenstern
06c4ea25b6
Merge pull request #591 from Smashfanful/patch-76 
Update Translations.json
 2019-03-20 22:40:23 +02:00
Am-per-Sand
d16322d494
Delete Machu Pichu.png 2019-03-20 18:54:40 +01:00
Am-per-Sand
f83eed0d08
new wonder icon 
Machu Picchu correct
 2019-03-20 18:54:07 +01:00
Smashfanful
92f929506c
Update Translations.json 2019-03-20 17:06:25 +01:00
Smashfanful
3aaac3bb36
Update Translations.json 2019-03-20 17:05:24 +01:00
Yair Morgenstern
973cfd50a2 Added different city tiles for different locations 2019-03-20 15:15:55 +02:00
Yair Morgenstern
a52bc2776c Added Jungle tiles to FantasyHex tileset! 2019-03-20 13:06:18 +02:00
Yair Morgenstern
1d88e76452 Split map into layers for base image, features, overlays, and fog 
Added Marsh and Lakes images
IT LOOKS SO GOOD NOW DAMN
 2019-03-20 12:09:54 +02:00
Yair Morgenstern
fe9fc110d8 Added tile feature tiles to tilesets! 2019-03-20 11:06:08 +02:00
Yair Morgenstern
9d5c6911fd Added a tileset for Thorm maps - beutiful stuff but doesn't zoom in well, hope I'll be able to find a more HQ version of this type 2019-03-19 23:13:46 +02:00
Smashfanful
fbf700efdd
Update Translations.json 2019-03-19 19:44:22 +01:00
Am-per-Sand
56597f205b
"Machu Picchu" 2019-03-19 17:44:04 +01:00
Am-per-Sand
94ab46f540
"Machu Picchu" 2019-03-19 17:40:55 +01:00
Yair Morgenstern
d6f3ab3f40 Fantasy hex tileset is go! 2019-03-19 18:35:58 +02:00
Yair Morgenstern
21377f63e7 Added Tilesets, for alternative tile images - this could be big! 
Options table is now a table, not a list - more room for future options
 2019-03-19 17:09:51 +02:00
Yair Morgenstern
f1f3753231 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-03-17 20:33:07 +02:00
Yair Morgenstern
d307c638b5 Resolved #577 - fixed translations where the text in brackets didn't fit the pattern 2019-03-17 20:33:02 +02:00
Duan Tao
a495413481 Fix a very stupid obselete define. 2019-03-17 14:48:05 +08:00
Duan Tao
ea36508200 Modern units upgrade tree. 2019-03-17 11:39:32 +08:00
Am-per-Sand
9f09c2dc55
Variable names warning for translators 2019-03-16 18:55:41 +01:00
Yair Morgenstern
34a3c3dfae
Merge pull request #572 from L314/spelling 
"Replacable Parts" is now "Replaceable Parts"
 2019-03-15 10:08:10 +02:00
Yair Morgenstern
10d098b9de 2.13.14 2019-03-14 22:29:25 +02:00
Yair Morgenstern
9bccc739d4
Merge pull request #574 from Smashfanful/patch-74 
Update Nations.json
 2019-03-14 21:47:22 +02:00
Yair Morgenstern
8de1d2b5f7
Merge pull request #573 from Smashfanful/patch-73 
Update Nations_Italian.json
 2019-03-14 21:44:32 +02:00
Yair Morgenstern
72734de254
Merge pull request #575 from Smashfanful/patch-75 
Update Translations.json
 2019-03-14 21:41:14 +02:00
Yair Morgenstern
456f524601 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-03-14 21:33:38 +02:00
Yair Morgenstern
db6c47e13a Sorted spacing issues 2019-03-14 21:33:33 +02:00
Smashfanful
72ebc2ae4d
Update Translations.json 2019-03-14 12:24:14 +01:00
Smashfanful
776ce635dd
Update Nations.json 2019-03-14 11:34:04 +01:00
Smashfanful
50871d02e3
Update Nations_Italian.json 2019-03-14 11:33:44 +01:00
Smashfanful
f67b4370ca
Update Nations_Italian.json 2019-03-14 11:30:06 +01:00
Lliam Leosh
32fbabdd19 "Replacable Parts" is now "Replaceable Parts" 2019-03-14 02:55:22 -05:00
Smashfanful
53bbd84e3a
Update Nations.json 2019-03-13 16:38:38 +01:00
Yair Morgenstern
479b3a02ad Resolved #383 - Configurable amount of turns between autosaves 2019-03-12 22:10:25 +02:00
Yair Morgenstern
4669d4aa2a Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-03-12 19:26:12 +02:00
Yair Morgenstern
81b29a5b57 Resolved #551 - Update city stats on production change 2019-03-12 19:24:50 +02:00
Yair Morgenstern
7a26dc335b
Merge pull request #562 from Smashfanful/patch-69 
Update Tutorials_Italian.json
 2019-03-12 19:24:46 +02:00
Yair Morgenstern
02f1530c44 Fixed translation file 2019-03-11 20:20:07 +02:00
Smashfanful
54189ae296
Update Tutorials_Italian.json 
Added some lines for the Italian version.
 2019-03-11 17:08:47 +01:00
Yair Morgenstern
c69aea2125
Merge pull request #555 from Smashfanful/patch-65 
Update Translations.json
 2019-03-11 16:46:24 +02:00
Yair Morgenstern
88a3b6e59f
Merge pull request #542 from Smashfanful/patch-58 
Update Nations.json
 2019-03-11 16:45:37 +02:00
Smashfanful
40b0125320
Update Translations.json 
Three new Wonders suggested by Smashfanful: Mausoleum of Halicarnassus, Himeji Castle and Statue of Zeus
 2019-03-11 15:01:29 +01:00
Smashfanful
968667208b
Update Nations.json 2019-03-11 14:15:04 +01:00
Smashfanful
4e5d2bd127
Update BasicHelp.json 
Some grammatical errors have been corrected, I hope.
 2019-03-11 14:13:44 +01:00
Yair Morgenstern
42ca98efd2 Gave up on the idea of the attack button - if the enemy moves we need to remove the button, and it's actually very difficult to determine this. 2019-03-10 23:27:19 +02:00
Yair Morgenstern
09b1446fea Removed empty translations (very bad for people who play the game in that language) 
Added a way to copy game info directly from files, and also a popup when encountering a certain error, for debugging purposes
 2019-03-10 22:52:57 +02:00
Smashfanful
ac9c942dd3
Update Translations.json 2019-03-10 19:09:12 +01:00
Yair Morgenstern
d26aaf9a35 Now it should compile properly 
Also fixed tabbing for simplified chinese and portuguese translations, which was consistently off
 2019-03-09 22:34:30 +02:00
Yair Morgenstern
51747e4fd2
Merge pull request #540 from Smashfanful/patch-57 
Update Units.json
 2019-03-09 22:09:45 +02:00
Yair Morgenstern
8e74797a44
Merge pull request #539 from Smashfanful/patch-56 
Update Nations.json
 2019-03-09 22:08:14 +02:00
Smashfanful
01d24e6363
Update Nations.json 
Added Starting Bias, Ability names and Adjectives.
 2019-03-09 14:58:55 +01:00
Smashfanful
8067147266
Update Units.json 
Added much more units.
 2019-03-08 19:08:02 +01:00
Smashfanful
0ccde1896a
Update Nations.json 2019-03-08 19:05:08 +01:00
Smashfanful
a008b4521c
Update Translations.json 2019-03-08 18:09:55 +01:00
Yair Morgenstern
40e2bb9323 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-03-08 15:44:27 +02:00
Yair Morgenstern
9d37c551e3 Add translation items for selling buildings 2019-03-08 15:44:11 +02:00
Smashfanful
3026a500d2
Update Translations.json 
There are various non-Italian translation that are made with Google Translator, so they may be vague. Feel free to correct them.
 2019-03-08 12:55:17 +01:00
Yair Morgenstern
2ec8225c20 Resolved #384 - can now sell one building per city per turn 2019-03-08 13:45:12 +02:00
Yair Morgenstern
adea36fb81 Commented out snow - we don't want it appearing in patches until we have better map generation 2019-03-08 10:15:10 +02:00
Yair Morgenstern
7b6d37053b
Merge pull request #528 from Smashfanful/patch-49 
Update Nations_Italian.json
 2019-03-07 23:09:04 +02:00
Yair Morgenstern
6f46750c15
Merge pull request #532 from Smashfanful/patch-53 
Update Translations.json
 2019-03-07 19:15:04 +02:00
Yair Morgenstern
8fff034221
Merge pull request #531 from Smashfanful/patch-52 
Update Buildings.json
 2019-03-07 19:14:33 +02:00
Yair Morgenstern
15cb18ca26
Merge pull request #530 from Smashfanful/patch-51 
Update Units.json
 2019-03-07 19:14:17 +02:00
Yair Morgenstern
bc2a4882c5
Merge pull request #519 from Smashfanful/patch-46 
Update Terrains.json
 2019-03-07 19:09:06 +02:00
Smashfanful
7713170d97
Update Translations.json 2019-03-07 17:32:28 +01:00
Smashfanful
c93ee1e1f2
Update Buildings.json 
Added Walls of Babylon. Should I also add Forum for Rome, Obelisk for Egypt and Shale Plant for Japan (all from CIV4)?
 2019-03-07 17:28:46 +01:00
Smashfanful
873d4f1cff
Update Units.json 
Added War Chariots for Egypt, Chu-Ko-Nu for China, Cossack for Russia, Ship of the Line for England, and Legion for Rome. Legion should also build roads. Some suggestion to updates for Legion, Samurai and Camel Archer.
 2019-03-07 17:18:30 +01:00
Smashfanful
c34249a66e
Update Nations_Italian.json 
Corrections.
 2019-03-07 15:54:32 +01:00
Duan Tao
0c6826fd9b Fix json error. 2019-03-07 14:01:57 +08:00
Yair Morgenstern
4dcf2cacc4
Merge pull request #521 from Smashfanful/patch-48 
Update Translations.json
 2019-03-06 20:37:07 +02:00
Smashfanful
aab1ebb47d
Update Translations.json 2019-03-06 18:51:06 +01:00
Smashfanful
42d043a8ad
Update TileResources.json 
Added Copper, Bison, Citrus, Crab, Truffles and Cocoa
 2019-03-06 16:33:23 +01:00
Smashfanful
da2a95512e
Update Terrains.json 
Added Snow, and updated Desert and Tundra.
 2019-03-06 15:45:51 +01:00
Yair Morgenstern
10508792db
Merge pull request #517 from Smashfanful/patch-44 
Update Nations_Italian.json
 2019-03-06 15:45:38 +02:00
Smashfanful
ae6189164e
Update Nations.json 2019-03-06 14:27:50 +01:00
Smashfanful
249b9fe57d
Update Nations_Italian.json 2019-03-06 14:27:44 +01:00
Yair Morgenstern
b059ee36db
Merge pull request #516 from Smashfanful/patch-43 
Update Tutorials_Italian.json
 2019-03-06 14:15:38 +02:00
Yair Morgenstern
d305508e7a
Merge pull request #513 from Smashfanful/patch-41 
Update Translations.json
 2019-03-06 14:15:28 +02:00
Smashfanful
be7f96d10c
Update Tutorials_Italian.json 2019-03-06 12:26:53 +01:00
Smashfanful
b959b4f190
Update BasicHelp_Italian.json 
Misses a translation here
 2019-03-06 12:21:50 +01:00
Smashfanful
b1cb0e7131
Update Translations.json 2019-03-06 12:13:54 +01:00
Yair Morgenstern
7357707010 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-03-05 22:19:20 +02:00
Yair Morgenstern
afaf4ae6da Resolved #508 - Missing and bad translations 2019-03-05 22:18:57 +02:00
Yair Morgenstern
626250a2d9
Merge pull request #509 from Smashfanful/patch-39 
Update Nations_Italian.json
 2019-03-05 22:05:16 +02:00
Yair Morgenstern
9a4211a7dd
Merge pull request #510 from Smashfanful/patch-38 
Update Nations.json
 2019-03-05 22:04:42 +02:00
Yair Morgenstern
f708954940
Merge pull request #503 from Smashfanful/patch-34 
Update Nations.json
 2019-03-05 22:04:24 +02:00
Smashfanful
49b4ec0880
Update Nations_Italian.json 2019-03-05 15:38:31 +01:00
Smashfanful
66625a5e54
Update Nations.json 2019-03-05 15:38:25 +01:00
Smashfanful
bcefae56a5
Update Translations.json 
Added Japanese for some lines.
 2019-03-05 12:08:39 +01:00
Yair Morgenstern
0065afa8f4
Merge pull request #505 from Smashfanful/patch-36 
Update Nations_Italian.json
 2019-03-04 22:14:56 +02:00
Yair Morgenstern
efe677d27c Added Civilopedia texts to translation file 2019-03-04 21:32:18 +02:00
Smashfanful
a8daf29621
Update Nations_Italian.json 2019-03-04 20:11:07 +01:00
Smashfanful
49f46d44d4
Update Nations.json 2019-03-04 17:11:22 +01:00
Smashfanful
6c3457f05e
Update Nations_Italian.json 2019-03-04 12:52:33 +01:00
Yair Morgenstern
0ef11e12cd Resolved #491 - Once Honor has been adopted, gain Culture when you kill a barbarian unit 2019-03-03 23:05:12 +02:00
Yair Morgenstern
c4e686f514
Merge pull request #496 from Smashfanful/patch-29 
Update BasicHelp_Italian.json
 2019-03-03 18:14:12 +02:00
Yair Morgenstern
b98b0feef3
Merge pull request #495 from Smashfanful/patch-28 
Update Nations.json
 2019-03-03 18:14:01 +02:00
Smashfanful
2012cb431f
Update Translations.json 
You also forgot Coast and Ocean
 2019-03-03 16:58:38 +01:00
Smashfanful
caca0ffda6
Update BasicHelp_Italian.json 2019-03-03 16:38:04 +01:00
Smashfanful
37e9736ded
Update Nations.json 2019-03-03 16:27:35 +01:00
Smashfanful
94f90c16a7
Update Nations.json 2019-03-03 12:38:16 +01:00
Yair Morgenstern
9e5d6d3c75 Resolved #469 - AI Great General tries to maximize effect on troops 2019-03-02 22:53:30 +02:00
Yair Morgenstern
c676d127dd Resolved #488 - Recalibrated tech costs 2019-03-02 22:26:31 +02:00
Yair Morgenstern
b2ddb0b5e6
Merge pull request #481 from Smashfanful/patch-22 
Create GreatPeopleNames.json
 2019-03-02 21:48:26 +02:00
Yair Morgenstern
d2f76976e7
Merge pull request #487 from Smashfanful/patch-25 
Update Translations.json
 2019-03-02 21:47:31 +02:00
Yair Morgenstern
d6d0fa16c4
Merge pull request #489 from Smashfanful/patch-26 
Update Nations_Italian.json
 2019-03-02 21:46:54 +02:00
Yair Morgenstern
3c3795aa54
Merge pull request #483 from Smashfanful/patch-24 
Update Nations.json
 2019-03-02 21:46:41 +02:00
Yair Morgenstern
c2387a9055
Merge pull request #485 from Am-per-Sand/patch-5 
Policies.json typo correction
 2019-03-02 21:46:04 +02:00
Yair Morgenstern
58e38ea634 Added Japan civ! 
Some units now recieve promotions when created/upgraded to, as per Civ V
 2019-03-02 21:27:35 +02:00
Smashfanful
153f6e0a85
Update Nations_Italian.json 2019-03-02 19:38:03 +01:00
Smashfanful
314a69e541
Update Translations.json 2019-03-02 19:29:14 +01:00
Am-per-Sand
364b3b48a2
Policies.json typo correction 2019-03-01 18:21:25 +01:00
Smashfanful
c519d4bea4
Update Nations.json 
Added Persia, Songhai, Iroquois, Ottomans, Korea and Polynesia
 2019-03-01 16:52:03 +01:00
Smashfanful
1359e22772
Update GreatPeopleNames.json 
Added the " symbol
 2019-03-01 16:09:02 +01:00
Yair Morgenstern
f3cbeb5ca4 Resolved #123 - Added final units - Modern Armor, Rocket Artillery and Mechanized Infantry! 2019-02-28 23:45:21 +02:00
Yair Morgenstern
17c5209023
Merge pull request #477 from Smashfanful/patch-18 
Update Nations_Italian.json
 2019-02-28 18:23:32 +02:00
Smashfanful
5f73e68c78
Update Nations.json 2019-02-28 15:51:37 +01:00
Smashfanful
8be4dadfb3
Create GreatPeopleNames.json 2019-02-28 15:07:46 +01:00
Smashfanful
5bbcb79f2f
Update Translations.json 
ITALIAN
You forgot to translate/localize
"Maintainance on roads & railroads reduced by 33%, +2 gold from all trade routes"
"Autocracy complete"
"+1 happiness from each Walls, Castle and Arsenal"
"Map Editor" (menu)
"Combined arms" (tech)
"Coast" (tile)
"Ocean" (tile)
"Luxury resources" (diplomacy)
"Strategic resources" (diplomacy)
"Technologies" (diplomacy)
"Declarations of war" (diplomacy)
"Cities" (diplomacy)
"Cannot continue work on [construction]"
All Wonder names and powers (ALL OF THEM)
All spaceship parts
 2019-02-28 12:47:09 +01:00
Smashfanful
fe03cf0e67
Update Nations_Italian.json 2019-02-28 11:54:05 +01:00
Yair Morgenstern
3432f9b8c1 Rendering performance improvements - much smoother scrolling! 2019-02-27 20:17:27 +02:00
Yair Morgenstern
13f2f101a0 Resolved #468 - AI now accompanies Great People with military escorts 
Merged "CivInfos" json into "Nations"
 2019-02-25 21:21:12 +02:00
Yair Morgenstern
57193bffa9
Merge pull request #475 from Smashfanful/patch-17 
Create CivIntros_English.json
 2019-02-24 17:48:17 +02:00
Smashfanful
f95ea1864d
Create CivIntros_English.json 2019-02-24 16:34:44 +01:00
Smashfanful
974b0bea87
Update Nations_Italian.json 
I've made some corrections.
 2019-02-24 15:39:35 +01:00
Yair Morgenstern
6cda5bb8ad Fixed #467 - popups on separate screens affected each other 2019-02-24 13:07:34 +02:00