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

1112 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
yairm210
230bb0549b
Merge pull request #363 from ninjatao/update_stats_after_acquire 
After acquiring tile from nearby city, update stats.
 2018-12-20 17:53:52 +02:00
Duan Tao
23799ce80c After acquiring tile from nearby city, update stats. 2018-12-20 23:12:54 +08:00
yairm210
d041ce75a7
Merge pull request #361 from ninjatao/map_gen 
Better arrange deserts, tundras and lakes.
 2018-12-20 14:45:50 +02:00
Duan Tao
9ff6764df2 Better arrange deserts, tundras and lakes. 2018-12-20 15:32:14 +08:00
yairm210
3ce89e1928
Merge pull request #358 from ninjatao/map_gen 
Add celluar automica map generator.
 2018-12-20 06:42:12 +02:00
Duan Tao
5496a5e640 Add pangaea map type. Add options. 2018-12-20 11:58:54 +08:00
Yair Morgenstern
51b62028a8 Maybe solved a concurrency-related java.lang.IllegalArgumentException from CameraStageBaseScreen.render 
It's hard to tell because it only crops extremely randomly in, like, 1 in a 1000 games, and the users just continue on with their lives,
But it's a crash record and we want 0 of those!
 2018-12-19 19:53:53 +02:00
Yair Morgenstern
a677850084 Water units can enter cities 2018-12-19 19:36:18 +02:00
Yair Morgenstern
f19750409d Buying techs now enables their uniques immediately - kudos ingvart! 2018-12-19 19:20:57 +02:00
rodrigocaruso
b9fe6f3832
Added Portuguese translations 2018-12-19 10:46:57 -02:00
Duan Tao
c18b64f10f Add celluar automica map generator. 2018-12-19 19:47:36 +08:00
Yair Morgenstern
a1a2b89949 Added various attack sounds, for different types of units 2018-12-18 22:32:04 +02:00
yairm210
0491b21956
Merge pull request #356 from ninjatao/auto_railroad 
Auto build railroad.
 2018-12-18 20:22:38 +02:00
Yair Morgenstern
e3926764f2 Difficulty is now game-wide, in preparation for multiplayer 
Apparently choosing difficulty...didn't actually do anything until now, which is an embarrasing oversight and explains why people thought the game was too hard even on easy mode...
 2018-12-18 19:26:56 +02:00
Yair Morgenstern
b054a3ff4a Work boats can't "create improvement" on tiles that already have an improvement 2018-12-18 18:58:07 +02:00
Yair Morgenstern
6bdd0da3ea Notifications are now per-civ instead of game-wide, in preparation for multiplayer 
Added player type to civinfo, in preparation for multiplayer
 2018-12-18 18:57:13 +02:00
Duan Tao
f717645019 Auto build railroad. 2018-12-18 10:19:57 +08:00
Yair Morgenstern
2923dc80c9 Massive performance improvement thanks to: 
* not mapping out the uniques every tile
* saving tech uniques and units uniques specific to movement between tiles
 2018-12-17 21:33:07 +02:00
Yair Morgenstern
30734c7287 Changed the basic click because the other one decided to stop working 2018-12-17 19:37:00 +02:00
Yair Morgenstern
94fd43f422 Added icon for lakes 
Added more sound effects
Added Leaning Tower of Pisa
 2018-12-17 19:00:45 +02:00
Yair Morgenstern
3edc95dd3e Added whoosh sound when telling units to move 2018-12-17 14:46:01 +02:00
Yair Morgenstern
319cfd1fe9 Added sound effect for purchasing constructions and tiles 2018-12-17 13:24:48 +02:00
Yair Morgenstern
fd2d55876d Added unique sound effects for multiple actions 2018-12-17 13:11:50 +02:00
yairm210
978dac806f
Merge pull request #355 from ninjatao/fish_boat 
AI uses work boats.
 2018-12-17 11:47:33 +02:00
Yair Morgenstern
82f9f64fab Added first sound effect, and sound effect volume control settings 
As of now, every single button in the game has the same click sound, but that will change
 2018-12-17 11:45:24 +02:00
Duan Tao
b95192006e Fix safe call. 2018-12-17 17:22:54 +08:00
Yair Morgenstern
f5c8b28d82 Organized Modern Era techs 
Free techs are added like regular techs - with all the abilities and notifications thereof
 2018-12-17 10:49:13 +02:00
Duan Tao
9dab9cd556 AI uses work boats. 2018-12-17 16:24:14 +08:00
yairm210
e46682cb21
Merge pull request #350 from ninjatao/try_land_before_attack 
Embarked land unit try to land before attack on water.
 2018-12-16 06:51:15 +02:00
Yair Morgenstern
d1c7117c54 Mountains no longer appear in ranges - caused untenable starting positions 
Lakes now appear randomly!
 2018-12-14 13:46:52 +02:00
Duan Tao
81b891564e Embarked land unit try to land before attack on water. 2018-12-14 19:38:30 +08:00