Commits · 99f9eec4717e931d20d6aa24c0f5390991b349b9 · Marcus / LD34

Dec 15, 2015
- finished · 99f9eec4
  Marcus Hoffmann authored 9 years ago
  
  99f9eec4
- Merge branch 'master' of github.com:Bubu/LD34 · b0f7b10b
  Marcus Hoffmann authored 9 years ago
  
  Conflicts: core/src/com/ld34/buttongame/level/Level1.java
  b0f7b10b
- lasers · 940c9a15
  Marcus Hoffmann authored 9 years ago
  
  940c9a15
- Merge branch 'master' of github.com:Bubu/LD34 · bc41f6e1
  Stephan Wäldchen authored 9 years ago
  
  Conflicts: core/src/com/ld34/buttongame/level/Level1.java
  bc41f6e1
- HHH · c05ce426
  Stephan Wäldchen authored 9 years ago
  
  c05ce426
- upt o l9 · 70b3fb36
  Marcus Hoffmann authored 9 years ago
  
  70b3fb36
Dec 14, 2015
- Merge branch 'master' of github.com:Bubu/LD34 · 008c7357
  Marcus Hoffmann authored 9 years ago
  
  Conflicts: core/src/com/ld34/buttongame/level/Level1.java
  008c7357
- fix · 339daae5
  Marcus Hoffmann authored 9 years ago
  
  339daae5
- levels · 88a1d42c
  Marcus Hoffmann authored 9 years ago
  
  88a1d42c
- Merge branch 'master' of github.com:Bubu/LD34 · e0670731
  Stephan Wäldchen authored 9 years ago
  
  Conflicts: core/src/com/ld34/buttongame/level/Level.java core/src/com/ld34/buttongame/level/Level1.java core/src/com/ld34/buttongame/level/Level5.java
  e0670731
- Lotta Stuff! · ffc2b840
  Stephan Wäldchen authored 9 years ago
  
  ffc2b840
- refactor obstacles · 057bc502
  Marcus Hoffmann authored 9 years ago
  
  057bc502
- Merge branch 'master' of github.com:Bubu/LD34 · 39d93216
  Marcus Hoffmann authored 9 years ago
  
  39d93216
- bugfixes · 32e9bd8c
  Marcus Hoffmann authored 9 years ago
  
  32e9bd8c
- Merge branch 'master' of github.com:Bubu/LD34 · 3ac3435c
  Stephan Wäldchen authored 9 years ago
  
  3ac3435c
- Hallo! · 2fbee487
  Stephan Wäldchen authored 9 years ago
  
  2fbee487
- jj · e35b9821
  Stephan Wäldchen authored 9 years ago
  
  e35b9821
- refactor · d0839b7f
  Marcus Hoffmann authored 9 years ago
  
  d0839b7f
- refactor into packages · 96ecf41a
  Marcus Hoffmann authored 9 years ago
  
  96ecf41a
- Merge branch 'master' of github.com:Bubu/LD34 · d7f35227
  Marcus Hoffmann authored 9 years ago
  
  d7f35227
- l4 · 50a73b00
  Marcus Hoffmann authored 9 years ago
  
  50a73b00
- Merge branch 'master' of github.com:Bubu/LD34 · 4fb61509
  Stephan Wäldchen authored 9 years ago
  
  Conflicts: core/src/com/ld34/buttongame/ButtonGame.java
  4fb61509
- vast changes! · 87e39427
  Stephan Wäldchen authored 9 years ago
  
  87e39427
- fixes · 14f2e2cc
  Marcus Hoffmann authored 9 years ago
  
  14f2e2cc
- fixes · 4fe5dfcd
  Marcus Hoffmann authored 9 years ago
  
  4fe5dfcd
Dec 13, 2015
- fixes · 372c45e0
  Marcus Hoffmann authored 9 years ago
  
  372c45e0
- Merge branch 'master' of github.com:Bubu/LD34 · 3f79c1de
  Stephan Wäldchen authored 9 years ago
  
  3f79c1de
- Hallo · e7a4402a
  Stephan Wäldchen authored 9 years ago
  
  e7a4402a
- sound · 727f4293
  Marcus Hoffmann authored 9 years ago
  
  727f4293
- integrated · 6ada7a91
  Marcus Hoffmann authored 9 years ago
  
  6ada7a91
- Merge branch 'master' of github.com:Bubu/LD34 · 31d8e805
  Marcus Hoffmann authored 9 years ago
  
  Conflicts: core/src/com/ld34/buttongame/ButtonGame.java core/src/com/ld34/buttongame/Resources.java
  31d8e805
- level select · aacdd253
  Marcus Hoffmann authored 9 years ago
  
  aacdd253
- dialogue! · 59b95b68
  Stephan Wäldchen authored 9 years ago
  
  59b95b68
- Yo! · 35b5861f
  Stephan Wäldchen authored 9 years ago
  
  35b5861f
- Yo! · c561d5fa
  Stephan Wäldchen authored 9 years ago
  
  c561d5fa
- level advance · f95fe27b
  Marcus Hoffmann authored 9 years ago
  
  f95fe27b
- targets · 91c1be0a
  Marcus Hoffmann authored 9 years ago
  
  91c1be0a
- moved graphcs · 55bcdaf4
  Marcus Hoffmann authored 9 years ago
  
  55bcdaf4
- Merge branch 'master' of github.com:Bubu/LD34 · a95db99e
  Stephan Wäldchen authored 9 years ago
  
  a95db99e
- New png's for you! · 60156efe
  Stephan Wäldchen authored 9 years ago
  
  60156efe