Please bring back "Disable Lightning" option

[Invader]

(12-19-2012, 08:19 AM)neobrain Wrote: The option served absolutely no purpose (sorry, working around the osx lighting issue doesn't count). However, lots of noobs where coming to our forums complaining about issues with lighting when "Disable lighting" was used (ofc they didn't notice they enabled that option because they just blindly took over the settings from mamario's idiotic performance guide).

So it's basically no advantages vs that pretty annoying "disadvantage" (if you can call it like that).

EDIT: Meh, misread your question. Learn how to read please, your question has already been answered

Is it possible to make it an option that can only be changed in the ini? That seems like it could solve both problems...

[CPkmn]

Ironically I just readded "Disable Lighting" back into my local copy of the most recent version the other day. I was proving something to myself about how a game I was testing ran, so it happened to be useful.
It's very simple to readd, actually.

[neobrain]

(12-19-2012, 10:17 AM)Invader Wrote:

(12-19-2012, 08:19 AM)neobrain Wrote: The option served absolutely no purpose (sorry, working around the osx lighting issue doesn't count). However, lots of noobs where coming to our forums complaining about issues with lighting when "Disable lighting" was used (ofc they didn't notice they enabled that option because they just blindly took over the settings from mamario's idiotic performance guide).

So it's basically no advantages vs that pretty annoying "disadvantage" (if you can call it like that).

EDIT: Meh, misread your question. Learn how to read please, your question has already been answered

Is it possible to make it an option that can only be changed in the ini? That seems like it could solve both problems...

tl;dr is that I have no interest in bringing the option back in any way.

[cluthz]

I'm sorry for writing lightning instead of lighting, as you might understand I'm no native english speaker.
I understand OSX specific hacks aren't main priority, but I wouldn't hurt to ask about it

Anyways, as I already told, I'm pretty newb with using git.
I've managed to make a local clone and build dolphin, but i have problems how to revert one specific commit.

So far I've done:
git clone https://code.google.com/p/dolphin-emu/

then i try to revert using
git revert 1dd6b978c1da

but I only get errors.

I guess i could manually add the changes, and make a unified diff to use for further patching of newer revisions, but if there is an easier way I'd love to know how.

[neobrain]

"I only get errors" isn't particularly descriptive

[cluthz]

As i said I'm new to git and these are the errors.
Thanks for helping tho!

dolphin-emu tob$ git revert 1dd6b978c1da
error: 'revert' is not possible because you have unmerged files.
hint: Fix them up in the work tree,
hint: and then use 'git add/rm <file>' as
hint: appropriate to mark resolution and make a commit,
hint: or use 'git commit -a'.
fatal: revert failed

[neobrain]

You changed some stuff locally. Use a clean tree and run the command again. You can get a clean tree by calling e.g. git reset --hard origin/master

[cluthz]

I didn't change anything in the the local clone.
With cleaning as you suggested:


dolphin-emu tob$ git reset --hard origin/master
HEAD is now at 0811311 TextureCacheBase: Delete textures completely instead of just invalidating them in ClearRenderTargets.

dolphin-emu tob$ git revert 1dd6b978c1da
error: could not revert 1dd6b97... Remove "Disable Lighting".
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'

I have no idea why it ain't working

And again, thanks for your patience!

[neobrain]

(12-20-2012, 01:22 AM)cluthz Wrote: I didn't change anything in the the local clone.

You probably ran the "git revert" command twice, and the first one locally modified your working copy

(12-20-2012, 01:22 AM) cluthz Wrote: dolphin-emu tob$ git revert 1dd6b978c1da
error: could not revert 1dd6b97... Remove "Disable Lighting".
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'

post the output of "git status"

[cluthz]

dolphin-emu tob$ git status
# On branch master
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# modified: Source/Core/VideoCommon/Src/EmuWindow.cpp
# modified: Source/Core/VideoCommon/Src/RenderBase.cpp
# modified: Source/Core/VideoCommon/Src/VertexManagerBase.cpp
# modified: Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
#
# Unmerged paths:
# (use "git reset HEAD <file>..." to unstage)
# (use "git add/rm <file>..." as appropriate to mark resolution)
#
# both modified: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp
# both modified: Source/Core/VideoCommon/Src/VideoConfig.cpp
# both modified: Source/Core/VideoCommon/Src/VideoConfig.h
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#