Merge branch 'master' of https://github.com/chriscamacho/gles2framework

Conflicts: Makefile
chriscamacho · Jul 10, 2012 · e2934e0 · e2934e0
2 parents 97539d8 + d426a4b
commit e2934e0
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 334 deletions.
diff --git a/Makefile b/Makefile
diff --git a/README.md b/README.md
diff --git a/TODO.md b/TODO.md
@@ -0,0 +1,13 @@
+I would very much welcome people contacting me with ideas for this document.
+
+# Features to be added
+
+* reimplement raw keyboard if xlib not available, so development can be done purely via ssh
+  * will have to be done via makefile switch because of key defines 
+* billboard 2.5D quads
+* joystick raw and xlib
+
+## Features probably not going to be implemented
+
+* simple height map terrain
+  * probably better using precreated meshes
diff --git a/lib/.dummy b/lib/.dummy
diff --git a/obj2opengl/clean.sh b/obj2opengl/clean.sh