Search found 63 matches

by blunted2night
09 Mar 2013, 10:07
Forum: General Development
Topic: Commit guidelines
Replies: 7
Views: 2190

Re: Commit guidelines

Thank you for taking the time to write this, it is extremely helpful. I come from the mercurial world, so git was a slight shift for me. ;) Question though, how would you treat small bug-fixes? Is that branch-worthy or can I just push to master (or next) as the case my be? Define "small": one file ...
by blunted2night
09 Mar 2013, 09:37
Forum: General Development
Topic: Commit guidelines
Replies: 7
Views: 2190

Re: Commit guidelines

Whenever possible, pull requests should be re-based against master prior to being submitted. So after feature merge we will get linear history without explicit merge commit? I don't think it's the way to go, a successful git branch model called git-flow always merges features explicitly, even when ...
by blunted2night
08 Mar 2013, 21:50
Forum: General Development
Topic: Commit guidelines
Replies: 7
Views: 2190

Re: Commit guidelines

sirherrbatka wrote:any idea where it should go on the wiki?
It could be an amendment to the Branching Policy page.
by blunted2night
08 Mar 2013, 20:44
Forum: General Development
Topic: Commit guidelines
Replies: 7
Views: 2190

Commit guidelines

Hi all, I would like to have a discussion about potentially establishing some guidelines for commits submitted via pull requests. I will start by describing my workflow and a common pattern that concerns me, I will then make some recommendations that I believe will produces an easier to follow commi...
by blunted2night
07 Mar 2013, 17:39
Forum: General Development
Topic: Environment setup
Replies: 57
Views: 18266

Re: Environment setup

I would check your CMakeCache.txt file to see if the link directories are being detected properly
by blunted2night
02 Mar 2013, 21:56
Forum: General Development
Topic: scattering/fog problem
Replies: 5
Views: 1609

Re: scattering/fog problem

scrawl wrote:Did you forget to copy new shaders to build/resources folder? That image looks like it's using the old shaders for y-axis up renderer, and thinks you're underwater.
That was the problem, I deleted the resources folder from my build directory and re-ran cmake and now everything looks good.

Thanks
by blunted2night
02 Mar 2013, 19:43
Forum: General Development
Topic: scattering/fog problem
Replies: 5
Views: 1609

scattering/fog problem

has anyone noticed this?
scattering.jpg
It started happening on my Windows x64 build within the last week or two
by blunted2night
15 Feb 2013, 06:33
Forum: General Development
Topic: Advanced journal GUI
Replies: 29
Views: 4983

Re: Advanced journal GUI

I'll let you know when I have something
by blunted2night
14 Feb 2013, 03:53
Forum: General Development
Topic: Advanced journal GUI
Replies: 29
Views: 4983

Re: Advanced journal GUI

If the primary goal of the project is to produce an open source clone of Morrowind, then we have a concrete set of requirements to work against, That is the primary goal for 1.0. Obviously development won't stop there. Replacing the functionality of Morrowind.exe is only the first step. If we want ...
by blunted2night
13 Feb 2013, 02:46
Forum: General Development
Topic: Advanced journal GUI
Replies: 29
Views: 4983

Re: Advanced journal GUI

Creating this new interface would formalize that interaction between the GuiManager and the individual GUIs, not individual windows, but groups of windows presented together. This would, with the right design, remove the need for the GuiManager to need to know any details of the individual GUIs. It...