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

2269 commits

This branch
This branch
All branches
Author SHA1 Message Date
YueR
9e24c6e2b9 update 2019-09-25 10:58:48 +08:00
YueR
2a63d53f7e update 2019-09-25 10:31:34 +08:00
Smashfanful
751c33c609 Update Buildings.json 2019-09-24 20:28:22 +03:00
Smashfanful
a6684a6640 Update Buildings.json (#1118) 
More fixes
 2019-09-24 20:27:23 +03:00
Yair Morgenstern
dcdf36b153 Added coloring to tech icons themselves (All tech icons are now white) 2019-09-24 17:55:21 +03:00
Yair Morgenstern
40c76b7752 Resolved #1114 - submarines cannot attack from coast to lake and vice versa 2019-09-24 17:26:19 +03:00
lishaoxia1985
f6009c43ca 1. In PickTechScreen all the Techs have the same size. 2.The tech in different era has different color. 3.About global status in victory status screen, you can touch the icons of Civs to check its policy tree and tech tree, but close button may lead to worldscreen (#1096) 2019-09-24 17:09:19 +03:00
Yair Morgenstern
27b8cd5f1b AI now puppets cities by default - much better for long-term strategy, since puppeted cities are technically also controlled by AI controllers so... 2019-09-24 16:57:49 +03:00
Duan Tao
38a28888ef Duantao/ai bonus (#1117) 
* Ai bonus.

* AI modifiers apply correctly.

* AI initial units.

* Use gameInfo.getDifficulty() instead of civInfo.getDifficulty().

* Minor fix.
 2019-09-24 16:19:17 +03:00
Smashfanful
ad07db9334 Update Nations_Italian.json 
Some Italian fixes
 2019-09-24 14:04:55 +03:00
Smashfanful
bc1154c71f Update Notifications.json 
Some Italian fixes
 2019-09-24 14:04:43 +03:00
YueR
f7e34353b7 Merge remote-tracking branch 'upstream/master' 
update
 2019-09-24 07:03:49 +08:00
Smashfanful
3b4bf817c0 Update Buildings.json 
More Italian translations
 2019-09-23 20:14:44 +03:00
Yair Morgenstern
cb06253584 Minor code reorg 2019-09-23 17:48:59 +03:00
Yair Morgenstern
548078fb37 Changes to Puppet - Annex - Liberate: 
- From Conquer you can move either to Liberate, or to Puppet -> Annex -> Raze
- All unit actions at battle are completely independant of your decision what you do with the city, so they're not deffered until you decide
 2019-09-23 17:29:05 +03:00
Yair Morgenstern
6d9543e07b Added resistance icon in city screen 2019-09-23 16:19:53 +03:00
Yair Morgenstern
a1f5690e41 Added Puppet icon - some reorgnizing still needs to be done in regards to puppet vs annex 2019-09-23 10:46:51 +03:00
Duan Tao
65b8fe531e Duantao/liberate city (#1097) 
* Allow to liberate city to its founder.

* Workaround : Avoid exception on conquering city with infantry unit.

* Liberate button actually works.

* Fix trade resources check.

* Postpone the 2nd part of postBattleActions until choice is made.

* Add puppet option.

* Puppet city cannot be controlled directly.

* Add annex and puppet happiness/culture/science bonus.

* Add courthouse. Icon is missing.

* Icon for courthouse.

* Update png.
 2019-09-23 08:37:53 +03:00
YueR
ce892d20a2 Merge remote-tracking branch 'upstream/master' 
update
 2019-09-21 00:13:59 +08:00
Yair Morgenstern
a3889a549e Iroquis can now use Forest and Jungles to connect cities 
Persian +1 movement only activaes when in golden age
 2019-09-20 10:26:15 +03:00
Smashfanful
12e3ae1761 Update Diplomacy,Trade,Nations.json 
Corrections
 2019-09-20 10:07:06 +03:00
Smashfanful
03087095f6 Update NewGame,SaveGame,LoadGame,Options.json 
Added missing Italian translation
 2019-09-19 20:54:01 +03:00
Smashfanful
1359c3eab3 Update TileImprovements.json 2019-09-19 20:52:41 +03:00
Smashfanful
1591215f4c Update Buildings.json 
Last Wonder lines translations
 2019-09-19 20:52:10 +03:00
YueR
cb193864f7 Merge remote-tracking branch 'upstream/master' 
update
 2019-09-19 21:58:24 +08:00
Smashfanful
ee1751a496 Update Techs.json 
Added Medieval and Renaissance Tech quotes
 2019-09-19 15:58:59 +03:00
YueR
ef65a4e325 update 2019-09-19 20:11:50 +08:00
YueR
e6477aded4 Merge remote-tracking branch 'upstream/master' 
update
 2019-09-19 19:40:31 +08:00
YueR
08ccf6a7e6 update 2019-09-19 19:39:43 +08:00
YueR
d106d29b0c update 2019-09-19 19:37:36 +08:00
Duan Tao
c4e4f3d2a3 Fix trade resources check. 2019-09-19 11:10:50 +03:00
Yair Morgenstern
2def82c4a6 When picking random city states for a map, first priority now goes to city states with starting locations defined in the map 2019-09-18 22:42:44 +03:00
Yair Morgenstern
753efe5f47 Added error popup when failed to download map 2019-09-18 22:28:16 +03:00
Yair Morgenstern
f4d828d5e4 Finished changing all unit promotion icons! 2019-09-18 22:15:37 +03:00
YueR
9820a12b0a update 2019-09-18 18:14:01 +08:00
YueR
56ce2245e2 update 2019-09-18 17:53:39 +08:00
YueR
74490fe9fb Merge remote-tracking branch 'upstream/master' 
update
 2019-09-18 17:46:15 +08:00
YueR
64c98a27ea update 2019-09-18 17:45:59 +08:00
Duan Tao
45342a7d63 Remove redundant item is Logistics prequisition. 2019-09-18 08:43:17 +03:00
Duan Tao
0adeb68ea6 Invisible submarines are excluded from notification. 2019-09-18 08:42:47 +03:00
YueR
b6bae3de2b Merge remote-tracking branch 'upstream/master' 
update
 2019-09-18 09:52:19 +08:00
Yair Morgenstern
b86d11b5fa Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-09-17 22:40:09 +03:00
Yair Morgenstern
190d9f72fd Resolved #1091 (spelling mistakes) 2019-09-17 22:39:21 +03:00
Yair Morgenstern
04127164bc Added all remaining wonder quotes and more promotion icons 2019-09-17 22:39:08 +03:00
Smashfanful
9271fe22a4 Update Techs.json 
Added quotes for Ancient and Classical Age techs
 2019-09-17 20:41:03 +03:00
YueR
6231117340 Merge remote-tracking branch 'upstream/master' 
update
 2019-09-17 19:23:00 +08:00
Smashfanful
11840de2ce Update Nations.json 
Two more City-States: Zanzibar and Singapore
 2019-09-17 08:15:54 +03:00
Smashfanful
2ef533f57b Update Credits.md (#1087) 
* Update Credits.md

* Update Credits.md
 2019-09-17 08:14:36 +03:00
Duan Tao
0f1f5bf746 Spaceship should not be bought. 2019-09-17 08:14:10 +03:00
YueR
93fc889598 Merge remote-tracking branch 'upstream/master' 
update
 2019-09-17 05:19:55 +08:00