109 Commits

Author SHA1 Message Date
antoine.mcnabb
a8aecd2713 Merge Menu 2016-01-31 14:54:16 -05:00
antoine.mcnabb
5053a93150 Menu Screen 2016-01-31 14:51:12 -05:00
jparent
c9562f239e Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 2016-01-31 14:45:46 -05:00
jparent
40f280ea3e add horn sound on match start 2016-01-31 14:45:13 -05:00
Patrice Vignola
66a69365e9 Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016
Conflicts:
	Assets/scenes/GameplayScene.unity
2016-01-31 14:38:38 -05:00
Patrice Vignola
8ec3a069e6 Balancing 2016-01-31 14:36:26 -05:00
jparent
c9371d36e7 make splashscreen background stretch full screen 2016-01-31 14:34:04 -05:00
jparent
7ba3cdd21f make the menu screen skippable after certain time 2016-01-31 14:27:50 -05:00
jparent
f092ab1aa4 add Splashscreen 2016-01-31 14:26:59 -05:00
Dmitri Kolytchev
1ad03a8d4b dammit merge undid my tweaks 2016-01-31 13:51:49 -05:00
Dmitri Kolytchev
1328c75351 Merge branch 'master' of github.com:ConjureETS/OuijaMTLGJ2016 2016-01-31 13:50:03 -05:00
Dmitri Kolytchev
cca76b6f04 more GUI tweaks 2016-01-31 13:47:54 -05:00
jparent
47e12265fb Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 2016-01-31 13:40:41 -05:00
jparent
744bd8cbab fix particle system for character dash 2016-01-31 13:39:53 -05:00
Dmitri Kolytchev
e10a68b829 GUI Tweaks and Merge branch 'master' of github.com:ConjureETS/OuijaMTLGJ2016 2016-01-31 13:34:23 -05:00
Dmitri Kolytchev
bc6f577139 GUI Tweaks 2016-01-31 13:34:10 -05:00
maksimsen
d0266fd58c Main menu scene 2016-01-31 13:31:20 -05:00
Patrice Vignola
3107c23599 Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 2016-01-31 12:50:11 -05:00
Patrice Vignola
866f08d2e7 xaby to dash 2016-01-31 12:49:58 -05:00
jparent
c81cba0d26 make the Rune pickup sound longer 2016-01-31 12:47:32 -05:00
jparent
9bf26919e6 Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 2016-01-31 12:25:34 -05:00
jparent
221eecbc8d adjust scrapping volume threshold + velo factor 2016-01-31 12:24:29 -05:00
antoine.mcnabb
41e620a54c Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 2016-01-31 12:23:44 -05:00
antoine.mcnabb
eea923860e Beard UI 2016-01-31 12:22:50 -05:00
jparent
9f091574fc Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 2016-01-31 12:07:35 -05:00
jparent
2523ce3680 fix scrapping sound volume jumping around
use a lerp to smooth volume adjustments
2016-01-31 12:02:40 -05:00
jparent
c4a88873e2 add rune pickup sound 2016-01-31 11:27:38 -05:00
Dmitri Kolytchev
a29a601772 New Floor (and merge)
Merge branch 'master' of github.com:ConjureETS/OuijaMTLGJ2016
2016-01-31 11:24:41 -05:00
Dmitri Kolytchev
ee00ea6566 new floor 2016-01-31 11:24:36 -05:00
Patrice Vignola
1d4c40adf9 Adjust.. whatever 2016-01-31 11:18:06 -05:00
Patrice Vignola
4a8d88e7a1 Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016
Conflicts:
	Assets/scenes/GameplayScene.unity
2016-01-31 10:59:54 -05:00
Patrice Vignola
80f6bd622a Fix the fucking physics 2016-01-31 10:59:05 -05:00
jparent
e161bf8411 add gameplay music and scrapping sounds 2016-01-31 10:50:01 -05:00
jparent
00cc176081 Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 2016-01-31 10:31:17 -05:00
jparent
cfa24430c1 add SFX and play scrapping sound based on velocity 2016-01-31 10:29:38 -05:00
antoine.mcnabb
7664e645d1 GUI de gameplay 2016-01-31 10:26:14 -05:00
Patrice Vignola
01361d8ae8 Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016
Conflicts:
	Assets/scripts/RuneBehaviour.cs
2016-01-31 09:58:35 -05:00
Patrice Vignola
fe98521b0d Fix 2016-01-31 09:53:08 -05:00
Dmitri Kolytchev
a53fef82d4 tweaking the board to a manageable size 2016-01-31 09:41:29 -05:00
Dmitri Kolytchev
da8d5a0506 Added Fenrir 2016-01-31 08:38:21 -05:00
Patrice Vignola
ece88e2c7e Stuff 2016-01-31 08:32:38 -05:00
Dmitri Kolytchev
072de8a736 Importing room .obj because I'm an idiot and forgot people don't all have blender 2016-01-31 07:40:36 -05:00
Patrice Vignola
3854ff44e7 Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016
Conflicts:
	Assets/scripts/SelectorWithBolts.cs
2016-01-31 07:27:16 -05:00
Patrice Vignola
cd53d3f012 Add the rune capture basic behavior 2016-01-31 07:26:29 -05:00
RosimInc
4001d0cc15 Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 2016-01-31 06:26:12 -05:00
RosimInc
1670768031 Adjusted some code, changed the floor assets again 2016-01-31 06:26:04 -05:00
jparent
2a731d0532 add visual feedback (particles) when player dashes 2016-01-31 03:25:35 -05:00
RosimInc
9685919fef Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 2016-01-31 02:41:39 -05:00
RosimInc
4701ef72ef Darker floor design 2016-01-31 02:41:20 -05:00
Patrice Vignola
12925f9e29 Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016
Conflicts:
	Assets/scripts/RuneBehaviour.cs
2016-01-31 01:32:38 -05:00