Paths

Table of Contentst

Fix incompatible value for WaterUgly warning on opening the options screen.
ClosedPublic
Actions

Authored by echotangoecho on Jan 23 2017, 11:32 PM.

Details

Reviewers

fabio
vladislavbelov
FeXoR
Imarok

Commits

rP19822: Fix incompatible value for WaterUgly warning on opening the options screen.

Trac Tickets

#4230

Summary

Also fixes the other issue (the setting was only applied if the options screen was first opened).

Test Plan

Verify that the game works as expected for different values of waterugly.

Diff Detail

Repository

rP 0 A.D. Public Repository

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

echotangoecho created this revision.Jan 23 2017, 11:32 PM

Update year.

Build is green

Updating workspaces.
Build (release)...
Build (debug)...
Running debug tests...
Running cxxtest tests (302 tests)..............................................................................................................................................................................................................................................................................................................OK!

http://jw:8080/job/phabricator/236/ for more details.

Harbormaster completed remote builds in B342: Diff 319.Jan 24 2017, 3:12 AM

Build is green

Updating workspaces.
Build (release)...
Build (debug)...
Running debug tests...
Running cxxtest tests (302 tests)..............................................................................................................................................................................................................................................................................................................OK!

http://jw:8080/job/phabricator/237/ for more details.

Harbormaster completed remote builds in B345: Diff 321.Jan 24 2017, 4:41 AM

@fabio, could you test that? The code looks good but you are more aware of the graphics options world :)

Good ticket, it's an annoying message. I've tested the patch, it works for Windows, the message doesn't appear anymore.

This revision is now accepted and ready to land.Apr 28 2017, 6:22 PM

I think, we should fix it before FF, because it's pretty annoying.

vladislavbelov added a reviewer: FeXoR.May 9 2017, 1:16 PM

vladislavbelov added a subscriber: FeXoR.

echotangoecho added 1 blocking reviewer(s): vladislavbelov.May 15 2017, 12:37 AM

This revision now requires review to proceed.May 15 2017, 12:37 AM

vladislavbelov accepted this revision.May 15 2017, 12:38 AM

This revision is now accepted and ready to land.May 15 2017, 12:38 AM

Can't reproduce the issue with the steps described in the ticket

How to reproduce on SVN (Windows):

Remove all configs
Open game
Open options and disable Activate Water Effects
Apply & Save (make sure that there is waterugly = "true" in user.cfg)
Reopen game
Open options

Can't reproduce. user.cfg does contain waterugly = "true". WIth and without local.cfg it doesn't bug (all on linux). Sure that isn't related to your guys local.cfg file? Otherwise it will be an interesting quest why this behavior is different depending on the platform.

waterugly must be changed in default.cfg, right?

fatherbushido FeXoR and me could not reproduce this issue with the provided steps on unix and windows.
Imarok could.

There is a bug with this revision: after doing vlads steps to reproduce, click on reset.
The waterUgly setting will not be reset.

See above.

This revision now requires changes to proceed.Jun 24 2017, 4:36 PM

Fixes the bug described in the ticket.
The reset bug is an other bug, indirectly connected with this patch. (#4652

This revision is now accepted and ready to land.Jun 24 2017, 5:41 PM

Closed by commit rP19822: Fix incompatible value for WaterUgly warning on opening the options screen. (authored by Imarok). · Explain WhyJun 25 2017, 1:14 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Path

Size

ps/

trunk/

source/

ps/

GameSetup/

HWDetect.cpp

5 lines

Diff 2679

View Options

ps/trunk/source/ps/GameSetup/HWDetect.cpp

Fix incompatible value for WaterUgly warning on opening the options screen.ClosedPublicActions