Mercurial > ldforge / changelog

Merge ../ldforge into gl

• Wed, 05 Feb 2014 06:07:05 +0200
• by Santeri Piippo <crimsondusk64@gmail.com> [Wed, 05 Feb 2014 06:07:05 +0200] rev 680
• Merge ../ldforge into gl

- now actually renders stuff correctly

• Fri, 24 Jan 2014 22:10:49 +0200
• by Santeri Piippo <crimsondusk64@gmail.com> [Fri, 24 Jan 2014 22:10:49 +0200] rev 679
• - now actually renders stuff correctly

- renamed some member variables for clarity

• Fri, 24 Jan 2014 20:46:57 +0200
• by Santeri Piippo <crimsondusk64@gmail.com> [Fri, 24 Jan 2014 20:46:57 +0200] rev 678
• - renamed some member variables for clarity

- removed some unneeded code

• Fri, 24 Jan 2014 18:31:25 +0200
• by Santeri Piippo <crimsondusk64@gmail.com> [Fri, 24 Jan 2014 18:31:25 +0200] rev 677
• - removed some unneeded code

- converted to VBO

• Fri, 24 Jan 2014 18:29:11 +0200
• by Santeri Piippo <crimsondusk64@gmail.com> [Fri, 24 Jan 2014 18:29:11 +0200] rev 676
• - converted to VBO

Merge ../ldforge into gl

• Tue, 21 Jan 2014 02:09:14 +0200
• by Santeri Piippo <crimsondusk64@gmail.com> [Tue, 21 Jan 2014 02:09:14 +0200] rev 675
• Merge ../ldforge into gl
  
  Conflicts:
  src/GLRenderer.cc
  src/GLRenderer.h
  src/LDObject.cc

- refactoring

• Tue, 21 Jan 2014 01:29:12 +0200
• by Santeri Piippo <crimsondusk64@gmail.com> [Tue, 21 Jan 2014 01:29:12 +0200] rev 674
• - refactoring

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

• Tue, 21 Jan 2014 01:09:22 +0200
• by Santeri Piippo <crimsondusk64@gmail.com> [Tue, 21 Jan 2014 01:09:22 +0200] rev 673
• - rename GLCompiler::Vertex to GLCompiler::VAO to avoid name conflicts

- renamed VertexCompiler to GLCompiler

• Tue, 21 Jan 2014 01:05:03 +0200
• by Santeri Piippo <crimsondusk64@gmail.com> [Tue, 21 Jan 2014 01:05:03 +0200] rev 672
• - renamed VertexCompiler to GLCompiler

- reworked the vertex compiler, objects are now colorized properly

• Tue, 21 Jan 2014 00:53:02 +0200
• by Santeri Piippo <crimsondusk64@gmail.com> [Tue, 21 Jan 2014 00:53:02 +0200] rev 671
• - reworked the vertex compiler, objects are now colorized properly

- Merge ../ldforge into gl

• Mon, 20 Jan 2014 23:44:32 +0200
• by Santeri Piippo <crimsondusk64@gmail.com> [Mon, 20 Jan 2014 23:44:32 +0200] rev 670
• - Merge ../ldforge into gl

- Merge ../ldforge into gl

• Mon, 20 Jan 2014 23:43:47 +0200
• by Santeri Piippo <crimsondusk64@gmail.com> [Mon, 20 Jan 2014 23:43:47 +0200] rev 669
• - Merge ../ldforge into gl

- now compiles again

• Mon, 20 Jan 2014 16:42:18 +0200
• by Santeri Piippo <crimsondusk64@gmail.com> [Mon, 20 Jan 2014 16:42:18 +0200] rev 668
• - now compiles again

- Merge commit '5c835eb' into HEAD

• Mon, 20 Jan 2014 15:04:26 +0200
• by Santeri Piippo <crimsondusk64@gmail.com> [Mon, 20 Jan 2014 15:04:26 +0200] rev 667
• - Merge commit '5c835eb' into HEAD
  
  Conflicts:
  src/file.cpp
  src/gldraw.cc
  src/gldraw.h