Permalink
Switch branches/tags
Nothing to show
Commits on Aug 20, 2013
  1. Merge pull request #17 from guoguo12/master

    SubSage committed Aug 20, 2013
    Remove unneeded import statements
Commits on Aug 19, 2013
  1. Merge pull request #16 from frekfra/master

    SubSage committed Aug 19, 2013
    Moved menus to seperate states
Commits on Aug 12, 2013
  1. Moved menus to seperate states

    frekfra committed Aug 12, 2013
    PostGame, Main and Highscore menu now seperate states from playState.
    Game can now be restarted.
    Player can enter name.
    Error with input, if listening for a number of keys space+enter, in highscore, and postgame, the statements will automatically be true for some reason.
Commits on Aug 6, 2013
  1. Merge pull request #12 from frekfra/master

    SubSage committed Aug 6, 2013
    Added fly-in when player starts game and when the player respawns + small fixes.
  2. Merge remote-tracking branch 'upstream/master'

    frekfra committed Aug 6, 2013
    Conflicts:
    	GDCalaga/highscore.dat
    	GDCalaga/src/org/gdc/gdcalaga/Gun.java
    	GDCalaga/src/org/gdc/gdcalaga/PlayState.java
    	GDCalaga/src/org/gdc/gdcalaga/Player.java
  3. Update .gitignore

    frekfra committed Aug 6, 2013
  4. Update .gitignore

    frekfra committed Aug 6, 2013
    ignoring highscore.dat
Commits on Aug 5, 2013
  1. Changed magic number velocity in Gun class to use constructor parameter.

    frekfra committed Aug 5, 2013
    Implemented fly-in sequence for when player starts/dies.
Commits on Aug 2, 2013
  1. Should work?

    SubSage committed Aug 2, 2013
    Testing out this update. Had to go into CMD line, so hope for the best.
    
    Gives a HUD
Commits on Aug 1, 2013
  1. Merge remote-tracking branch 'upstream/master'

    frekfra committed Aug 1, 2013
    Conflicts:
    	GDCalaga/highscore.dat
  2. Player now uses Gun class for weapon.

    frekfra committed Aug 1, 2013
    Player now has three lives. When player loses all health a life will be lost.
    Added "graphical" heads-up-display with player lives, health, and current weapon name.
    removed debug log from highscoreList class.
    refactored gun parameter names.
  3. MAGIC

    SubSage committed Aug 1, 2013
    I can't find how the player was instanciated....yeah
Commits on Jul 30, 2013
  1. Music.

    SubSage committed Jul 30, 2013
    Some music that I forgot to add.
  2. Merge pull request #8 from frekfra/master

    SubSage committed Jul 30, 2013
    added some menu functionality and two new weapons to enemies.
  3. Delete #Player.java#

    frekfra committed Jul 30, 2013
    unintended commit
  4. Added mainmenu, (newgame button will not reset game state.)

    frekfra committed Jul 30, 2013
    Added Highscore list, will be read and written to file.
    Added Gun clas which acts as a bullet factory.
    Enemies have randomized guns (three variants, straight shot, shot in player direction, and triple shot)
    change damage to be on entity instead of bullet in order to do ship-to-ship collision damage.
    Modified PlayState to use state variable to change render and input mechanics.
Commits on Apr 28, 2013
  1. changes

    SubSage committed Apr 28, 2013
    no enemy shooting audio and increased spawn delay between enemies
  2. GunPositions

    SubSage committed Apr 28, 2013
    Just changed a few positions and added...I'm thinking of removing the 45
    degree ones....let's not give the player lot's of range? Headed that
    way...
Commits on Apr 11, 2013
  1. Minor fix.

    SubSage committed Apr 11, 2013
    Put pathNum back to what it should be.
  2. testing stuff

    SubSage committed Apr 11, 2013
    will fix pathnum later today
Commits on Apr 10, 2013
  1. Added surrounding kill area.

    SubSage committed Apr 10, 2013
    Enemies that go super our of bounds are killed. This allows us to make
    paths where the enemies do a drive by :D
  2. Path addition

    SubSage committed Apr 10, 2013
    Making the addition of new paths easier to handle. You would have to
    update a certain variable if you added new paths, no more!
Commits on Apr 8, 2013
  1. Merge pull request #7 from guoguo12/master

    fsxfreak committed Apr 8, 2013
    Simplify upgrades system
  2. Simplify upgrades system

    guoguo12 committed Apr 8, 2013
    Note that I have removed the speed upgrade from the UpgradeType enum. In
    my opinion, because the speed upgrade is non-droppable, it should not be
    considered an UpgradeType. Perhaps speed upgrades could be directly
    applied to the player from the future code that handles the upgrades
    store.
    
    Also, my code is formatted slightly differently from the rest of the
    code base, which is written in a style more reminiscent of C++ than
    Java. I can fix this if necessary.
  3. Merge pull request #6 from guoguo12/master

    SubSage committed Apr 8, 2013
    Simplify upgrade drop code
  4. Simplify random upgrade drop calculations

    guoguo12 committed Apr 8, 2013
    There doesn't seem to be a particular advantage to using Random here. If
    Random must be used, a universal Random object would suffice.
  5. Clean up code

    guoguo12 committed Apr 8, 2013
    Removed an unnecessary instantiation, deleted an unused import, etc.
Commits on Apr 7, 2013
  1. Merge pull request #5 from guoguo12/master

    SubSage committed Apr 7, 2013
    Minor edits
  2. Remove unnecessary code

    guoguo12 committed Apr 7, 2013
    Hi, I'm Allen! I was browsing your code and I am interested in
    contributing to GDCalaga. Thanks!
  3. Small things.

    SubSage committed Apr 7, 2013
Commits on Apr 6, 2013
  1. Revised our GUI text method

    fsxfreak committed Apr 6, 2013