summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
unknown [Sun, 30 Jan 2011 21:56:42 +0000 (15:56 -0600)]
Merge branch 'master' of ivan@rabbit.mmlx.us:~/Game.git
unknown [Sun, 30 Jan 2011 21:55:35 +0000 (15:55 -0600)]
added fps noted significant and unexplained speed change
updated dcumentation
unknown [Sun, 30 Jan 2011 21:43:53 +0000 (15:43 -0600)]
added fps noted significant and unexplained speed change
unknown [Sat, 29 Jan 2011 18:35:23 +0000 (12:35 -0600)]
changed getAnimation to return SpriteFrame*
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.
unknown [Fri, 28 Jan 2011 22:56:06 +0000 (16:56 -0600)]
take into account sprite position for collision testing
unknown [Fri, 28 Jan 2011 19:12:52 +0000 (13:12 -0600)]
found issue with collision detection
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
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.
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.
Ivan Hernandez [Fri, 21 Jan 2011 01:14:44 +0000 (19:14 -0600)]
made drawCollisions and draw for collisions const and rearranged
makelist
Ivan Hernandez [Thu, 20 Jan 2011 22:49:52 +0000 (16:49 -0600)]
Merge rabbit.mmlx.us:~/Game
unknown [Thu, 20 Jan 2011 16:59:49 +0000 (10:59 -0600)]
Collisions draw correctly centered on sprite (ish)
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
unknown [Tue, 18 Jan 2011 23:00:28 +0000 (17:00 -0600)]
Fixed Error now problems with library
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.
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.
unknown [Tue, 18 Jan 2011 05:05:35 +0000 (23:05 -0600)]
Implemented WorldObject!
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
unknown [Mon, 17 Jan 2011 00:38:56 +0000 (18:38 -0600)]
Collision doesn't freak out. Continue implementing.
Ivan Hernandez [Sun, 16 Jan 2011 06:06:25 +0000 (00:06 -0600)]
Added World Object.h
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
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
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.
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)
unknown [Tue, 11 Jan 2011 16:02:27 +0000 (10:02 -0600)]
removed SDL.dll and added SDL_linux/windows
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
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
Ivan Hernandez [Fri, 17 Dec 2010 06:07:03 +0000 (00:07 -0600)]
updated todos and began extending Point2D
Ivan Hernandez [Fri, 17 Dec 2010 05:20:17 +0000 (23:20 -0600)]
added the LevelWorld class and fixed a few things
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.
Matt Mullins [Sun, 31 Oct 2010 02:11:46 +0000 (21:11 -0500)]
Fixed the background code.
Matt Mullins [Sun, 31 Oct 2010 00:59:41 +0000 (19:59 -0500)]
Merge branches 'master' and 'master' of rabbit.mmlx.us:~ivan/Game
Ivan Hernandez [Sun, 17 Oct 2010 06:50:13 +0000 (01:50 -0500)]
Background now wraps horizontally
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.
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.
Ivan Hernandez [Tue, 31 Aug 2010 20:13:18 +0000 (15:13 -0500)]
added new files and made things work again
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.
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.
Ivan Hernandez [Sun, 12 Jul 2009 23:23:58 +0000 (18:23 -0500)]
Movement tempfix made
Matt Mullins [Sun, 12 Jul 2009 22:42:24 +0000 (17:42 -0500)]
Modified the game loop to use events posted by a timer
Ivan Hernandez [Sun, 12 Jul 2009 22:12:41 +0000 (17:12 -0500)]
Srpite now has vector<Animation*> mAnimations instead of Animation *
Ivan Hernandez [Sun, 12 Jul 2009 21:51:18 +0000 (16:51 -0500)]
Sprite has been cleaned
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
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.
Matt Mullins [Sun, 12 Jul 2009 21:37:26 +0000 (16:37 -0500)]
No need for Clear/Update BG
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
Ivan Hernandez [Sun, 12 Jul 2009 21:27:15 +0000 (16:27 -0500)]
Changed window size and removed stuff from main
Matt Mullins [Sun, 12 Jul 2009 21:01:49 +0000 (16:01 -0500)]
Switched Level from having Sprites to Sprite*s.
Matt Mullins [Sun, 12 Jul 2009 20:30:14 +0000 (15:30 -0500)]
Merge branch 'master' of koopa.local:~ivan/Desktop/Game
Ivan Hernandez [Sun, 12 Jul 2009 20:29:18 +0000 (15:29 -0500)]
Broken but Level and Sprite classes have defaut constructors
Matt Mullins [Sun, 12 Jul 2009 20:04:49 +0000 (15:04 -0500)]
Game's constructor makes a Level
Matt Mullins [Sun, 12 Jul 2009 19:50:26 +0000 (14:50 -0500)]
Moved a lot of SDL from main.cpp to Game
Matt Mullins [Sat, 11 Jul 2009 23:03:58 +0000 (18:03 -0500)]
Added EXTRACT_PRIVATE to doxygen conf
Matt Mullins [Sat, 11 Jul 2009 22:58:21 +0000 (17:58 -0500)]
Level member access corrections
Matt Mullins [Sat, 11 Jul 2009 22:40:49 +0000 (17:40 -0500)]
Cleanup on Sprite; we're not done, but it's unbroken
Matt Mullins [Sat, 11 Jul 2009 22:13:42 +0000 (17:13 -0500)]
Cleaned up Game declarations.
Matt Mullins [Sat, 11 Jul 2009 21:15:33 +0000 (16:15 -0500)]
Added Doxygen config
Matt Mullins [Sat, 11 Jul 2009 20:54:21 +0000 (15:54 -0500)]
Added CMake config file.
Ivan Hernandez [Sat, 11 Jul 2009 20:08:39 +0000 (15:08 -0500)]
Initial commit