update on my parts#2

Open

onorinbejasus wants to merge 64 commits into

vicapow:masterfrom

onorinbejasus:master

Commits on Apr 9, 2011

edited the metaball example
vicapow
committed

Commits on Apr 11, 2011

Commits on Apr 14, 2011

added qt proj code in prototype folder
vicapow
committed
fixed issueswith CloudFactory.h
vicapow
committed
added wm functionality
Timothy Luciani
committed

Commits on Apr 15, 2011

added a more metaball edits
Timothy Luciani
committed
added a few more edits
Timothy Luciani
committed

Commits on Apr 16, 2011

remve balls past top edge
Timothy Luciani
committed
fixed bugs
Timothy Luciani
committed
added detection
Timothy Luciani
committed
good?
Timothy Luciani
committed
changed the code to use QGraphicsScene which will allow us to draw QWidget and other components over top of the openGL context
Timothy Luciani
committed
bug fixes
Timothy Luciani
committed
resided hud display
Timothy Luciani
committed
.
Timothy Luciani
committed
added bitmap loader and it still doesn't display
Brittney Richter
committed
added level support
Timothy Luciani
committed
removed tmp from git repo
Timothy Luciani
committed
removed makefile and xcode project file from git repo
Timothy Luciani
committed
added the files that didn't add before
Brittney Richter
committed
Merge branch 'master' of github.com:onorinbejasus/cloudfactory
Timothy Luciani
committed

Commits on Apr 17, 2011

played around with different texture settings but still not working... :(
Timothy Luciani
committed
implemented metaballs in cuda. it's kindof a hack, but it runs very nice
Timothy Luciani
committed
wont let me push or pull
Timothy Luciani
committed
removed all object files
Timothy Luciani
committed
found a few more
Timothy Luciani
committed
clean commit
Timothy Luciani
committed
added support for level progession and added a few inital levels
vicapow
committed
removed temp makefile from repo
vicapow
committed
removed cloudfactory xcode project
vicapow
committed

Commits on Apr 18, 2011

nothing i do will display the cannons or background. i am not understanding how this qt viewer works or how to display on it.
Timothy Luciani
committed

Commits on Apr 19, 2011

fixed texture bug
vicapow
committed
removed DS_Store file
vicapow
committed
fixed texture bug
vicapow
committed
Merge branch 'master' of github.com:onorinbejasus/cloudfactory
vicapow
committed
fixed git artifacts found in MainScene.cpp
vicapow
committed
fixed texture
Timothy Luciani
committed
fixed the cannons, not textures yet though
Timothy Luciani
committed
added textures to cannons. they look a little odd though
Timothy Luciani
committed
edited everything that need to be done. all that it needs for today is the story
Timothy Luciani
committed
added the story document
Timothy Luciani
committed
okay
vicapow
committed
Merge branch 'master' of github.com:onorinbejasus/cloudfactory
vicapow
committed
added stuff
Timothy Luciani
committed
Merge branch 'master' of github.com:onorinbejasus/cloudfactory
vicapow
committed
added how-to-play.jpg
vicapow
committed
added how to play
Timothy Luciani
committed
Merge branch 'master' of github.com:onorinbejasus/cloudfactory
Timothy Luciani
committed

Commits on Apr 25, 2011

checking in
Timothy Luciani
committed
deleted images.hpp and images.cpp
Timothy Luciani
committed

Commits on Apr 28, 2011

update
Timothy Luciani
committed

Commits on Apr 29, 2011

Commits on May 4, 2011

cleaned up the directory
Timothy Luciani
committed
cleanup pt 2
Timothy Luciani
committed