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

1193 commits

This branch
This branch
All branches
Author SHA1 Message Date
Yair Morgenstern
8de9b5d37a
Merge pull request #390 from ninjatao/paper_maker 
Fix paper maker icon
 2018-12-31 14:44:41 +02:00
Duan Tao
19ce158ccb Update wolfpack bonus, icons. 2018-12-31 19:58:24 +08:00
Duan Tao
ed96534d34 Fix paper maker icon 2018-12-31 19:56:28 +08:00
Duan Tao
de5610180f Add WaterSubmarine unit type. 2018-12-31 19:42:20 +08:00
Duan Tao
fd742c9859 Fix paper maker icon 2018-12-31 18:22:09 +08:00
Yair Morgenstern
8ad37530b2 Solved another 2 rare concurrency problems - CityInfo.workedTiles and CityInfo.tiles are not edited directly but switched out 2018-12-30 20:40:48 +02:00
Duan Tao
5f3da79484 Fix evalutate peace treaty bug. 2018-12-30 19:22:40 +08:00
Duan Tao
be80aaecda Worker automation leaves great tile improvement alone. 2018-12-30 19:19:06 +08:00
Yair Morgenstern
11066b84e6
Merge pull request #387 from ninjatao/chinese_unique 
Chinese unique ability.
 2018-12-30 07:58:19 +02:00
Duan Tao
f2e6c1b08f Chinese unique ability. 2018-12-30 12:24:01 +08:00
Duan Tao
922a29e60f Worker automation uses more resource. 2018-12-30 11:46:27 +08:00
Yair Morgenstern
30e8af1848
Merge pull request #378 from ninjatao/great_general 
Great general
 2018-12-29 19:54:17 +02:00
Duan Tao
b57a6f65fe Improvement part2, for great general actions. 2018-12-29 10:52:01 +08:00
Yair Morgenstern
48efb4dcd2 Fixed #362 (Cannot upgrade units at 0 resource) 
Great improvements remove terrain features
 2018-12-28 10:09:57 +02:00
Duan Tao
f70c725b85 Code improvement, part 1. 2018-12-28 09:53:30 +08:00
Yair Morgenstern
ec9d23a774 Fixed tiny typo that made game unrunnable 2018-12-27 21:28:59 +02:00
Duan Tao
2e91b9f84e Fix great general automation exception. 2018-12-28 00:00:22 +08:00
Duan Tao
05657ea131 Fix : Avoid addGreatPerson exception. 2018-12-27 23:09:54 +08:00
Duan Tao
2904ed04eb Fix great general bonus. 2018-12-27 11:45:27 +08:00
Duan Tao
6c51073112 Some improvement on ai. 2018-12-27 11:44:30 +08:00
Duan Tao
0e77d5b044 Avoid addGreatPerson exception. 2018-12-27 11:01:07 +08:00
Yair Morgenstern
438be21d0c
Merge pull request #380 from Luyann/patch-1 
Spanish traduction Completed
 2018-12-26 20:39:25 +02:00
Yair Morgenstern
28b52784bf Uranium revealing tech changed to Nuclear Fission 2018-12-26 20:15:14 +02:00
Yair Morgenstern
aca089fa4a Solved notification concurrency exception 2018-12-26 20:08:57 +02:00
Luyann
f61fdd32b2
Spanish traduction Completed 
I finished the spanish traduction
 2018-12-26 15:00:53 -03:00
Yair Morgenstern
81b2eabe92 Lakes are impassible 2018-12-26 19:50:21 +02:00
Duan Tao
2575ffd01f fix general points. 2018-12-26 23:39:20 +08:00
Duan Tao
ae1629fcb0 AI uses great generals. I hope. 2018-12-26 23:30:21 +08:00
Duan Tao
60f59fe2aa Great general provides bonus for nearby friendly land units. 2018-12-26 19:25:07 +08:00
Duan Tao
7478215353 Add great general generation, overview screen and free pickup. 2018-12-26 18:42:22 +08:00
Duan Tao
c3e8563bf2 Add great general unit. 2018-12-26 18:06:36 +08:00
yairm210
39b09f16b2
Merge pull request #377 from ninjatao/indirect_fire 
fix "Indirect Fire" typo.
 2018-12-26 11:46:17 +02:00
Duan Tao
3e5740563f fix "Indirect Fire" typo. 2018-12-26 16:16:37 +08:00
yairm210
c967d058d2
Merge pull request #376 from ninjatao/fix_humanism 
Humanism should increase happiness, instead of science.
 2018-12-26 06:38:47 +02:00
Duan Tao
5dae652c0b Humanism should increase happiness, instead of science. 2018-12-26 10:32:50 +08:00
Yair Morgenstern
6925b0262f Removed deprecated classes and fields from half a year ago 2018-12-25 22:12:11 +02:00
Yair Morgenstern
96d5beeca3 Merge branch 'master' of https://github.com/yairm210/UnCiv 2018-12-25 22:00:07 +02:00
Yair Morgenstern
91630cd687 Victory condition logic moved to VictoryManager 
Victory screen now pops up when you fulfill the victory conditions =D
Added "One more turn" mode, if people want to play after the victory conditions have been fulfilled
 2018-12-25 21:59:37 +02:00
yairm210
cb30f87c09
Merge pull request #374 from rodrigocaruso/patch-1 
Added Portuguese translations
 2018-12-25 21:18:20 +02:00
Yair Morgenstern
f66e54a127 Fixed "camel archer melee unit" and "sydney opera house 0 turns to build" bugs 2018-12-24 20:50:36 +02:00
yairm210
885070de99
Merge pull request #373 from ninjatao/fix_new_game_crash 
Avoid crash from giving ai free techs.
 2018-12-24 16:08:13 +02:00
Duan Tao
e3c9567904 Avoid crash from giving ai free techs. 2018-12-24 20:01:32 +08:00
yairm210
a6716f2a40
Merge pull request #368 from ninjatao/fix_declare_war 
Fixed : can repeatly declare war.
 2018-12-22 18:32:06 +02:00
Duan Tao
3491a1841a Fixed : can repeatly declare war. 2018-12-22 12:29:17 +08:00
Yair Morgenstern
faf5803b1d Cleaned up UnitAutomation.TryGarrison 
Added explainations of various map generation techniques
 2018-12-21 11:51:57 +02:00
yairm210
e24c50f1b6
Merge pull request #366 from ninjatao/diplomacy_stats 
Mark defeated civs in diplomacy screen.
 2018-12-21 11:17:30 +02:00
Duan Tao
b4fa88cada Remove extra word to prevent the label from being too long. 2018-12-21 16:41:48 +08:00
Duan Tao
6124474b4f Mark defeated civs in diplomacy screen. 2018-12-21 16:35:03 +08:00
yairm210
9ca77fa399
Merge pull request #365 from ninjatao/update_resource_display_on_unit_upgrade 
Updates topbar display on unit upgrade.
 2018-12-21 09:46:09 +02:00
Duan Tao
b2a95e039e Updates topbar display on unit upgrade. 2018-12-21 13:51:54 +08:00