upstream -> ZK #702

gajop · 2019-07-14T02:37:59Z

Leaving this up until it's ready to be merged.

email verification in REGISTER/CONFIRMAGREEMENT

(they don't do anything anymore!)

& remove NOCHANNELTOPIC (no longer used by Spring and afaict not used by ZK)

updates for compat flags / stop sending dead compat flags

zk -> upstream

* Added gameConfig for TAPrime

various lobby protocol fixes

load game config in one place and check for some necessary tables (should probably add more...) (try to fail early whenever possible)

…ig (gameConfig/tc)

added byar gameconfig

fixed font-uiscaling bug

added custom game lobbymusic option

ZK -> Upstream (WIP)

merge from master

The checkbox defaults to unticked but the value defaults to true.

Fix #468, checkbox vs actual value mismatch

music loads tracks on initialize or shutdowns if none found (default)

f43df03 followup

gajop · 2019-07-19T18:32:04Z

@GoogleFrog Please check if it can be merged now.

GoogleFrog · 2019-07-20T02:43:23Z

LuaMenu/widgets/snd_music_lite.lua

-	"sounds/lobbyMusic/Tomorrow Landscape.ogg",
-}
+local randomTrackList
+local OPEN_TRACK_NAME


I am going to change the name of OPEN_TRACK_NAME because it is not what I would call a constant. You can do this before it is pulled if you like.

Indeed, I'll fix

GoogleFrog · 2019-07-20T02:44:33Z

LuaMenu/configs/gameConfig/zk/mainConfig.lua

 	link_maps               = link_maps,
 	link_particularMapPage  = link_particularMapPage,
 	ignoreServerVersion     = false,
+	openTrack				= 'sounds/lobbyMusic/The Secret of Ayers Rock.ogg',


Bad whitespace. My rule is that tabs should only ever occur after newlines or tabs.

Ruwetuin · 2019-07-20T07:19:52Z

Verzonden vanaf mijn Samsung-apparaat

…

-------- Oorspronkelijk bericht -------- Van: Gajo Petrovic <notifications@github.com> Datum: 19-07-19 20:32 (GMT+01:00) Aan: ZeroK-RTS/Chobby <Chobby@noreply.github.com> Cc: Floris <floris@ruwhof.net>, Mention <mention@noreply.github.com> Onderwerp: Re: [ZeroK-RTS/Chobby] upstream -> ZK (#702) @GoogleFrog Please check if it can be merged now. —You are receiving this because you were mentioned.Reply to this email directly, view it on GitHub, or mute the thread. [ { "@context": "http://schema.org", "@type": "EmailMessage", "potentialAction": { "@type": "ViewAction", "target": "#702?email_source=notifications\u0026email_token=ACUBVWI526S6ZTGOW2PHPV3QAICCLA5CNFSM4IDGRGQ2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD2MNFNY#issuecomment-513331895", "url": "#702?email_source=notifications\u0026email_token=ACUBVWI526S6ZTGOW2PHPV3QAICCLA5CNFSM4IDGRGQ2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD2MNFNY#issuecomment-513331895", "name": "View Pull Request" }, "description": "View this Pull Request on GitHub", "publisher": { "@type": "Organization", "name": "GitHub", "url": "https://github.com" } } ]

GoogleFrog · 2019-07-20T08:01:37Z

LuaMenu/widgets/chobby/components/configuration.lua


 	self.loadLocalWidgets = false
 	self.displayBots = false
-	self.displayBadEngines2 = true


I want this to be true because wrapper launch can launch into other engine versions.

I'm not sure I want to touch this because it was changed to fix an issue: Spring-Chobby@3627fe8
Was this change wrong?

GoogleFrog · 2019-07-20T08:02:55Z

LuaMenu/widgets/gui_settings_window.lua

+
+		Spring.SetConfigInt("WindowBorderless", (mode == 4 and 1) or 0, false)
+
+        Spring.SetConfigInt("Fullscreen", 0, false)


Need a tab here.

GoogleFrog · 2019-07-20T08:05:31Z

I'm a the point where I am just noting what I can fix after merging. @gajop said he will fix something so I will wait for his input.

gajop · 2019-07-20T09:35:01Z

@GoogleFrog feel free to go ahead with the merge. I'd rather deal with smaller PRs after this gets in, would prefer to avoid any new conflicts.

GoogleFrog · 2019-07-20T09:37:30Z

LuaMenu/widgets/snd_music_lite.lua

-		if OPEN_TRACK_NAME == nil or OPEN_TRACK_NAME == '' then
-			OPEN_TRACK_NAME = randomTrackList[math.random(#randomTrackList)]
+	openTrack = WG.Chobby.Configuration.gameConfig.openTrack
+	if openTrack ~= nil then


I don't know what this nested if is meant to do, but there has to be a mistake here.

Why is open track being checked against ''? It looks like the meaning of configuration values is being overridden in a confusing way.

openTrack should be a string. If it is set then that track is played when the menu opens.

If openTrack is not set then a random track should be played.

If someone wants the ability to start the menu with no music they can add a config value to do that.

If the configuration has openTrack = '' then the music widget should print a warning about that track not existing.

GoogleFrog · 2019-07-20T09:39:15Z

LuaMenu/widgets/snd_music_lite.lua

 		end
 	end
-	if OPEN_TRACK_NAME == nil or OPEN_TRACK_NAME == '' then
+	if openTrack == nil or openTrack == '' then


Why can't this widget run if there is no open track? It would just mean there is silence until the first game is over (at which point a track will play).

Shouldn't this be

`if not openTrack then'

GoogleFrog · 2019-07-20T09:43:48Z

LuaMenu/configs/gameConfig/byar/mainConfig.lua

+	disablePlanetwars 			= true, -- removes settings related to planetwars
+	disableMatchMaking 			= true, -- removes match making
+	disableCommunityWindow 		= true, -- removes Community Window
+	openTrack = '',


This is bad.

GoogleFrog · 2019-07-20T10:03:32Z

It turns out I can commit changes.

gajop · 2019-07-20T10:07:40Z

That's not an improvement though.
The empty string check might not be a good idea, but using not when you really mean to do a nil check is wrong and gives poor info to the reader.
not X should only be used with bools

GoogleFrog · 2019-07-20T10:10:17Z

Ok.

silentwings and others added 30 commits February 13, 2019 12:59

email verification in REGISTER/CONFIRMAGREEMENT

332b1f1

only use emails for registration via "spring" protocol

c51092f

addendum to previous

baa4f9d

Merge pull request #458 from silentwings/master

3fd31b4

email verification in REGISTER/CONFIRMAGREEMENT

updates for 'l' compatibility flag

f9c0bfb

stop sending 'm' 'et' and 'p' compat flags

7b70dc5

(they don't do anything anymore!)

updates for 't' compat flag

1cc410e

& remove NOCHANNELTOPIC (no longer used by Spring and afaict not used by ZK)

update login syntax

93bcae4

addendum

29edb70

Merge pull request #459 from silentwings/master

8f97d22

updates for compat flags / stop sending dead compat flags

Merge pull request #463 from ZeroK-RTS/master

d41349a

zk -> upstream

* Added gameConfig for TAPrime

99e6c1b

Merge pull request #464 from FluidPlay/master

f4b3034

* Added gameConfig for TAPrime

fix joining passworded battles

4ff2ca3

Merge pull request #466 from silentwings/master

16a7213

various lobby protocol fixes

fix evorts game config (close #467)

e45f8ae

load game config in one place and check for some necessary tables (should probably add more...) (try to fail early whenever possible)

evorts: disable steam and other ZK stuff; inspired by the cursed conf…

3369437

…ig (gameConfig/tc)

added byar gameconfig

dba5cc6

changed skirmish ai: shardlua -> DAI

1a7640f

applied uiscale to fontsize

7002681

Merge pull request #469 from beyond-all-reason/master

577fe7f

added byar gameconfig

byar settings tuned

e76ca45

fixed font-uiscaling bug

1e116c4

Merge pull request #470 from beyond-all-reason/master

3dd8521

fixed font-uiscaling bug

added custom lobby music

75d6199

prevent repeating opening track

033eeda

refined bar headers

0d02b6c

Merge pull request #471 from beyond-all-reason/master

eab9449

added custom game lobbymusic option

Merge branch 'master' into master

ae88461

Merge pull request #472 from ZeroK-RTS/master

ca8446f

ZK -> Upstream (WIP)

Ruwetuin and others added 8 commits July 18, 2019 23:09

Merge pull request #1 from Spring-Chobby/master

c585b76

merge from master

load tracks within initialize, if none: shutdown

f43df03

Fix #468, checkbox vs actual value mismatch

9d3b42a

The checkbox defaults to unticked but the value defaults to true.

Merge pull request #474 from sprunk/master

3627fe8

Fix #468, checkbox vs actual value mismatch

Merge pull request #473 from beyond-all-reason/master

3163149

music loads tracks on initialize or shutdowns if none found (default)

fix music playing for ZK;

44fe299

f43df03 followup

Merge branch 'master' into master

5d569c1

undo changes

3fba93b

gajop force-pushed the master branch from df79f1c to 3fba93b Compare July 19, 2019 18:28

gajop added 2 commits July 20, 2019 03:29

undo changes++

152d03c

undo changes++

490831e

GoogleFrog reviewed Jul 20, 2019

View reviewed changes

nlc: various minor whitespace and naming fixes

32a68f6

GoogleFrog reviewed Jul 20, 2019

View reviewed changes

gajop and others added 2 commits July 20, 2019 18:48

simplify openTrack stuff

199d5fb

Change openTrack check

8c222af

openTrack == nil

1c89e1e

GoogleFrog merged commit 7847630 into ZeroK-RTS:master Jul 20, 2019


		Spring.SetConfigInt("WindowBorderless", (mode == 4 and 1) or 0, false)

		Spring.SetConfigInt("Fullscreen", 0, false)

upstream -> ZK #702

upstream -> ZK #702

Uh oh!

Conversation

gajop commented Jul 14, 2019

Uh oh!

gajop commented Jul 19, 2019

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

GoogleFrog Jul 20, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Ruwetuin commented Jul 20, 2019 via email

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

GoogleFrog commented Jul 20, 2019

Uh oh!

gajop commented Jul 20, 2019

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

GoogleFrog commented Jul 20, 2019

Uh oh!

gajop commented Jul 20, 2019

Uh oh!

GoogleFrog commented Jul 20, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

GoogleFrog Jul 20, 2019 •

edited

Loading