]> code.bitgloo.com Git - clyne/gamedev.git/commit
projects / clyne / gamedev.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 76ae330) | patch
Fixed Conflicts
authorAndy Belle-Isle <abelleisle@roadrunner.com>
Wed, 16 Sep 2015 22:00:38 +0000 (18:00 -0400)
committerAndy Belle-Isle <abelleisle@roadrunner.com>
Wed, 16 Sep 2015 22:00:38 +0000 (18:00 -0400)
commit0dc897fe78c41d0420105f3a1ce02b31fcf5d376
treecbb87581066104556ab76790de3eeddd0c13e1edtree | snapshot
parent76ae330e93cfdc09826beee41970772cbd0486eacommit | diff
Fixed Conflicts

Had to remove -Wextra because it didn't allow for int argc, char** argv
and SDL requires those in the main function. Also removed
glActiveTexture() because it wasn't declared, currently everything works
fine without it, but I'll find a way to fix it soon, but for now it
works.
Makefile diff | blob | history
include/UIClass.h diff | blob | history
src/UIClass.cpp diff | blob | history
src/main.cpp diff | blob | history
A 2D video game project