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

839 commits

Author SHA1 Message Date
Yair Morgenstern
6dc471850e Trades are no longer instantaneous, but consist of sending a trade request on the requestor's turn and accepting/denying it on the reciever's turn. 
This allows us to FINALLY enable trade between human players, enables PvP in hotseat multiplayer, and paves the way to real multiplayer!
 2019-07-29 16:31:21 +03:00
Yair Morgenstern
98eb4c8cd7 Travis test + minor fixes 2019-07-27 23:21:40 +03:00
Yair Morgenstern
b131372b13 Fixed "units from ruins block activating unit" bug and fixed colors for new city states 2019-07-27 22:34:57 +03:00
Smashfanful
99bce1de30 Update Nations_Italian.json 
Corrections
 2019-07-25 18:37:39 +03:00
Smashfanful
7a9594775f Update Nations_Italian.json 
Added Almaty and Edimurgh
 2019-07-25 18:37:39 +03:00
Smashfanful
4589c52b21 Update Nations.json 
Corrections
 2019-07-25 18:37:20 +03:00
Smashfanful
bd3ebf688c Update Nations.json 
Added Almaty and Edimurgh
 2019-07-25 18:37:20 +03:00
Smashfanful
8f8ab75182 Update Units,Promotions.json 2019-07-25 18:35:49 +03:00
Smashfanful
0db114af0c Update NewGame,SaveGame,LoadGame,Options.json 2019-07-25 18:35:24 +03:00
Smashfanful
5bf7ca0762 Update Tutorials_Italian.json 
Italian Update for Tutorials
 2019-07-25 18:34:56 +03:00
Yair Morgenstern
994e313101 Added Game Speed option - part of #559 2019-07-24 18:35:06 +03:00
Yair Morgenstern
7d38841eb8 Added tutorial for 'Next unit' 2019-07-24 17:58:32 +03:00
Yair Morgenstern
2c10ce2fb5 Memory performance tweaks 
Renamed nation Main and Secondary to Outer and Inner colors, to be more clear what we're laking about
 2019-07-24 11:55:10 +03:00
Smashfanful
d33a553d58 Update Diplomacy,Trade,Nations.json 2019-07-23 18:30:33 +03:00
Yann
db9f776e1f Update French version of Diplomacy,Trade,Nations 2019-07-22 16:27:56 +03:00
Yann
8e404b548e Update French version of Buildings.json 2019-07-22 16:27:41 +03:00
Yann
0000c95693 Update French version of Units.promotions.json 2019-07-22 16:27:27 +03:00
Yann
f4600038fb Update French version of Notifications.json 2019-07-22 15:53:10 +03:00
Yann
08d7c75fa8 Update French version of Other.json 2019-07-22 15:52:20 +03:00
Yair Morgenstern
e73ad76227 Resolved #931 - added Barbarian Brute as a replacement to the Warrior 2019-07-21 22:49:04 +03:00
Yair Morgenstern
e9e0e55b5e Resolved #952 - fixed building requirements for Neuschwanstein, Stone Works, Windmill and Spaceship Factory 2019-07-21 19:54:16 +03:00
Yair Morgenstern
c7042dd5cf Resolved #948 - Seaport requires Harbor 2019-07-21 19:44:20 +03:00
Yair Morgenstern
99274ccda1 Resolved #949 - could construct Ironworks without Workshops 2019-07-21 19:41:17 +03:00
Yair Morgenstern
7d8e3f76c3 Destroyers now have a chance to intercept air attacks 2019-07-19 15:24:44 +03:00
Yair Morgenstern
558bba44cc Added Anti-Aircraft gun unit, and intercept range on non-ranged units 2019-07-19 14:40:29 +03:00
Yair Morgenstern
b565489fd5 Changed "free population" in cities to "unassigned population" to be less confusing 2019-07-19 14:01:16 +03:00
Yair Morgenstern
90318ef93b Tech reorg - added Lasers and Mobile Tactics, tech tree is now almost 100% G&K 2019-07-17 22:21:05 +03:00
Yair Morgenstern
0ba243c5d8 Added Bomber unit 2019-07-17 21:33:33 +03:00
Yair Morgenstern
dd0cdac077 Fixed italian crash 2019-07-17 21:23:37 +03:00
Smashfanful
c406d01de5 Update Units,Promotions.json 2019-07-17 20:10:07 +03:00
Smashfanful
a4f360de3b Update Units,Promotions.json 
Added new lines
 2019-07-17 20:10:07 +03:00
Smashfanful
749771daf4 Update Techs.json 2019-07-17 12:53:58 +03:00
Yair Morgenstern
8f30db74ab Added Radar tech and Fighter unit 2019-07-16 22:52:15 +03:00
Yair Morgenstern
b9a7f7e1d0 Added Great War Bomber 
Air units now require Oil
 2019-07-15 22:45:32 +03:00
Smashfanful
23c221abd3 Update Nations_Italian.json 2019-07-14 17:41:14 +03:00
Smashfanful
b43bd88f07 Update Nations.json 
Changed Oslo in Venice, changed Ur's colours, and added Sidon
 2019-07-14 17:36:20 +03:00
Yair Morgenstern
7bbd006180 Added BFS for arial movement 2019-07-13 22:48:47 +03:00
Smashfanful
367e1d8517 Update Nations.json 
Added Tyre, Ur, Brussels, Kabul, Oslo and Genoa (hopefully)
 2019-07-13 22:39:23 +03:00
Yair Morgenstern
d9942aec7c Added all promotions for air units, and a couple for other units that were previously missed 2019-07-11 22:35:22 +03:00
Yair Morgenstern
e78f408bff Translation fixes 2019-07-11 21:21:45 +03:00
Smashfanful
a8b2a4471e Update Other.json 2019-07-11 21:19:06 +03:00
Smashfanful
2118fde87b Update Notifications.json 2019-07-11 21:17:32 +03:00
Smashfanful
002bec7ba7 Update Units,Promotions.json 2019-07-11 21:15:26 +03:00
Smashfanful
35edf4874f Update Nations_Italian.json 2019-07-11 21:14:53 +03:00
Smashfanful
977ba5f5e9 Update Diplomacy,Trade,Nations.json 2019-07-11 21:14:41 +03:00
Smashfanful
9780be455d Update Diplomacy,Trade,Nations.json 2019-07-11 21:14:41 +03:00
Duan Tao
cae3d49738 Add notification translation. 2019-07-11 10:05:29 +03:00
Duan Tao
a8e248b892 Add Militaristic type city-state. 2019-07-11 10:05:29 +03:00
Yair Morgenstern
214b4880e4 AIR UNITS ARE GO! 
Added interception and basic air unit AI
 2019-07-10 22:41:44 +03:00
Smashfanful
d7cfdf3e83 Update Nations_Italian.json 2019-07-10 19:17:26 +03:00
Smashfanful
f4acd3005d Update Diplomacy,Trade,Nations.json 2019-07-10 19:16:29 +03:00
Yair Morgenstern
ab7ce12a87 Resolved #687 - can now place starting locations for specific civs in the map editor 2019-07-07 23:55:43 +03:00
Yair Morgenstern
070d780e18 Unit table now displays range for ranged units 
Air units are ranged units
Moving air units around now works completely!
 2019-07-05 14:27:39 +03:00
Yair Morgenstern
8d79cca70d Fixed Ottomans naval capture unique 2019-07-05 12:23:58 +03:00
Yair Morgenstern
185ec10f10 Can now see when city contains air units 2019-07-03 23:32:17 +03:00
Smashfanful
273b06aa3a Update Other.json 
Italian corrections.
 2019-07-02 12:15:48 +03:00
Am-per-Sand
275fa5842a Shorten city screen strings of Other.json 
Stopped population growth
...turns to lose/new population
expansion turns to, - stopped
 2019-06-30 22:25:13 +03:00
Yair Morgenstern
0eb28b9ae7 Great General bonus affects naval units (as long as we don't have Great Admirals in the game) 2019-06-30 19:48:47 +03:00
Am-per-Sand
12b9472805 Fixed same name for different units bug 2019-06-29 23:17:46 +03:00
Smashfanful
06d1bd6881 Update Nations_Italian.json 2019-06-27 11:38:33 +03:00
Smashfanful
ac664d97c9 Update Units,Promotions.json 2019-06-27 07:26:05 +03:00
Am-per-Sand
ad2704f6af typo fix in Notifications 2019-06-27 07:25:28 +03:00
Yair Morgenstern
921dd28296 Unified "Bonus vs" translations 2019-06-25 23:09:58 +03:00
Yair Morgenstern
c517dd9d64 Added the Ottomans! #703 2019-06-25 23:00:55 +03:00
Yair Morgenstern
7e50f70bd5 Resolved #899 - Added setting to disable city auto-picking construction 2019-06-24 19:35:45 +03:00
Smashfanful
2f97ed54c0 Update NewGame,SaveGame,LoadGame,Options.json 2019-06-24 14:48:55 +03:00
Smashfanful
469553de14 Update Nations.json 2019-06-24 12:35:04 +03:00
Smashfanful
78ad8a932a Update Nations_Italian.json 2019-06-24 08:11:24 +03:00
Smashfanful
be02ad5839 Update Diplomacy,Trade,Nations.json 
Added other leaders
 2019-06-24 08:11:07 +03:00
Yair Morgenstern
3b9ab43bbe Resolved #898 - added option to disable tutorials 2019-06-24 06:43:51 +03:00
Yair Morgenstern
d9bd0fa6b8 Resolved #897 - split initial tutorial, which was too long, into several parts 2019-06-24 06:37:45 +03:00
Smashfanful
18d7446fab Update Diplomacy,Trade,Nations.json 
Added Leader names
 2019-06-23 08:56:40 +03:00
Smashfanful
bc26edfe81 Update Other.json 
Added new translation lines
 2019-06-23 08:56:17 +03:00
Smashfanful
d0dc3e4bd6 Update Nations_Italian.json 2019-06-22 23:23:42 +03:00
Smashfanful
418bc140e8 Update Units.json 
I f**king messed up Ballista. HOORRAAY!
 2019-06-21 13:47:03 +03:00
Smashfanful
af295f4fab Update Units.json 
Added Composite Bowman
 2019-06-21 13:20:39 +03:00
Smashfanful
beedcc5896 Update Buildings.json 
Corrections and additions
 2019-06-20 20:44:30 +03:00
Smashfanful
d39e57bf46 Update Units,Promotions.json 
Added Landsknecht
 2019-06-19 10:40:07 +03:00
Smashfanful
353d6a6557 Update Notifications.json 2019-06-17 20:41:51 +03:00
Smashfanful
9c0995ad5a Update Nations_Italian.json 2019-06-17 20:41:07 +03:00
Smashfanful
a18616a25b Update Diplomacy,Trade,Nations.json 2019-06-17 20:40:31 +03:00
Yair Morgenstern
853a325876 Added German nation - #703 2019-06-17 11:20:15 +03:00
Smashfanful
eb711b9a79 Update Diplomacy,Trade,Nations.json 
Added new translation lines
 2019-06-16 20:40:34 +03:00
Smashfanful
be7baaa117 Update NewGame,SaveGame,LoadGame.json 2019-06-16 18:42:54 +03:00
Smashfanful
0726e7799d Update Notifications.json 
New Translation lines
 2019-06-16 18:42:32 +03:00
david.enrique
56ff436f94 Add victory type choice on new game screen 2019-06-15 22:38:02 +03:00
Smashfanful
f50e9c186d Update Other.json 2019-06-15 22:28:16 +03:00
Yair Morgenstern
5943d1e12e Apollo Program is now a NATIONAL wonder, so multiple civs can compete for Science Victory 2019-06-13 22:10:52 +03:00
Smashfanful
5ddd4c7d7b Update Nations.json 
Added Siamese (in comments)
 2019-06-13 15:23:56 +03:00
Smashfanful
6d82e42e1c Update Nations_Italian.json (#869) 
* Update Nations_Italian.json

Corrections

* Update Nations_Italian.json

* Update Nations_Italian.json
 2019-06-13 15:23:31 +03:00
Yair Morgenstern
b7be0e7934 Each Civ now has a preferred victory type, and makes construction choices based on said type 2019-06-12 22:01:37 +03:00
Smashfanful
772a825cfa
Update Diplomacy,Trade,Nations.json 2019-06-10 16:02:53 +02:00
Yair Morgenstern
d5a0894f75 Added diplomatic reprecissions for demands that the other civs is unwilling to fulfil 
Removed WeAgreedNotToSettleNearThem flag - was reverse copy of AgreedNotToSettleNearUs
 2019-06-10 16:18:59 +03:00
Smashfanful
477a4c4dc4 Update Other.json 
Added some Italian translations
 2019-06-09 22:37:22 +03:00
denrique88
0803063017 Correction of french translation of the tutorial 2019-06-09 22:29:43 +03:00
Yair Morgenstern
84bcfe2d39 Added "Community" tab in the menu, with links to the Github and Discord 2019-06-07 15:55:48 +03:00
Smashfanful
8e9fc1108e Update Diplomacy,Trade,Nations.json 
New Italian translations
 2019-06-07 14:32:56 +03:00
Smashfanful
5451eb0540 Update Nations_Italian.json 
Corrections. That must be the cause for the crashes in the Italian version.
 2019-06-07 14:32:21 +03:00
Yair Morgenstern
f713d266db Implemented "Don't settle cities near us", which goes both ways - a good basis for further demands (#831) 2019-06-07 13:04:18 +03:00
Yair Morgenstern
e8bdb8a2e4 Added initial logic for promising not to settle cities near other civs - not yet activated 2019-06-05 23:21:17 +03:00
Yair Morgenstern
ab450808b2 Can no longer pass the turn when popups have not been dealt with 2019-06-05 23:18:03 +03:00
Smashfanful
0153added5 Update Nations.json 2019-06-04 18:04:11 +03:00
Smashfanful
a039c6592b Update Nations.json 
Corrections and addition of Greek unique
 2019-06-04 18:04:11 +03:00
Smashfanful
3e22cdf72d Update Nations_Italian.json 2019-06-04 18:03:34 +03:00
Smashfanful
0cedc1a5e8 Update Nations_Italian.json 
Added Greek Unique
 2019-06-04 18:03:34 +03:00
Smashfanful
9bfa71898a Update Units.json 2019-06-04 12:34:28 +03:00
Smashfanful
d8d5274c9e Update Units,Promotions.json 2019-06-04 12:33:52 +03:00
Yann
f0293b5f2a Update French Translation for Diplomacy,Trade,... 2019-06-04 12:33:05 +03:00
Smashfanful
5dcaaab0d1 Update Italian Translation Other 
Added a missing Italian translation
 2019-06-04 12:32:37 +03:00
Yann
e7bd6fb0b3 Update French Translation of NewGame,SaveGame,... 2019-06-04 12:32:04 +03:00
Yann
9b7baa6a9e Update French Translation on Notification 2019-06-04 12:31:37 +03:00
Yann
493d21ff54 Update French Translation of Buildings 2019-06-04 12:31:03 +03:00
Yann
6f0016134d Update French Translation of Units.Promotions 2019-06-04 11:13:32 +03:00
Yann
1b5960477c Update French Translation of Other 2019-06-04 11:13:04 +03:00
Yair Morgenstern
cf37122304 Translation organization 2019-06-02 23:31:16 +03:00
Smashfanful
28eb9e61d4 Update Nations.json 
Added some correction proposings
 2019-06-02 19:43:40 +03:00
Smashfanful
40831ca17d Update Nations_Italian.json 
Added Mongols and corrected some lines
 2019-06-02 19:43:12 +03:00
Smashfanful
7803d3ebdf Update Nations.json 
Added two propositions for City-States
 2019-06-02 17:25:57 +03:00
Smashfanful
ca9b39a4c6 Update Nations_Italian.json 2019-06-02 17:25:23 +03:00
Smashfanful
8fc4ed6491 Update Notifications.json 2019-06-02 17:25:06 +03:00
Yair Morgenstern
36da3359db Added denunceation 2019-06-01 23:20:02 +03:00
Yair Morgenstern
f60ebbb7e1 Civs clearing an encampment now get gold 2019-06-01 22:47:41 +03:00
Yair Morgenstern
4b4f5e77b8 Resolved #646 - Barbarians now spawn from Encampments! 2019-05-31 17:36:19 +03:00
Yair Morgenstern
b068e6f88f Minor translation changes 2019-05-30 19:57:27 +03:00
Yair Morgenstern
b9cf40487f Performance improvements for Next Turn 2019-05-29 22:10:32 +03:00
Smashfanful
85c86e0b02 Update Buildings.json 
Added some unique units and corrected some Italian lines
 2019-05-29 17:31:32 +03:00
Yair Morgenstern
3fbcc019e3 There were somes things that were in the translations files but weren't translated in-game 2019-05-28 23:43:18 +03:00
Smashfanful
8f81fd0c3d Update Tutorials_Italian.json 2019-05-28 22:54:43 +03:00
Smashfanful
a285a8031c Update Other.json 2019-05-28 16:58:25 +03:00
Smashfanful
b190524ae3 Update Notifications.json 2019-05-28 16:57:11 +03:00
Smashfanful
db99683090 Update Nations.json 
Corrections
 2019-05-28 16:56:47 +03:00
Smashfanful
a2efab3378 Update Nations_Italian.json 
Added City-States
 2019-05-28 16:56:18 +03:00
Smashfanful
c01acee372 Update Units,Promotions.json 
Added Indian unique unit
 2019-05-27 17:11:52 +03:00
Smashfanful
034b3dfa5e Update Buildings.json 
Added Indian unique building
 2019-05-27 17:11:27 +03:00
Smashfanful
147779b0e8 Update Other.json (#807) 
Italian translations to City-States
 2019-05-27 17:10:54 +03:00
Yair Morgenstern
a204333410 Added countdown to relationship change with city states 2019-05-26 18:52:32 +03:00
Yair Morgenstern
1bb62ad681 Civs respond according to neutral/hate and respond properly after peace 2019-05-26 18:32:19 +03:00
Yair Morgenstern
408dfcfc7e Final touches to City States, and they're ready to roll! 2019-05-26 16:10:09 +03:00
Smashfanful
e4125e52c0 Update Nations_Italian.json 
Added Indian intro phrases
 2019-05-26 15:32:37 +03:00
Smashfanful
a67fc9d55d Update Other.json 2019-05-25 23:14:18 +03:00
Smashfanful
89854ec195 Update Nations_Italian.json 2019-05-25 23:13:46 +03:00
Yair Morgenstern
25fc1b3c71 Last fixes for Indian nation! 
Checks for specific buildings now work for all civ-unique buildings as well
 2019-05-24 13:59:00 +03:00
Yair Morgenstern
7e6b102f27 Merge branch 'roadOnLongClick' 2019-05-23 22:21:46 +03:00
Smashfanful
f988279f1d Update Other.json 
Another Italian translation
 2019-05-23 16:27:06 +03:00
Smashfanful
fcdb609b0e Update Notifications.json 
Italian Translations
 2019-05-23 16:26:11 +03:00
martin
6bd06474bd improved overview city screen 
- dynamic layout
- cities and units sorted by name
- jump-to buttons for cities
- rounded values in statistics
 2019-05-23 16:25:47 +03:00
martin
d676c18aec adding MapUnitAction.name(), a user-readable name for actions. Eg "Moving" instead of "moveTo x,y" 2019-05-23 07:57:34 +03:00
martin
98803f0454 implementing BuildLongRoadAction 2019-05-22 22:23:03 +03:00
Yair Morgenstern
c83844f600 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-05-22 22:08:14 +03:00
Smashfanful
798adad4a9 Update Other.json 
More Italian translations.
 2019-05-22 22:07:59 +03:00