IvanGame.git
12 years agoadded yaml-cpp to CMake include path
Ivan Hernanez [Wed, 30 May 2012 02:51:06 +0000 (21:51 -0500)]
added yaml-cpp to CMake include path
Still breaks when searching for library

12 years agoadded test folder cause it bitched
Ivan Hernanez [Tue, 29 May 2012 04:30:45 +0000 (23:30 -0500)]
added test folder cause it bitched

12 years agoadded makefiles
Ivan Hernanez [Tue, 29 May 2012 04:19:55 +0000 (23:19 -0500)]
added makefiles

12 years agoupdated build sequence and ingore test dirs
Ivan Hernanez [Mon, 28 May 2012 22:05:25 +0000 (17:05 -0500)]
updated build sequence and ingore test dirs

12 years agoadded yaml library to source control
Ivan Hernanez [Mon, 28 May 2012 21:54:55 +0000 (16:54 -0500)]
added yaml library to source control

12 years agosupport for english language rendering added
Ivan Hernanez [Mon, 28 May 2012 06:10:44 +0000 (01:10 -0500)]
support for english language rendering added

12 years agorefresh gl settings to ensure drawing doesn't go funkyfied
Ivan Hernanez [Mon, 28 May 2012 05:07:21 +0000 (00:07 -0500)]
refresh gl settings to ensure drawing doesn't go funkyfied

12 years agoMerge branch 'master' of rabbit.mmlx.us:~/Game
Ivan Hernanez [Mon, 28 May 2012 05:03:59 +0000 (00:03 -0500)]
Merge branch 'master' of rabbit.mmlx.us:~/Game

Conflicts:
WorldObject.h

12 years agoinitilized scale of world objects
Ivan Hernanez [Mon, 28 May 2012 05:03:06 +0000 (00:03 -0500)]
initilized scale of world objects

12 years agoinitilized scale of world objects
Ivan Hernanez [Mon, 28 May 2012 05:01:50 +0000 (00:01 -0500)]
initilized scale of world objects

12 years agofixed scale
Ivan Hernanez [Mon, 28 May 2012 04:58:08 +0000 (23:58 -0500)]
fixed scale

12 years agoWindow Resizeable
Ivan Hernanez [Mon, 28 May 2012 04:57:10 +0000 (23:57 -0500)]
Window Resizeable

12 years agoSprite now has scale
Ivan Hernanez [Mon, 28 May 2012 04:56:07 +0000 (23:56 -0500)]
Sprite now has scale

12 years agoAdded SDL_ttf to the project and attempted to draw to the screen but nothing is visible
Ivan Hernanez [Mon, 28 May 2012 04:00:52 +0000 (23:00 -0500)]
Added SDL_ttf to the project and attempted to draw to the screen but nothing is visible

12 years agoadded sounds that could be pick up
Ivan Hernanez [Mon, 28 May 2012 02:43:12 +0000 (21:43 -0500)]
added sounds that could be pick up

12 years agoRewrote Animation loading as well as anim files in yaml
Ivan Hernanez [Mon, 28 May 2012 02:42:19 +0000 (21:42 -0500)]
Rewrote Animation loading as well as anim files in yaml

12 years agoAdded != to Animation.
Tegmine [Sun, 4 Mar 2012 20:40:58 +0000 (14:40 -0600)]
Added != to Animation.

12 years agoFixed Actor.cpp
Tegmine [Sat, 3 Mar 2012 22:14:07 +0000 (16:14 -0600)]
Fixed Actor.cpp

12 years agoFixed use of 'This' to 'Game::game()' in Actor.
Tegmine [Sat, 3 Mar 2012 22:00:04 +0000 (16:00 -0600)]
Fixed use of 'This' to 'Game::game()' in Actor.

12 years agoAdded constructors for Actor.
Tegmine [Sat, 3 Mar 2012 21:51:23 +0000 (15:51 -0600)]
Added constructors for Actor.

13 years agoSigned-off-by: Ivan Hernanez <iturtleman128@gmail.com>
Ivan Hernanez [Sun, 2 Oct 2011 06:33:04 +0000 (01:33 -0500)]
Signed-off-by: Ivan Hernanez <iturtleman128@gmail.com>
13 years agoRenders sprites using OpenGL
Ivan Hernanez [Tue, 9 Aug 2011 07:35:11 +0000 (02:35 -0500)]
Renders sprites using OpenGL
\todo render bg (load from animation file)
\draw collisions

13 years agoMerge branch 'master' of ivan@rabbit.mmlx.us:~/Game.git
Ivan Hernanez [Mon, 8 Aug 2011 12:01:18 +0000 (07:01 -0500)]
Merge branch 'master' of ivan@rabbit.mmlx.us:~/Game.git

13 years agoPartially implemented GLdrawing
Ivan Hernanez [Mon, 8 Aug 2011 12:00:23 +0000 (07:00 -0500)]
Partially implemented GLdrawing

13 years agoFixed error
Ivan Hernandez [Mon, 8 Aug 2011 04:57:38 +0000 (23:57 -0500)]
Fixed error

13 years agoBehavriors implemented removed extraneous code
Ivan Hernanez [Mon, 8 Aug 2011 04:31:00 +0000 (23:31 -0500)]
Behavriors implemented removed extraneous code

13 years agoBehaviors sorta implemented
Ivan Hernanez [Sun, 7 Aug 2011 10:02:46 +0000 (05:02 -0500)]
Behaviors sorta implemented

13 years agoMerge branch 'master' of ivan@rabbit.mmlx.us:~/Game.git
Ivan Hernanez [Thu, 4 Aug 2011 10:04:19 +0000 (05:04 -0500)]
Merge branch 'master' of ivan@rabbit.mmlx.us:~/Game.git

13 years agoset up project file for building in Visual Studio
Ivan Hernanez [Thu, 4 Aug 2011 10:03:04 +0000 (05:03 -0500)]
set up project file for building in Visual Studio

13 years agoremoved all warnings about casts and signedness
unknown [Tue, 1 Feb 2011 03:03:13 +0000 (21:03 -0600)]
removed all warnings about casts and signedness

13 years agoAdded circle on ractangle collision
Ivan Hernandez [Mon, 31 Jan 2011 23:19:07 +0000 (17:19 -0600)]
Added circle on ractangle collision

13 years agoimplemented axis aligned collision box check
unknown [Mon, 31 Jan 2011 18:13:49 +0000 (12:13 -0600)]
implemented axis aligned collision box check

13 years agofixed the issues with this cast (made fn const)
unknown [Mon, 31 Jan 2011 17:15:22 +0000 (11:15 -0600)]
fixed the issues with this cast (made fn const)
rect-circle collision both go to the same fn.
changed showfps key to F10 since F12 seems to be reserved on some systems.

13 years agoadded empty definition of collision between circle and rectangle
unknown [Sun, 30 Jan 2011 22:04:33 +0000 (16:04 -0600)]
added empty definition of collision between circle and rectangle

13 years agoMerge branch 'master' of ivan@rabbit.mmlx.us:~/Game.git
unknown [Sun, 30 Jan 2011 21:56:42 +0000 (15:56 -0600)]
Merge branch 'master' of ivan@rabbit.mmlx.us:~/Game.git

13 years agoadded fps noted significant and unexplained speed change
unknown [Sun, 30 Jan 2011 21:55:35 +0000 (15:55 -0600)]
added fps noted significant and unexplained speed change
updated dcumentation

13 years agoadded fps noted significant and unexplained speed change
unknown [Sun, 30 Jan 2011 21:43:53 +0000 (15:43 -0600)]
added fps noted significant and unexplained speed change

13 years agochanged getAnimation to return SpriteFrame*
unknown [Sat, 29 Jan 2011 18:35:23 +0000 (12:35 -0600)]
changed getAnimation to return SpriteFrame*

13 years agoCollision for circle on circle fixed. Included Animaion Peg for drawing into calculation.
unknown [Sat, 29 Jan 2011 17:49:45 +0000 (11:49 -0600)]
Collision for circle on circle fixed. Included Animaion Peg for drawing into calculation.

13 years agotake into account sprite position for collision testing
unknown [Fri, 28 Jan 2011 22:56:06 +0000 (16:56 -0600)]
take into account sprite position for collision testing

13 years agofound issue with collision detection
unknown [Fri, 28 Jan 2011 19:12:52 +0000 (13:12 -0600)]
found issue with collision detection

13 years agoAdded Sprite getCollisions getName added ability to check all collisions given a...
unknown [Fri, 28 Jan 2011 18:28:19 +0000 (12:28 -0600)]
Added Sprite getCollisions getName added ability to check all collisions given a vec<collision>&
completed framework for checking collisions

13 years agoRearranged data and fixed classes to work with Collision. Draw rectangle and circle...
unknown [Thu, 27 Jan 2011 15:44:10 +0000 (09:44 -0600)]
Rearranged data and fixed classes to work with Collision. Draw rectangle and circle collision.

13 years agoadded Drawing for collision boxes and circles. Moved Slock / Sulock to
Ivan Hernandez [Thu, 27 Jan 2011 00:38:34 +0000 (18:38 -0600)]
added Drawing for collision boxes and circles. Moved Slock / Sulock to
area where drawing took place.

13 years agomade drawCollisions and draw for collisions const and rearranged
Ivan Hernandez [Fri, 21 Jan 2011 01:14:44 +0000 (19:14 -0600)]
made drawCollisions and draw for collisions const and rearranged
makelist

13 years agoMerge rabbit.mmlx.us:~/Game
Ivan Hernandez [Thu, 20 Jan 2011 22:49:52 +0000 (16:49 -0600)]
Merge rabbit.mmlx.us:~/Game

13 years agoCollisions draw correctly centered on sprite (ish)
unknown [Thu, 20 Jan 2011 16:59:49 +0000 (10:59 -0600)]
Collisions draw correctly centered on sprite (ish)

13 years agoEdited CMakeLists and fns.h to allow sqrt and SizeD to work
Ivan Hernandez [Wed, 19 Jan 2011 01:55:10 +0000 (19:55 -0600)]
Edited CMakeLists and fns.h to allow sqrt and SizeD to work

13 years agoFixed Error now problems with library
unknown [Tue, 18 Jan 2011 23:00:28 +0000 (17:00 -0600)]
Fixed Error now problems with library

13 years agoMade game into a singleton and compiled and added the libraries form SDL_draw
unknown [Tue, 18 Jan 2011 20:48:55 +0000 (14:48 -0600)]
Made game into a singleton and compiled and added the libraries form SDL_draw
Ran fine. Tried to make position increase by object's position to failiure.

13 years agoTrying to add Collision drawing. and fixing the This so that it will work correctly.
unknown [Tue, 18 Jan 2011 06:24:47 +0000 (00:24 -0600)]
Trying to add Collision drawing. and fixing the This so that it will work correctly.

13 years agoImplemented WorldObject!
unknown [Tue, 18 Jan 2011 05:05:35 +0000 (23:05 -0600)]
Implemented WorldObject!

13 years agoRemoved the delete SDL_Screen in ~Game and updated todo on Point2D
unknown [Mon, 17 Jan 2011 01:41:38 +0000 (19:41 -0600)]
Removed the delete SDL_Screen in ~Game and updated todo on Point2D
fixed loading animation bug

13 years agoCollision doesn't freak out. Continue implementing.
unknown [Mon, 17 Jan 2011 00:38:56 +0000 (18:38 -0600)]
Collision doesn't freak out. Continue implementing.

13 years agoAdded World Object.h
Ivan Hernandez [Sun, 16 Jan 2011 06:06:25 +0000 (00:06 -0600)]
Added World Object.h

13 years agoAdded Point2D +, -. Changed Sprite Draw to shift drawing pos by the AnimationPeg
unknown [Thu, 13 Jan 2011 22:22:04 +0000 (16:22 -0600)]
Added Point2D +, -. Changed Sprite Draw to shift drawing pos by the AnimationPeg
making collision work (broken atm)
separated frame from collision changed animations for Sprite/sun

13 years agoCollisions moved to more reasonable location. Added global vairable This which will...
unknown [Wed, 12 Jan 2011 22:53:55 +0000 (16:53 -0600)]
Collisions moved to more reasonable location. Added global vairable This which will give us acess to the game. Decide on reorganization of parts

13 years agoAttempted add of behaviors. Causes unexpected errors need to think about
Ivan Hernandez [Tue, 11 Jan 2011 22:48:34 +0000 (16:48 -0600)]
Attempted add of behaviors. Causes unexpected errors need to think about
Introduced Collision data.

13 years agoImplemented unit vector as well as changed comments about multiple input and edited...
Ivan Hernandez [Tue, 11 Jan 2011 17:22:26 +0000 (11:22 -0600)]
Implemented unit vector as well as changed comments about multiple input and edited ~Game so that it doesn't delete the Screen (need to discuss how to handle this)
removed public name from sprite. (may need to make mName public or add accessors)
Created Behavior class to use in place of function pointers (so that there is only one level class and it has a behavior instead)

13 years agoremoved SDL.dll and added SDL_linux/windows
unknown [Tue, 11 Jan 2011 16:02:27 +0000 (10:02 -0600)]
removed SDL.dll and added SDL_linux/windows

13 years agoupdated Y to y X to x width to w height to h etc
Ivan Hernandez [Sun, 9 Jan 2011 20:45:11 +0000 (14:45 -0600)]
updated Y to y X to x width to w height to h etc

13 years agoedited level to use pointers sized and point2d now can create eachother
Ivan Hernandez [Sun, 9 Jan 2011 20:24:02 +0000 (14:24 -0600)]
edited level to use pointers sized and point2d now can create eachother

13 years agoupdated todos and began extending Point2D
Ivan Hernandez [Fri, 17 Dec 2010 06:07:03 +0000 (00:07 -0600)]
updated todos and began extending Point2D

13 years agoadded the LevelWorld class and fixed a few things
Ivan Hernandez [Fri, 17 Dec 2010 05:20:17 +0000 (23:20 -0600)]
added the LevelWorld class and fixed a few things

13 years agoadded backgrounds and rarranged levels to be loaded from a new class.
Ivan Hernandez [Fri, 17 Dec 2010 04:54:16 +0000 (22:54 -0600)]
added backgrounds and rarranged levels to be loaded from a new class.
Animations and Levels now stored in vectors. Updated constructors to
pass names along and completed some name-related functions.

13 years agoFixed the background code.
Matt Mullins [Sun, 31 Oct 2010 02:11:46 +0000 (21:11 -0500)]
Fixed the background code.

13 years agoMerge branches 'master' and 'master' of rabbit.mmlx.us:~ivan/Game
Matt Mullins [Sun, 31 Oct 2010 00:59:41 +0000 (19:59 -0500)]
Merge branches 'master' and 'master' of rabbit.mmlx.us:~ivan/Game

13 years agoBackground now wraps horizontally
Ivan Hernandez [Sun, 17 Oct 2010 06:50:13 +0000 (01:50 -0500)]
Background now wraps horizontally

13 years agoRemoved mX,mY from sprite; Changed keyboard input from a push to a get
Ivan Hernandez [Sat, 16 Oct 2010 21:21:20 +0000 (16:21 -0500)]
Removed mX,mY from sprite; Changed keyboard input from a push to a get
keyboard state; Background functions if the bg hangs off the right side
of the window.

14 years agoupdates files and added better todo list as well as some slight
Ivan Hernandez [Sat, 4 Sep 2010 20:14:20 +0000 (15:14 -0500)]
updates files and added better todo list as well as some slight
reworking of background and other classes.

14 years agoadded new files and made things work again
Ivan Hernandez [Tue, 31 Aug 2010 20:13:18 +0000 (15:13 -0500)]
added new files and made things work again

14 years agoAdded the basic background class and added more aplicable comments to
Ivan Hernandez [Wed, 23 Dec 2009 19:52:44 +0000 (13:52 -0600)]
Added the basic background class and added more aplicable comments to
previous classes.

15 years agoRearranged the classes so that Actors now take care of animation and the
Ivan Hernandez [Tue, 28 Jul 2009 03:07:28 +0000 (22:07 -0500)]
Rearranged the classes so that Actors now take care of animation and the
sprite just has an actor.

15 years agoMovement tempfix made
Ivan Hernandez [Sun, 12 Jul 2009 23:23:58 +0000 (18:23 -0500)]
Movement tempfix made

15 years agoModified the game loop to use events posted by a timer
Matt Mullins [Sun, 12 Jul 2009 22:42:24 +0000 (17:42 -0500)]
Modified the game loop to use events posted by a timer

15 years agoSrpite now has vector<Animation*> mAnimations instead of Animation *
Ivan Hernandez [Sun, 12 Jul 2009 22:12:41 +0000 (17:12 -0500)]
Srpite now has vector<Animation*> mAnimations instead of Animation *

15 years agoSprite has been cleaned
Ivan Hernandez [Sun, 12 Jul 2009 21:51:18 +0000 (16:51 -0500)]
Sprite has been cleaned

15 years agoMerge branch 'master' of koopa.local:~ivan/Desktop/Game
Matt Mullins [Sun, 12 Jul 2009 21:42:50 +0000 (16:42 -0500)]
Merge branch 'master' of koopa.local:~ivan/Desktop/Game

Conflicts:
Sprite.h

15 years agoSprite no longer has updateBG or clearBG and Game now hides mouse.
Ivan Hernandez [Sun, 12 Jul 2009 21:38:04 +0000 (16:38 -0500)]
Sprite no longer has updateBG or clearBG and Game now hides mouse.

15 years agoNo need for Clear/Update BG
Matt Mullins [Sun, 12 Jul 2009 21:37:26 +0000 (16:37 -0500)]
No need for Clear/Update BG

15 years agoMerge branches 'master' and 'master' of koopa.local:~ivan/Desktop/Game into no_clear
Matt Mullins [Sun, 12 Jul 2009 21:32:02 +0000 (16:32 -0500)]
Merge branches 'master' and 'master' of koopa.local:~ivan/Desktop/Game into no_clear

15 years agoChanged window size and removed stuff from main
Ivan Hernandez [Sun, 12 Jul 2009 21:27:15 +0000 (16:27 -0500)]
Changed window size and removed stuff from main

15 years agoSwitched Level from having Sprites to Sprite*s.
Matt Mullins [Sun, 12 Jul 2009 21:01:49 +0000 (16:01 -0500)]
Switched Level from having Sprites to Sprite*s.

15 years agoMerge branch 'master' of koopa.local:~ivan/Desktop/Game
Matt Mullins [Sun, 12 Jul 2009 20:30:14 +0000 (15:30 -0500)]
Merge branch 'master' of koopa.local:~ivan/Desktop/Game

15 years agoBroken but Level and Sprite classes have defaut constructors
Ivan Hernandez [Sun, 12 Jul 2009 20:29:18 +0000 (15:29 -0500)]
Broken but Level and Sprite classes have defaut constructors

15 years agoGame's constructor makes a Level
Matt Mullins [Sun, 12 Jul 2009 20:04:49 +0000 (15:04 -0500)]
Game's constructor makes a Level

15 years agoMoved a lot of SDL from main.cpp to Game
Matt Mullins [Sun, 12 Jul 2009 19:50:26 +0000 (14:50 -0500)]
Moved a lot of SDL from main.cpp to Game

15 years agoAdded EXTRACT_PRIVATE to doxygen conf
Matt Mullins [Sat, 11 Jul 2009 23:03:58 +0000 (18:03 -0500)]
Added EXTRACT_PRIVATE to doxygen conf

15 years agoLevel member access corrections
Matt Mullins [Sat, 11 Jul 2009 22:58:21 +0000 (17:58 -0500)]
Level member access corrections

15 years agoCleanup on Sprite; we're not done, but it's unbroken
Matt Mullins [Sat, 11 Jul 2009 22:40:49 +0000 (17:40 -0500)]
Cleanup on Sprite; we're not done, but it's unbroken

15 years agoCleaned up Game declarations.
Matt Mullins [Sat, 11 Jul 2009 22:13:42 +0000 (17:13 -0500)]
Cleaned up Game declarations.

15 years agoAdded Doxygen config
Matt Mullins [Sat, 11 Jul 2009 21:15:33 +0000 (16:15 -0500)]
Added Doxygen config

15 years agoAdded CMake config file.
Matt Mullins [Sat, 11 Jul 2009 20:54:21 +0000 (15:54 -0500)]
Added CMake config file.

15 years agoInitial commit
Ivan Hernandez [Sat, 11 Jul 2009 20:08:39 +0000 (15:08 -0500)]
Initial commit