Conjure/OuijaMTLGJ2016
6
0
Fork 0
mirror of https://github.com/ConjureETS/OuijaMTLGJ2016.git synced 2026-03-24 02:01:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
121 Commits 1 Branch 0 Tags
Commit Graph

51 Commits

Author SHA1 Message Date
jparent
d1cd2c3aa5 final touch ups before submitting! 2016-01-31 18:27:31 -05:00
Patrice Vignola
53478b8bca blabla 2016-01-31 15:47:59 -05:00
RosimInc
445a1b3da7 Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 
Conflicts:
	Assets/scenes/GameplayScene.unity
	Assets/scripts/Character.cs
	Assets/scripts/LevelManager.cs
 2016-01-31 15:14:12 -05:00
RosimInc
b0723b1bc4 Did the game ending scene 2016-01-31 15:08:14 -05:00
antoine.mcnabb
26ceb963dc Menu 2016-01-31 14:57:20 -05:00
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
8ec3a069e6 Balancing 2016-01-31 14:36:26 -05:00
jparent
c81cba0d26 make the Rune pickup sound longer 2016-01-31 12:47:32 -05:00
jparent
221eecbc8d adjust scrapping volume threshold + velo factor 2016-01-31 12:24:29 -05:00
jparent
9f091574fc Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 2016-01-31 12:07:35 -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
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
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
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
13179d0be0 Fix bug on symbols not changing color correctly 2016-01-31 01:31:30 -05:00
Patrice Vignola
f436e8f341 Add the dash colors to the ropes 2016-01-30 22:22:33 -05:00
Patrice Vignola
bd34106af1 Combine de board with the players and Ouija 2016-01-30 20:08:24 -05:00
Dmitri Kolytchev
a29ad14324 Adding Lit Room 2 because the reference broke and anyway I made one that fits the perspective better, you just need to make invisible walls for it 2016-01-30 19:19:33 -05:00
Dmitri Kolytchev
4b4b2f5963 Merge branch 'master' of github.com:ConjureETS/OuijaMTLGJ2016 2016-01-30 18:09:25 -05:00
Dmitri Kolytchev
072315abc3 a bunch of stuff 2016-01-30 18:09:21 -05:00
jparent
f731d34fda Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 2016-01-30 17:35:06 -05:00
jparent
2863b716a1 add facecam prototype 2016-01-30 17:33:45 -05:00
Patrice Vignola
d8027c6a88 Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 2016-01-30 16:54:00 -05:00
Patrice Vignola
793ad331b8 Add working ropes 2016-01-30 16:52:43 -05:00
jparent
a403d653ee move the right characer prefabs to the prefab folder 2016-01-30 15:43:31 -05:00
RosimInc
307643d2f3 Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 2016-01-30 14:30:05 -05:00
Dmitri Kolytchev
e60530c787 Merge branch 'master' of github.com:ConjureETS/OuijaMTLGJ2016 2016-01-30 14:26:32 -05:00
Dmitri Kolytchev
322dc6e8e5 Adding room with lighting, textures and narmal maps (but no colors) 2016-01-30 14:26:25 -05:00
RosimInc
bb6233ad93 Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 2016-01-30 13:59:35 -05:00
RosimInc
3e259dfb9c Added a collider to the tiles, and created a makeshift player controller to test it. 
Changed the level generation to be centered.
 2016-01-30 13:59:24 -05:00
Patrice Vignola
1cc4ddc40f Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 
Conflicts:
	Assets/characters.meta
	Assets/characters/Source/Animator_controllers/Unity_Free_anims.controller
	Assets/prefabs.meta
	ProjectSettings/ProjectSettings.asset
 2016-01-30 12:59:59 -05:00
Patrice Vignola
2f3eca693c Add the players models and animations blending 2016-01-30 12:35:04 -05:00
antoine.mcnabb
196376316d Selector with bolts 2016-01-30 12:31:33 -05:00
Dmitri Kolytchev
ede0eb47f4 Exporting to OBJ and removing blenderfile 2016-01-30 11:48:24 -05:00
RosimInc
068de276e1 Added tile level generation with embedded runes. 2016-01-30 09:56:50 -05:00