Skip to content
Merged

Sync #511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
127 commits
Select commit Hold shift + click to select a range
ba0741b
Replaced Zenith with Starlight in Planet68 tips (final Empire mission)
Thorneel Nov 19, 2019
1133d60
Revert "Replaced Zenith with Starlight in Planet68 tips (final Empire…
Thorneel Nov 19, 2019
0ae1636
Merge branch 'master' into ThornEel-new-campaign-scenario
Thorneel Nov 19, 2019
37d147e
Revert "Merge branch 'master' into ThornEel-new-campaign-scenario"
Thorneel Nov 19, 2019
9f3e7dc
Revert "Revert "Merge branch 'master' into ThornEel-new-campaign-scen…
Thorneel Nov 19, 2019
5eb6882
Merge branch 'master' into ThornEel-new-campaign-scenario
Thorneel Dec 10, 2019
c768fb0
Added threats codex entries
Thorneel Dec 10, 2019
f9c2546
Added codex for starting, Union planets: planet1, planet2, planet3, p…
Thorneel Feb 2, 2020
52482b1
Added missing entry unlock on planet1
Thorneel Feb 2, 2020
28f3dee
Merge branch 'master' into ThornEel-new-campaign-scenario
Thorneel Feb 2, 2020
9651078
Added Empire and Rebels codex entries, added a line to the Union one
Thorneel Feb 3, 2020
f8a42c7
Added entry for the battle of Karuwal: planet62 - fixed the /n instea…
Thorneel Feb 5, 2020
82d5756
Added Lawless, Haven and most of the Rebels storyline: planet28, plan…
Thorneel Feb 8, 2020
605aaf9
Added Tempest location, planet59
Thorneel Feb 8, 2020
ba33d83
Added final Rebels storyline entry: planet66
Thorneel Feb 8, 2020
4834cde
Lalata (Jugglenaut + Newton):
GoogleFrog Feb 9, 2020
2471774
Removed the starting Constable jump from the Newton mission.
GoogleFrog Feb 9, 2020
60a2601
Try not copying non-tables in chili.
GoogleFrog Feb 9, 2020
58855ab
Tweaked a few entries, replaced defence with defense in briefings for…
Thorneel Feb 9, 2020
b1a19d3
Added the Anarchai faction for Haven storyline: planet32
Thorneel Feb 9, 2020
320d04b
Merge pull request #727 from Spring-Chobby/master
GoogleFrog Feb 10, 2020
2dd0634
Made allied AIs Normal in Easy campaign difficulty.
GoogleFrog Feb 10, 2020
48d8c68
Removed some of the enemy heavies on Easy from Scorpion and Phoenix m…
GoogleFrog Feb 10, 2020
704fe4e
Remove some starting Minotaurs from Scorpion Easy.
GoogleFrog Feb 10, 2020
7ab27de
Reduced the skill of an ally for the Easy Scorpion mission (to cut do…
GoogleFrog Feb 10, 2020
7cd821b
Fixed Kirdipan Dirtbags.
GoogleFrog Feb 12, 2020
c6658a7
VERSION{v1.8.2.0}
GoogleFrog Feb 14, 2020
252667c
Replaced two solars in mission 33 with a fusion.
Aquanim Feb 14, 2020
6f31f8f
Fixed duplicate Generic.
GoogleFrog Feb 17, 2020
95b7ee2
gl.HasExtension("GL_ARB_tessellation_shader") analytics.
GoogleFrog Feb 17, 2020
cb34357
Merge pull request #728 from Aquanim/master
GoogleFrog Feb 20, 2020
e546b76
VERSION{v1.8.2.1}
GoogleFrog Feb 20, 2020
edcb8ae
VERSION{v1.8.2.2}
GoogleFrog Feb 21, 2020
84da760
Finished the Haven storyline: planet33, planet57, planet60, planet67
Thorneel Mar 3, 2020
a33dc81
Merge branch 'master' into ThornEel-new-campaign-scenario
Thorneel Mar 3, 2020
48cc7f8
Hide playerchickens modoption (gebörk)
sprunk Mar 7, 2020
ada5c3b
Update planet 21 (Vis Ragstrom) to Otago 1.4
sprunk Mar 11, 2020
15cc916
Updated modoptions and exempted Kirdipan for terraform blocking.
GoogleFrog Mar 11, 2020
2dad4e8
Removed the duplicate dev campaign files.
GoogleFrog Mar 13, 2020
e9bf27c
Added the Circuit config from 29 days ago as "AI: Economist Personali…
GoogleFrog Mar 13, 2020
b6843b8
Update Sapphire (planet 63) Shores to V2.2
sprunk Mar 17, 2020
b5a090d
Planet 63: fix chicken difficulty config
sprunk Mar 18, 2020
8c90237
VERSION{v1.8.3.0}
GoogleFrog Mar 18, 2020
7aeee02
Steam invite no longer joins server party (they are only for MM and t…
GoogleFrog Mar 21, 2020
49f5dbe
Reverse-compatible changes to make queue sorting more robust.
GoogleFrog Mar 25, 2020
aeb131b
Added a battle proposal system for local testing.
GoogleFrog Mar 28, 2020
26dca7d
Tested and fixed proposal system.
GoogleFrog Mar 28, 2020
2c6f365
Made proposals persist after the battle is hosted.
GoogleFrog Mar 28, 2020
36444db
Finished the Empire storyline: planet51, planet61, planet64, planet65…
Thorneel Mar 31, 2020
52bdbe3
Merge branch 'master' into ThornEel-new-campaign-scenario
Thorneel Mar 31, 2020
80f1956
Various codex and planet bugfixes
Thorneel Mar 31, 2020
d8bb206
Config compatibility for removing dev campaign.
GoogleFrog Apr 2, 2020
6442b0c
Add Bolas to campaign (unlock, technology screen description/icon, av…
Aquanim Apr 2, 2020
c177dc3
Update campaign/sample/planets/planet27.lua
GoogleFrog Apr 2, 2020
fccb0a6
Merge pull request #730 from Aquanim/add-bolas-campaign
GoogleFrog Apr 2, 2020
85000aa
Fixed Crane description.
GoogleFrog Apr 4, 2020
8e79170
Update campaign module descriptions.
GoogleFrog Apr 4, 2020
40e60d9
VERSION{v1.8.4.0}
GoogleFrog Apr 4, 2020
eac6326
VERSION{v1.8.4.1}
GoogleFrog Apr 4, 2020
d4ede25
Sync chili. Mainly made noFont not even create fonts.
GoogleFrog Apr 6, 2020
ca66291
Fix incidental bug report.
GoogleFrog Apr 9, 2020
b079c57
Update CircuitAI
rlcevg Apr 14, 2020
b70f40d
Fix #734 (use https in links)
sprunk Apr 17, 2020
01f35ae
Merge pull request #735 from ZeroK-RTS/sprunk-patch-1
GoogleFrog Apr 17, 2020
b3de5f2
add language selector with options de,en
Anarchid Apr 18, 2020
e2b0ecb
fix typo
Anarchid Apr 18, 2020
e3c1463
Limit campaign storyline to availability of missions
Porkch0p Apr 21, 2020
dc80d66
Campaign - Invite Friends with Icon
Porkch0p Apr 21, 2020
c2a83a8
Campaign Planet View Layout Adjustments
Porkch0p Apr 21, 2020
5c2298e
Reduce duplication in Story Gate
Porkch0p Apr 22, 2020
07b7b0d
Merge branch 'campaign-story-gate' into campaign-ui-layout
Porkch0p Apr 22, 2020
e66e9f1
Include x,y change from #739
Porkch0p Apr 22, 2020
f38af9c
Merge pull request #740 from Porkch0p/campaign-invite-button
GoogleFrog Apr 22, 2020
f5ad9fc
Merge pull request #739 from Porkch0p/campaign-story-gate
GoogleFrog Apr 22, 2020
cc3ebe5
Merge pull request #738 from Anarchid/language-selector
GoogleFrog Apr 22, 2020
29eca3c
Campaign Window Scaling for Higher Resolutions
Porkch0p Apr 26, 2020
7659c9e
Merge branch 'master' into campaign-ui-layout
Porkch0p Apr 26, 2020
66f3501
Chobby CPU Flag to Minimize Draw Updates
Porkch0p May 6, 2020
f2c4b9a
Merge pull request #742 from Porkch0p/chobby-reduce-updates
GoogleFrog May 6, 2020
d5369a1
Added entries for varied planets outside of the main storylines: plan…
Thorneel May 9, 2020
8fc22c8
Merge branch 'master' into ThornEel-new-campaign-scenario
Thorneel May 9, 2020
d79afa2
Merge pull request #732 from rlcevg/ai_update2
GoogleFrog May 10, 2020
3fbcc61
Merge pull request #741 from Porkch0p/campaign-ui-layout
GoogleFrog May 10, 2020
38cbb00
Merge pull request #743 from Thorneel/ThornEel-new-campaign-scenario
GoogleFrog May 10, 2020
e21c20f
Stopped truncating chili errors.
GoogleFrog May 10, 2020
2f84f91
Sync IterableMap.
GoogleFrog May 10, 2020
6ef78da
Convert codex to literal strings. Fix treeview.
GoogleFrog May 10, 2020
bf4a587
Centred planet image.
GoogleFrog May 10, 2020
589989d
Fixed some jagged edges in the campaign UI.
GoogleFrog May 10, 2020
297f99e
Moved the difficulty setting box.
GoogleFrog May 10, 2020
5bb2c57
Fix priority popup clickthrough.
GoogleFrog May 10, 2020
c388f63
Highlight Commander tab when a new level is available.
GoogleFrog May 10, 2020
fc2017e
WIP popup and button for new players to find the tutorial.
GoogleFrog May 11, 2020
db8ac02
Disable steam release notifier.
GoogleFrog May 12, 2020
0c9814d
Fixed the texture-loading hider.
GoogleFrog May 12, 2020
59502c3
Added tutorial prompt.
GoogleFrog May 12, 2020
f41113a
Configuration.
GoogleFrog May 12, 2020
f5a954b
Made the help text for planet 1 more explanatory, now that players co…
GoogleFrog May 12, 2020
c47c8bc
Fixed some image preloading.
GoogleFrog May 12, 2020
a3403b3
Fix image preload in a "better" way.
GoogleFrog May 12, 2020
6d363fb
"fix" a bug.
GoogleFrog May 12, 2020
99bd78b
Paint the shed.
GoogleFrog May 12, 2020
d4cf894
coat the paint
Anarchid May 12, 2020
0b9b3fe
Merge pull request #744 from Anarchid/patch-1
GoogleFrog May 12, 2020
8c902e3
Applied the network settings from BAR.
GoogleFrog May 12, 2020
934bdea
Made codex entries unlock for planets that were completed on old saves.
GoogleFrog May 13, 2020
a74fb7b
Replaced warmind with gestalt
Thorneel May 13, 2020
5af17aa
Merge branch 'master' into ThornEel-new-campaign-scenario
Thorneel May 13, 2020
5d30b04
Replaced warmind with gestalt
Thorneel May 13, 2020
80d5fe9
Changed the "interception network" titles into "network" so it would …
Thorneel May 13, 2020
0bb1af8
Removed references to "Assault" Commander for the hero Commander's model
Thorneel May 13, 2020
54f523d
Update zk_loopback.lua
DeinFreund May 16, 2020
e160ca8
Update interface_zerok.lua
DeinFreund May 16, 2020
02a5beb
Merge pull request #745 from ZeroK-RTS/DeinFreund-uuid
GoogleFrog May 17, 2020
c48e01e
New icons for some of the codex entries
Thorneel May 18, 2020
764309c
Added a few more icons to codex entries
Thorneel May 19, 2020
4e930c8
Delete taprime.
GoogleFrog May 20, 2020
9d814fc
Merge branch 'master' of https://github.com/Spring-Chobby/Chobby
GoogleFrog May 20, 2020
3e13046
Some fixes.
GoogleFrog May 20, 2020
afef24c
Broke the ability to connect to ZKLS.
GoogleFrog May 20, 2020
20c678b
Removed map grass again.
GoogleFrog May 22, 2020
7d11a0d
Heavy turret tips for Kirdipan.
GoogleFrog May 22, 2020
86cb212
Maybe fix #598.
GoogleFrog May 23, 2020
a1a3fd0
Added missing icons to codex entries
Thorneel May 23, 2020
27736ba
Merge branch 'master' into ThornEel-new-campaign-scenario
Thorneel May 23, 2020
9da42be
Pulled comment out of the Chickens entry text. Added a small comment …
Thorneel May 23, 2020
8696e60
Merge pull request #747 from Thorneel/ThornEel-new-campaign-scenario
GoogleFrog May 24, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
22 changes: 21 additions & 1 deletion LuaMenu/configs/gameConfig/zk/ModOptions.lua
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

-- $Id: ModOptions.lua 4642 2009-05-22 05:32:36Z carrepairer $


Expand Down Expand Up @@ -82,7 +83,7 @@ local options = {
{ key='none', name = "Off", desc = 'Turns commsharing off.' },
},
},

{
key = "noelo",
name = "No Elo",
Expand Down Expand Up @@ -276,6 +277,14 @@ local options = {
section= 'a_important',
def=false,
},
{
key='disable_local_widgets',
name='Disable Local Widgets',
desc='Disable loading of local widget.',
type='bool',
section= 'a_important',
def=false,
},
{
key='campaign_chassis',
name='Allow campaign commander chassis',
Expand Down Expand Up @@ -390,6 +399,14 @@ local options = {
section= 'experimental',
def = false,
},
{
key = 'enemyterra',
name = 'Allow Terraform Near Enemies',
desc = 'Without this option terraform progress is 20x slower if an enemy unit is visible nearby.',
type = 'bool',
section= 'experimental',
def = false,
},
{
key = "tweakunits",
name = "Tweak Units",
Expand Down Expand Up @@ -538,6 +555,7 @@ local options = {
-- -- }
-- },
-- },

{
key = 'chicken',
name = 'Chicken',
Expand All @@ -561,6 +579,7 @@ local options = {
{ key = 'Chicken: Custom', name = "Chicken: Custom", desc = 'Customize your chicken.' },
},
},
--[[ Broken, see gamseide ticket #3567
{
key = "playerchickens",
name = "Players as chickens",
Expand All @@ -569,6 +588,7 @@ local options = {
def = false,
section = 'chicken',
},
]]
{
key = "eggs",
name = "Chicken Eggs",
Expand Down
3 changes: 3 additions & 0 deletions LuaMenu/configs/gameConfig/zk/aiSimpleName.lua
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ local devSubnameMap = {
{"DevCircuitAINormal", "AI: Normal" .. DEV_NAME},
{"DevCircuitAIHard", "AI: Hard" .. DEV_NAME},
{"DevCircuitAIBrutal", "AI: Brutal" .. DEV_NAME},
{"DevCircuitEconomist", "AI: Economist Personality" .. DEV_NAME},
{"CAI", "AI: Legacy"},
}

Expand All @@ -44,6 +45,7 @@ local simpleAiOrder = {
["AI: Normal" .. DEV_NAME] = -3,
["AI: Hard" .. DEV_NAME] = -2,
["AI: Brutal" .. DEV_NAME] = -1,
["AI: Economist Personality" .. DEV_NAME] = -0.9,
["AI: Beginner" .. STABLE_NAME] = 0,
["AI: Novice" .. STABLE_NAME] = 1,
["AI: Easy" .. STABLE_NAME] = 2,
Expand All @@ -68,6 +70,7 @@ local aiTooltip = {
["AI: Normal" .. DEV_NAME] = "Recommended for veteran strategy gamers.",
["AI: Hard" .. DEV_NAME] = "Recommended for veteran strategy gamers who aren't afraid of losing.",
["AI: Brutal" .. DEV_NAME] = "Recommended for veterans of Zero-K.",
["AI: Economist Personality" .. DEV_NAME] = "Brutal AI with a bias for escalating and economy.",
["AI: Beginner" .. STABLE_NAME] = "Recommended for players with no strategy game experience.",
["AI: Novice" .. STABLE_NAME] = "Recommended for players with some strategy game experience, or experience with related genres (such as MOBA).",
["AI: Easy" .. STABLE_NAME] = "Recommended for experienced strategy gamers with some experience of streaming economy.",
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading