Repository navigation

Mini Project 5 - #36

Open

willythor wants to merge 101 commits into

sd16spring:masterfrom

willythor:master

Open

Mini Project 5#36
willythor wants to merge 101 commits into
sd16spring:masterfrom
willythor:master

Commits on Mar 7, 2016
- motherload with inifinite world generation to the left
  willythor
  committed
  939bcaa
- finite map to left and right
  willythor
  committed
  fb0a3cf
- collision detection works
  willythor
  committed
  8e80b00
- Add different frequency for blocks
  SungwooPark
  committed
  4ceceb8
- Add timer
  SungwooPark
  committed
  0ba296d
- Add fuel station
  SungwooPark
  committed
  4bd1d1c
- Separate the game model to model.py
  SungwooPark
  committed
  3f24603
- Change the name of model.py to game_model.py
  SungwooPark
  committed
  d9b132b
Commits on Mar 8, 2016
- "minor changes to key class"
  willythor
  committed
  9c3674d
- "infinite downward works, but memory alocation may suck"
  willythor
  committed
  7d710af
- "bunch of stuff works, but terribly disorganized"
  willythor
  committed
  b947bf2
- "a little more shiz works"
  willythor
  committed
  f684f03
- Add functionality for fuel station
  SungwooPark
  committed
  ded3a12
- random shiz
  willythor
  committed
  82759dd
- "yo"
  willythor
  committed
  4bd0ca0
- Add mineral counter
  SungwooPark
  committed
  708732d
- sprite bricks working
  willythor
  committed
  4caeadf
- Merge branch 'master' of https://github.com/david-hershey/InteractiveProgramming
  willythor
  committed
  c7acbdd
- yo
  willythor
  committed
  f1a2891
- fixed location start
  willythor
  committed
  a86fb97
- Add shop
  SungwooPark
  committed
  c844298
- Merge branch 'master' of github.com:david-hershey/InteractiveProgramming
  SungwooPark
  committed
  f935a06
- Add money counter
  SungwooPark
  committed
  fbc0aa7
- sprites
  willythor
  committed
  f8ab826
- fixed merge
  willythor
  committed
  9ee627f
- Update movement behavior for shop
  SungwooPark
  committed
  d9cfa21
- fixed bug
  willythor
  committed
  165ef2d
- sprites working like a mofo
  willythor
  committed
  ec183f7
- Add functionality to sell minerals
  SungwooPark
  committed
  efe25d4
- Add fuel station and shop image
  SungwooPark
  committed
  01e2781
- fixed infinite terrain
  willythor
  committed
  c4bbe64
- Merge branch 'master' of https://github.com/david-hershey/InteractiveProgramming
  willythor
  committed
  636562a
- Add image to the repo
  SungwooPark
  committed
  6a92b4e
- Merge branch 'master' of https://github.com/david-hershey/InteractiveProgramming
  willythor
  committed
  fb6242b
- Add ruby image
  SungwooPark
  committed
  6e383bc
- fixed infinite terrain
  willythor
  committed
  29d2d83
- fixed terrain gen
  willythor
  committed
  f46eb35
- fixed infinite terrain
  willythor
  committed
  f1dfeeb
- Fix merge conflict
  SungwooPark
  committed
  bf56ce1
- Add shop functionality
  SungwooPark
  committed
  e1e45cb
- fixed gravity
  willythor
  committed
  7e5cd18
- fixed gravity
  willythor
  committed
  088aa38
- make ruby image transparent
  SungwooPark
  committed
  05a25be
- Merge branch 'master' of github.com:david-hershey/InteractiveProgramming
  SungwooPark
  committed
  7ae455f
- Fix merge conflict
  SungwooPark
  committed
  9030b29
- Add transparent ruby image
  SungwooPark
  committed
  9294edc
Commits on Mar 9, 2016
- Add all minerals
  SungwooPark
  committed
  2592b78
- improved collision detection
  willythor
  committed
  2eb3dc9
- Changed typo
  SungwooPark
  committed
  b65b4ae
- fixed merged conflicts
  willythor
  committed
  e09000b
- Merge branch 'master' of https://github.com/david-hershey/InteractiveProgramming
  willythor
  committed
  67ef9d1
- fixed full station
  willythor
  committed
  d644bd5
- Fix a bug in which the enlarged world is blue
  SungwooPark
  committed
  8252b35
- Merge branch 'master' of github.com:david-hershey/InteractiveProgramming
  SungwooPark
  committed
  7288481
- Fix a bug that makes empty holes to be not generated
  SungwooPark
  committed
  ea173e1
- idk what this is
  willythor
  committed
  c45a3ae
- Merge branch 'master' of https://github.com/david-hershey/InteractiveProgramming
  willythor
  committed
  62b5e48
- Fix empty spot glitch
  SungwooPark
  committed
  7c4b9bd
- Merge branch 'master' of https://github.com/david-hershey/InteractiveProgramming
  willythor
  committed
  f9b4de9
Commits on Mar 10, 2016
- made vehicle smaller
  willythor
  committed
  165ff63
- fixed gravity bug
  willythor
  committed
  5b3ca2a
- digging a little better
  willythor
  committed
  adc9e08
- Add workshop
  SungwooPark
  committed
  c4f3a1d
- Merge branch 'master' of github.com:david-hershey/InteractiveProgramming
  SungwooPark
  committed
  901a59b
- saving work
  willythor
  committed
  93c0e50
- Merge branch 'master' of https://github.com/david-hershey/InteractiveProgramming
  willythor
  committed
  a0f8251
- Add workshop image
  SungwooPark
  committed
  0654ce5
- Merge branch 'master' of https://github.com/david-hershey/InteractiveProgramming
  willythor
  committed
  ae6d92a
- Add functionality for workshop
  SungwooPark
  committed
  d9602d4
- broke gravity again
  willythor
  committed
  99e55ea
- Merge branch 'master' of https://github.com/david-hershey/InteractiveProgramming
  willythor
  committed
  d3f0366
- Fixed workshop positioning
  SungwooPark
  committed
  ab8f91b
- better gravity
  willythor
  committed
  0ca2ad7
- Merge branch 'master' of github.com:david-hershey/InteractiveProgramming
  SungwooPark
  committed
  934a822
- Add score functionality
  SungwooPark
  committed
  357757d
- idk
  willythor
  committed
  805e6b0
- Merge branch 'master' of https://github.com/david-hershey/InteractiveProgramming
  willythor
  committed
  b75dd82
- cant drill up
  willythor
  committed
  48feea9
- Add game-over
  SungwooPark
  committed
  41cb1a3
- added different collision detect
  willythor
  committed
  a462359
- Merge branch 'master' of https://github.com/david-hershey/InteractiveProgramming
  willythor
  committed
  46e9f2f
- Fix collision stuff
  SungwooPark
  committed
  d9dd89c
- Fix merge conflict
  SungwooPark
  committed
  77fb7c0
- motherload2
  willythor
  committed
  23f3ade
- Merge branch 'master' of https://github.com/david-hershey/InteractiveProgramming
  willythor
  committed
  4b46b72
- Add collision detection for up movement
  SungwooPark
  committed
  ad072cc
- Implement drill left and right
  SungwooPark
  committed
  d5b8fac
- cabbage
  SungwooPark
  committed
  72ed9ea
- Renamed the file
  SungwooPark
  committed
  1c16dd0
- renamed a class
  willythor
  committed
  11c992f
- changed some class names
  willythor
  committed
  5a1d493
- Add installation instruction to readme
  SungwooPark
  committed
  6053435
- Merge branch 'master' of github.com:david-hershey/InteractiveProgramming
  SungwooPark
  committed
  55dd7b1
- Update README
  SungwooPark
  committed
  fdf846b
- Updated the code to run in README
  SungwooPark
  committed
  7b50cb9
- Add documentation for game_model
  SungwooPark
  committed
  31eb139
- added comments
  willythor
  committed
  9fe7c45
- Merge branch 'master' of https://github.com/david-hershey/InteractiveProgramming
  willythor
  committed
  5d86de6
- Add writeup file
  SungwooPark
  committed
  35da2a5
Commits on Mar 18, 2016
- Changed the top title of README
  SungwooPark
  committed
  f8d502a
Commits on Apr 19, 2016
- new classes
  willythor
  committed
  077ecd8

Commits

Commits on Mar 7, 2016

Commits on Mar 8, 2016

Commits on Mar 9, 2016

Commits on Mar 10, 2016

Commits on Mar 18, 2016

Commits on Apr 19, 2016