Commits · ab265aa19738d0c7766db28b2c3bd1ae01f39a7f · Emery Tanghanwaye / waterGame

19 Jan, 2020 24 commits
- Merge branch 'final' · ab265aa1
  Emery Tanghanwaye authored Jan 19, 2020
  
  ab265aa1
- more hacky fixes · 353918a8
  Emery Tanghanwaye authored Jan 19, 2020
  
  353918a8
- hacky fixes · c4c45841
  Emery Tanghanwaye authored Jan 19, 2020
  
  c4c45841
- fix stuff · d8df0709
  Emery Tanghanwaye authored Jan 19, 2020
  
  d8df0709
- waterGame: add executables · 4695f750
  Emery Tanghanwaye authored Jan 19, 2020
  
  4695f750
- Merge branch 'eric.vanderwoude-master-patch-24074' into 'master' · 7b666da6
  eric.vanderwoude authored Jan 19, 2020
```
Update Music/5_Strolling_in_Bliss.ogg, Music/6_Trolls_Feast_Tonight.ogg,...

See merge request !7
```
  7b666da6
- Update Music/5_Strolling_in_Bliss.ogg, Music/6_Trolls_Feast_Tonight.ogg,... · 9a3b5f05
  eric.vanderwoude authored Jan 19, 2020
```
Update Music/5_Strolling_in_Bliss.ogg, Music/6_Trolls_Feast_Tonight.ogg, Music/7_Serene_Acoustic_Vibes.ogg, Music/8_Fields_of_the_Lost.ogg files
```
  9a3b5f05
- final · 9a2a3209
  Emery Tanghanwaye authored Jan 19, 2020
  
  9a2a3209
- Merge branch 'eric.vanderwoude-master-patch-47577' into 'master' · 382873ac
  eric.vanderwoude authored Jan 19, 2020
```
Update Music/3_Technopop_7d.ogg, Music/4_Following_Spirits.ogg files

See merge request !6
```
  382873ac
- Update Music/3_Technopop_7d.ogg, Music/4_Following_Spirits.ogg files · ae739fba
  eric.vanderwoude authored Jan 19, 2020
  
  ae739fba
- Merge branch 'eric.vanderwoude-master-patch-04153' into 'master' · 4eb0875d
  eric.vanderwoude authored Jan 19, 2020
```
Update Music/2_Peaceful_Orbits.ogg

See merge request !5
```
  4eb0875d
- Update Music/2_Peaceful_Orbits.ogg · 8c9c4e3c
  eric.vanderwoude authored Jan 19, 2020
  
  8c9c4e3c
- Merge branch 'eric.vanderwoude-master-patch-55933' into 'master' · dd459d58
  eric.vanderwoude authored Jan 19, 2020
```
Update Music/1_Aerobatics_in_Slow_Motion.ogg

See merge request !4
```
  dd459d58
- Update Music/1_Aerobatics_in_Slow_Motion.ogg · 7588055c
  eric.vanderwoude authored Jan 19, 2020
  
  7588055c
- Merge remote-tracking branch 'origin/Music' · 4645cc36
  Emery Tanghanwaye authored Jan 19, 2020
  
  4645cc36
- waterGame: add backgrounds, remove features we will not complete · 6a3a5efd
  Emery Tanghanwaye authored Jan 19, 2020
  
  6a3a5efd
- Update Music/1_Aerobatics_in_Slow_Motion.mp3, Music/2_Peaceful_Orbits.mp3,... · d4ebeb57
  eric.vanderwoude authored Jan 19, 2020
```
Update Music/1_Aerobatics_in_Slow_Motion.mp3, Music/2_Peaceful_Orbits.mp3, Music/3_Technopop_7d.mp3, Music/4_Following_Spirits.mp3, Music/5_Strolling_in_Bliss.mp3, Music/6_Trolls_Feast_Tonight.mp3, Music/7_Serene_Acoustic_Vibes.mp3, Music/8_Fields_of_the_Lost.mp3 files
```
  d4ebeb57
- waterGame: fix validation in Money property · 1fdc0b66
  Emery Tanghanwaye authored Jan 19, 2020
  
  1fdc0b66
- waterGame: add placeholder lose conditions if the player doesn't make enough profit · 77428787
  Emery Tanghanwaye authored Jan 19, 2020
  
  77428787
- waterGame: ensure players will fail if they end up in the bad route · 4bdfcddd
  Emery Tanghanwaye authored Jan 19, 2020
  
  4bdfcddd
- waterGame: add documentation · 78a2f218
  Emery Tanghanwaye authored Jan 19, 2020
  
  78a2f218
- waterGame: remove old source files · a9597df2
  Emery Tanghanwaye authored Jan 19, 2020
  
  a9597df2
- waterGame: add stage 5 for good path, and better transitioning · fe380217
  Emery Tanghanwaye authored Jan 19, 2020
  
  fe380217
- waterGame: create all but the final stage · d55be889
  Emery Tanghanwaye authored Jan 19, 2020
  
  d55be889
18 Jan, 2020 4 commits
- waterGame: improve button code · 2ec819bf
  Emery Tanghanwaye authored Jan 18, 2020
  
  2ec819bf
- waterGame: add scrolling support · cb5b7538
  Emery Tanghanwaye authored Jan 18, 2020
  
  cb5b7538
- waterGame: initial work · 28cb810e
  Emery Tanghanwaye authored Jan 18, 2020
  
  28cb810e
- waterGame: initial commit · dad8a11a
  Emery Tanghanwaye authored Jan 18, 2020
  
  dad8a11a