Skip to content
Commits on Jan 2, 2012
  1. Game browser now functions

    -User can create new game
    -User can join existing game and see basic info about current
    games
    committed Jan 1, 2012
Commits on Jan 1, 2012
  1. add favicon

    committed Dec 31, 2011
Commits on Dec 31, 2011
  1. login button works now

    In the future we may want to make this not refresh the page
    committed Dec 31, 2011
Commits on Dec 29, 2011
Commits on Dec 27, 2011
  1. Make game browser into a template

    Currently reacts to whether the user is logged in, but doesn't
    yet report the existing games.
    committed Dec 26, 2011
  2. Start work on a game browser for joining games

    - game now serves from /game.html
    - / will be our new game browser (served fromm index.html)
    - split style.css:
    	- main.css has general styling for all pages
    	- join.css has styling for our new game browser
    	- game.css has styling for the game page
    committed Dec 26, 2011
Commits on Dec 19, 2011
  1. @hashbrowncipher
  2. @hashbrowncipher

    A good almost-done point

    hashbrowncipher committed Dec 19, 2011
  3. @hashbrowncipher

    Many changes, all related to building.

    ajax.js:
        Change promptSettlement to promptVertex
        Retool promptNewSettlement so that it gives correct options
        Refactor myself a promptSetupSettlement to do setup settlements
    
    gamelogic.js:
        Make insertSettlement take a compressed vertex
        Create a getBadDistanceRule
        Remove unnecessary if-statements in remove.*Resources()
    hashbrowncipher committed Dec 19, 2011
  4. @hashbrowncipher

    Merge branch 'master' of github.com:341-catan/catan

    Conflicts:
    	client/js/ajax.js
    hashbrowncipher committed Dec 19, 2011
  5. @hashbrowncipher
  6. @hashbrowncipher

    Merge branch 'master' of github.com:341-catan/catan

    Conflicts:
    	client/js/ajax.js
    hashbrowncipher committed Dec 19, 2011
  7. @hashbrowncipher
  8. little js var fix

    committed Dec 18, 2011
Commits on Dec 18, 2011
  1. @hashbrowncipher

    Many more changes

    controller.py: don't try to give cards out for desert tiles
    hexes.py: add desert tile to valid tiles, split preboard from valid
    models.py: remove TurnCount
    ajax.js:
        split into two types of req_handlers
        change up prompting for settlements
        ticker_name many of the things
        do_turn handler can do the robber now
    constants.js: add hex handling code, change colors
    drawing.js:
        refactor mousehandling code
        change painting of road detectors
        send compressed coords to dispChit
        create a drawChitDetector function
        refactor myself a getChitCoords function
    game.js:
        parseInt the userid
        keep track of the robber position
    gamelogic.js: add a hex adjacency function
    hashbrowncipher committed Dec 18, 2011
  2. @hashbrowncipher

    Many changes

    index.html:
        Rearrange things and remove canvas for ticker
        Fixes page being too wide
    ajax.js:
        Use deferreds to handle req_setup + {road, settlement} prompts
    drawing.js:
        change getVertexCoords to take a compressed vertex
        retool draw{Road,Settlement}(detector)? procedures somewhat
    style.css:
        add code for the new ticker.  It will need some work.
    hashbrowncipher committed Dec 18, 2011
  3. @hashbrowncipher
Commits on Dec 17, 2011
  1. make resources update

    committed Dec 17, 2011
  2. @hashbrowncipher
  3. @hashbrowncipher
  4. fix setup detect road step

    committed Dec 17, 2011
Something went wrong with that request. Please try again.