Commits · 16f87cbfedf91dc039af8250665de1281c63bd8d · gstuitje / RingMaster

04 Feb, 2019 17 commits

mmaluschnig authored Feb 04, 2019

* mimemime:
  Now you can select a song.
  correct name for night menu
  started work on the tarantella for mime mime.
  created lo-fi song select menu

# Conflicts:
#	RingMaster/RingMaster/.vs/RingMaster/xs/UserPrefs.xml

16f87cbf

Now you can select a song. · 57d3c6af
gstuitje authored Feb 04, 2019

57d3c6af
user prefs · 06c0dbba
mmaluschnig authored Feb 04, 2019

06c0dbba

Merge branch 'mimemime' of https://altitude.otago.ac.nz/gstuitje/ringmaster into mimemime · a4b45621

mmaluschnig authored Feb 04, 2019

* 'mimemime' of https://altitude.otago.ac.nz/gstuitje/ringmaster:
  started work on the tarantella for mime mime.

# Conflicts:
#	RingMaster/RingMaster/.vs/RingMaster/xs/UserPrefs.xml
#	RingMaster/RingMaster/.vs/RingMaster/xs/sqlite3/storage.ide-shm
#	RingMaster/RingMaster/.vs/RingMaster/xs/sqlite3/storage.ide-wal
#	RingMaster/RingMaster/Assets/Sounds/Bushwick Tarantella (muffled).mp3.meta
#	RingMaster/RingMaster/Assets/Sounds/DarxieLand (muffled).mp3.meta
#	RingMaster/RingMaster/Assets/Sounds/Fig Leaf Times Two (muffled).mp3.meta
#	RingMaster/RingMaster/Assets/Sounds/Fig Leaf Times Two.mp3.meta
#	RingMaster/RingMaster/Assets/Sounds/Fluffing a Duck (muffled).mp3.meta
#	RingMaster/RingMaster/Assets/Sounds/Fluffing a Duck.mp3.meta
#	RingMaster/RingMaster/Assets/Sounds/Gaslamp Funworks (muffled).mp3.meta
#	RingMaster/RingMaster/Assets/Sounds/Hyperfun (muffled).mp3.meta
#	RingMaster/RingMaster/Assets/Sounds/Hyperfun.mp3.meta
#	RingMaster/RingMaster/Assets/Sounds/Manic Polka (muffled).mp3.meta
#	RingMaster/RingMaster/Assets/Sounds/Manic Polka.mp3.meta
#	RingMaster/RingMaster/Assets/Sounds/Meatball Parade (muffled).mp3.meta
#	RingMaster/RingMaster/Assets/Sounds/No Spam Polka (muffled).mp3.meta
#	RingMaster/RingMaster/Assets/Sounds/Wagon Wheel (muffled).mp3.meta
#	RingMaster/RingMaster/Assets/Sounds/daytime-background.mp3.meta
#	RingMaster/RingMaster/Assets/Sounds/dvorak-polka-by-kevin-macleod(muffled).mp3.meta
#	RingMaster/RingMaster/Assets/Sounds/glee-club-polka-by-kevin-macleod (muffled).mp3.meta

a4b45621

correct name for night menu · c0a428eb
mmaluschnig authored Feb 04, 2019

c0a428eb
started work on the tarantella for mime mime. · 0ac5e321
gstuitje authored Feb 04, 2019

0ac5e321
created lo-fi song select menu · 63899b73
mmaluschnig authored Feb 04, 2019

63899b73

Merge branch 'master' into daytime · 65e3bec9

mmaluschnig authored Feb 04, 2019

* master:
  added pie throwing to build
  added pause menu to Trapeze
  fixed performance menu

65e3bec9

merge pie throwing (added songs) · d178695a
mmaluschnig authored Feb 04, 2019

d178695a

Merge branch 'piethrowing' into mimemime · bd199c14

mmaluschnig authored Feb 04, 2019

* piethrowing:
  Added a bunch of new music and muffled versions of them, plus some ambient birdsong for the daytime scene
  Re-fixed moving target spawn bugs

bd199c14

commit this. · b2f6678b
gstuitje authored Feb 04, 2019

b2f6678b
added pie throwing to build · d38ee90a
Mitchie Maluschnig authored Feb 04, 2019

d38ee90a
added pause menu to Trapeze · 28a715a6
Mitchie Maluschnig authored Feb 04, 2019

28a715a6
fixed performance menu · e5f94571
Mitchie Maluschnig authored Feb 04, 2019

e5f94571
Added a bunch of new music and muffled versions of them, plus some ambient... · 3c16b3b0
astatham authored Feb 04, 2019
```
Added a bunch of new music and muffled versions of them, plus some ambient birdsong for the daytime scene
```
3c16b3b0
added animations to characters and created John Smith as an interactable character · 006cc674
Mitchie Maluschnig authored Feb 04, 2019

006cc674
Merge branch 'master' into daytime · 4c7bfad3
Mitchie Maluschnig authored Feb 04, 2019
```
# Conflicts:
#	RingMaster/RingMaster/ProjectSettings/ProjectVersion.txt
```
4c7bfad3

03 Feb, 2019 3 commits
- Now Simon and john smith have idle animations · bf245ecb
  nedboy3 authored Feb 03, 2019
  
  bf245ecb
- added some scalability to trapeze generation · b8bf6cad
  Mitchie Maluschnig authored Feb 03, 2019
  
  b8bf6cad
- better procedural generation of trapezes, camera now zooms out when player in mid air · eae17825
  Mitchie Maluschnig authored Feb 03, 2019
  
  eae17825
02 Feb, 2019 4 commits
- added idle animations for ahava, also gave her shoes. · 1143eb48
  nedboy3 authored Feb 02, 2019
  
  1143eb48
- Re-fixed moving target spawn bugs · 1f5261f4
  astatham authored Feb 02, 2019
  
  1f5261f4
- Prototype Complete. fixed bug where trapeze would trigger imediatly after... · 7a9bcf5c
  Mitchie Maluschnig authored Feb 02, 2019
```
Prototype Complete. fixed bug where trapeze would trigger imediatly after letting go (now waits 0.5 sec).
```
  7a9bcf5c
- trying a different way of structuring trapeze person · 6b0e4e48
  Mitchie Maluschnig authored Feb 02, 2019
  
  6b0e4e48
01 Feb, 2019 16 commits
- added a second platform for fun! · 5cc6a806
  Mitchie Maluschnig authored Feb 01, 2019
  
  5cc6a806
- Started prototype for trapeze · a3619404
  Mitchie Maluschnig authored Feb 01, 2019
  
  a3619404
- Merge branch 'master' of https://altitude.otago.ac.nz/gstuitje/ringmaster · 0a358f15
  nedboy3 authored Feb 01, 2019
  
  0a358f15
- fixed · 6823b5ad
  nedboy3 authored Feb 01, 2019
  
  6823b5ad
- Merge branch 'piethrowing' · 08677103
  Mitchie Maluschnig authored Feb 01, 2019
```
# Conflicts:
#	RingMaster/RingMaster/.vs/RingMaster/xs/UserPrefs.xml
```
  08677103
- merge mime mime int master · 785f46a8
  Mitchie Maluschnig authored Feb 01, 2019
  
  785f46a8
- Merge branch 'mimemime' · 220ce5d5
  Mitchie Maluschnig authored Feb 01, 2019
  
  220ce5d5
- Merge branch 'master' of https://altitude.otago.ac.nz/gstuitje/ringmaster · e50329ac
  nedboy3 authored Feb 01, 2019
  
  e50329ac
- made changes to make Simon more consistent with other models · 24576401
  nedboy3 authored Feb 01, 2019
  
  24576401
- Now simon and the player have an idle animation. · e4003191
  nedboy3 authored Feb 01, 2019
  
  e4003191
- (Hopefully) fixed moving target bug · eca6c009
  astatham authored Feb 01, 2019
  
  eca6c009
- added a particle system which shows good/bad/perfect above players head · a26c19a6
  Mitchie Maluschnig authored Feb 01, 2019
  
  a26c19a6
- character dance a little less obtrusive(just simple stuff for alpha) · b079a9ae
  Mitchie Maluschnig authored Feb 01, 2019
  
  b079a9ae
- organised scripts folder · 8503d4e3
  Mitchie Maluschnig authored Feb 01, 2019
  
  8503d4e3
- pie throwing now exits when GameOver variable is set · bee443d7
  Mitchie Maluschnig authored Feb 01, 2019
  
  bee443d7
- whoops god rid of a test line · a33ba86d
  Mitchie Maluschnig authored Feb 01, 2019
  
  a33ba86d