Permalink
Switch branches/tags
Nothing to show
Commits on Jun 5, 2011
  1. Started work on player leave functionality. Seems to mostly work now,…

    jagregory committed Jun 5, 2011
    … except on one occasion when the second player rejoined they took control of Player 1 (and both could control it).
    
    I've digressed from collision detection, so I'm stashing this for now.
  2. Merge remote-tracking branch 'robhawkes/master'

    jagregory committed Jun 5, 2011
    Conflicts:
    	public/js/game/client.js
  3. Started refactoring hit detection. Made it messier so far. Introduced…

    jagregory committed Jun 5, 2011
    … Rects and Points, and created a getBounds func on player and tile, then we can do an intersection between the player rect and the surrounding tiles. Works currently, but it's overly strict and counts too many tiles.
    
    Also added hit detection debugging assistants in the form of bounding box and intersection display. In client.js, add showBoundingBoxes: true to the Renderer initialisation opts. Like so:
    
    var renderer = new KaboomRenderer({
      arena: $('#arena'),
      playerLayer: $('#playerLayer'),
      holding: $('#holding'),
      game: game,
      showBoundingBoxes: true
    });
    
    I will clean all this up once I've had some sleep :)
Commits on Jun 4, 2011
  1. Merge pull request #31 from stucampbell/master

    jagregory committed Jun 4, 2011
    Fixed scrolling problem
  2. Corrected key handling

    Stuart Campbell committed Jun 4, 2011
  3. Fixed scrolling problem

    Stuart Campbell committed Jun 4, 2011
  4. Merge pull request #29 from mrRiley/master

    jagregory committed Jun 4, 2011
    Transparent PNG white sprites
  5. Merge pull request #30 from palfrey/improved-collision-detection

    jagregory committed Jun 4, 2011
    Improved collision detection
  6. Improved collision detection

    palfrey committed Jun 4, 2011
  7. cleared sprite white image

    James Riley committed Jun 4, 2011
  8. Merge pull request #1 from samtse/master

    robhawkes committed Jun 4, 2011
    added change_direction_handler
  9. Fixed missing css

    jagregory committed Jun 4, 2011
  10. added direction_changed_handler - (untested!)

    Jerome Mayeux committed Jun 4, 2011
  11. Updated player positioning rendering to offset the sprites (due to th…

    jagregory committed Jun 4, 2011
    …e players being an odd size)
  12. Merge pull request #27 from stucampbell/master

    dylanbeattie committed Jun 4, 2011
    More integration
  13. Merge pull request #26 from palfrey/cleanup-tree

    dylanbeattie committed Jun 4, 2011
    Remove lots of files that really shouldn't be in the repo...
  14. More integration

    Stuart Campbell committed Jun 4, 2011
  15. Merge pull request #25 from stucampbell/master

    jagregory committed Jun 4, 2011
    Integration between client and socket.
  16. Merge pull request #24 from robhawkes/master

    jagregory committed Jun 4, 2011
    Stopped assuming all messages are join requests
  17. Fix up

    Stuart Campbell committed Jun 4, 2011
  18. Merge remote-tracking branch 'palfrey/collision-detection'

    jagregory committed Jun 4, 2011
    Conflicts:
    	public/js/game/kaboom.game.js
  19. Fixed asynchronous issue

    robhawkes committed Jun 4, 2011