- fixed build errors

Merge ../ldforge into gl

Merge ../ldforge into gl

- minor stuff

Merge ../ldforge into gl

- axes are now drawn properly again

Merge ../ldforge into gl

Merge ../ldforge into gl

- greatly improved the GL compiler, now deals colors and object removal properly

Merge ../ldforge into gl

Merge ../ldforge into gl

- work on improved rendering performance

Merge ../ldforge into gl

- now actually renders stuff correctly

- renamed some member variables for clarity

- removed some unneeded code

- converted to VBO

Merge ../ldforge into gl

- refactoring

- rename GLCompiler::Vertex to GLCompiler::VAO to avoid name conflicts

- renamed VertexCompiler to GLCompiler

- reworked the vertex compiler, objects are now colorized properly

- Merge ../ldforge into gl

- Merge ../ldforge into gl

- now compiles again

- Merge commit '5c835eb' into HEAD

now compiles again

Merge branch 'master' into gl

Merge branch 'master' into gl

- moved the uncolorize action to the color toolbar, renamed to uncolor

- use the keyword 'not' in place of the exclamation mark for operator!, this is clearer. also converted uses of '== false' to this.

- renamed some cmake identifiers

(0) -300 -100 -50 -32 +32 +50 +100 +300 tip

mercurial