Permalink
Switch branches/tags
Nothing to show
Commits on Nov 6, 2011
  1. l Final tweaks

    ValiumKnight committed Nov 6, 2011
  2. Merge branch 'develop' of github.com:jackiekircher/VimCity into develop

    Conflicts:
    	lib/vimcity/vim_city_game.rb
    ValiumKnight committed Nov 6, 2011
  3. add some directions

    jackiekircher committed Nov 6, 2011
  4. show splash screen

    jackiekircher committed Nov 6, 2011
  5. Merge branch 'develop' of github.com:jackiekircher/VimCity into develop

    Conflicts:
    	lib/vimcity/vim_city_game.rb
    ValiumKnight committed Nov 6, 2011
  6. Tweak gameplay conditions

    ValiumKnight committed Nov 6, 2011
  7. Revert "Automatic city generation"

    This reverts commit 74b8137.
    
    Conflicts:
    
    	lib/vimcity/vim_city_game.rb
    jackiekircher committed Nov 6, 2011
  8. Merge branch 'develop' into status_bar_tips

    Conflicts:
    	lib/vimcity/vim_city_game.rb
    jackiekircher committed Nov 6, 2011
  9. Pushing atmogen

    ValiumKnight committed Nov 6, 2011
  10. Automatic city generation

    ValiumKnight committed Nov 6, 2011
  11. Merge branch 'develop' into delete_buildings

    Conflicts:
    	lib/vimcity/map.rb
    	lib/vimcity/vim_city_game.rb
    jackiekircher committed Nov 6, 2011
  12. Destroyable buildings!

    jackiekircher committed Nov 6, 2011
  13. Merge branch 'develop' into fixing_collision

    Conflicts:
    	lib/vimcity/map.rb
    	lib/vimcity/vim_city_game.rb
    ValiumKnight committed Nov 6, 2011
  14. Implementing city logic

    ValiumKnight committed Nov 6, 2011
  15. Merge branch 'add_buildings' into develop

    Conflicts:
    	lib/vimcity/map.rb
    	lib/vimcity/vim_city_game.rb
    jackiekircher committed Nov 6, 2011
  16. gott buildings to print!

    jackiekircher committed Nov 6, 2011
  17. gott buildings to print!

    jackiekircher committed Nov 6, 2011
  18. Merge branch 'develop' into fixing_collision

    Conflicts:
    	lib/vimcity/vim_city_game.rb
    ValiumKnight committed Nov 6, 2011
  19. try to add buildings :(

    jackiekircher committed Nov 6, 2011