Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
4ea7361
added all my files. seems I have to host the code myself, push, then …
Apr 8, 2011
6efc499
deleted my build
Apr 8, 2011
adf455d
cleaned up project. removed old .svn files and added a gitconfig file…
Apr 8, 2011
ada91c8
added prototype folder
Apr 8, 2011
3f935d3
added prototype folder
Apr 8, 2011
2572266
removed old svn dir
Apr 8, 2011
ae0ce34
added prototypes folder
Apr 8, 2011
e9e4293
edited the metaball example
Apr 9, 2011
710cf66
aded metaball canvas
Apr 11, 2011
66ea05a
added changes to xcodeproj
Apr 11, 2011
f97a475
finally added full support for metaballs
Apr 11, 2011
9548254
added qt proj code in prototype folder
Apr 14, 2011
eb8cf1c
fixed issueswith CloudFactory.h
Apr 14, 2011
bc97da6
added wm functionality
Apr 14, 2011
72c4101
added a more metaball edits
Apr 15, 2011
a8eb05b
added a few more edits
Apr 15, 2011
b3e52fd
remve balls past top edge
Apr 16, 2011
dd8c4bf
fixed bugs
Apr 16, 2011
86e9288
added detection
Apr 16, 2011
0106485
good?
Apr 16, 2011
77c49a7
changed the code to use QGraphicsScene which will allow us to draw QW…
Apr 16, 2011
37dbbd4
bug fixes
Apr 16, 2011
4f74d3e
resided hud display
Apr 16, 2011
88c8edf
.
Apr 16, 2011
d3c9004
added bitmap loader and it still doesn't display
Apr 16, 2011
ad73047
added level support
Apr 16, 2011
dffae77
removed tmp from git repo
Apr 16, 2011
c982812
removed makefile and xcode project file from git repo
Apr 16, 2011
1a493fb
added the files that didn't add before
Apr 16, 2011
3cd761c
Merge branch 'master' of github.com:onorinbejasus/cloudfactory
Apr 16, 2011
3fe857a
played around with different texture settings but still not working..…
Apr 17, 2011
ad88b99
implemented metaballs in cuda. it's kindof a hack, but it runs very nice
Apr 17, 2011
54dbc0a
wont let me push or pull
Apr 17, 2011
5375160
removed all object files
Apr 17, 2011
6e425a6
found a few more
Apr 17, 2011
880799e
clean commit
Apr 17, 2011
6fdb9b1
added support for level progession and added a few inital levels
Apr 17, 2011
b882deb
removed temp makefile from repo
Apr 17, 2011
fe5df45
removed cloudfactory xcode project
Apr 17, 2011
4b39799
nothing i do will display the cannons or background. i am not underst…
Apr 18, 2011
cb80bf0
fixed texture bug
Apr 19, 2011
357e861
removed DS_Store file
Apr 19, 2011
6e4a4e2
fixed texture bug
Apr 19, 2011
a4aed73
Merge branch 'master' of github.com:onorinbejasus/cloudfactory
Apr 19, 2011
e5cf0a1
fixed git artifacts found in MainScene.cpp
Apr 19, 2011
9671671
fixed texture
Apr 19, 2011
e05b8e5
fixed the cannons, not textures yet though
Apr 19, 2011
26b5de1
added textures to cannons. they look a little odd though
Apr 19, 2011
f51cf3e
edited everything that need to be done. all that it needs for today i…
Apr 19, 2011
4d3f375
added the story document
Apr 19, 2011
472320c
okay
Apr 19, 2011
ef985c8
Merge branch 'master' of github.com:onorinbejasus/cloudfactory
Apr 19, 2011
9039e7b
added stuff
Apr 19, 2011
60e0ed8
Merge branch 'master' of github.com:onorinbejasus/cloudfactory
Apr 19, 2011
52a55fa
added how-to-play.jpg
Apr 19, 2011
2084531
added how to play
Apr 19, 2011
7943241
Merge branch 'master' of github.com:onorinbejasus/cloudfactory
Apr 19, 2011
157bda7
checking in
Apr 25, 2011
c013c3d
deleted images.hpp and images.cpp
Apr 25, 2011
0e6ade0
update
Apr 28, 2011
7af3010
added song
Apr 29, 2011
57282e1
update for tim
Apr 29, 2011
043b6ff
cleaned up the directory
May 4, 2011
c880009
cleanup pt 2
May 4, 2011
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
Binary file not shown.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
build/
prototypes/QtProj/CloudFactory.xcodeproj
prototypes/QtProj/Makefile
prototypes/QtProj/tmp/
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Binary file added CloudFactory.pptx
Binary file not shown.
459 changes: 0 additions & 459 deletions CloudFactory.xcodeproj/project.pbxproj

This file was deleted.

This file was deleted.

Loading