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
67 Commits 1 Branch 0 Tags
Commit Graph

57 Commits

Author SHA1 Message Date
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
Patrice Vignola
13179d0be0 Fix bug on symbols not changing color correctly 2016-01-31 01:31:30 -05:00
RosimInc
802f7a3eb2 Updated the last two runes 2016-01-30 23:02:01 -05:00
jparent
a8eb1d12f8 Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 2016-01-30 22:50:58 -05:00
jparent
75a825c62d add lookAt offset to camera for more control 2016-01-30 22:48:06 -05:00
RosimInc
a936b3e77c Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 2016-01-30 22:47:12 -05:00
RosimInc
87d8f9558c Added new rune assets 2016-01-30 22:46:37 -05:00
Patrice Vignola
b52cf7f70e Fix camera 2016-01-30 22:38:55 -05:00
Patrice Vignola
f436e8f341 Add the dash colors to the ropes 2016-01-30 22:22:33 -05:00
Patrice Vignola
1bd8898fa7 Start integrating the main gameplay scene 2016-01-30 21:35:28 -05:00
Patrice Vignola
c90d913cf4 Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 2016-01-30 20:12:57 -05:00
Patrice Vignola
bd34106af1 Combine de board with the players and Ouija 2016-01-30 20:08:24 -05:00
jparent
5af916dd4a Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 2016-01-30 19:50:26 -05:00
jparent
ea674245cf add anchored and fixed camera behavior tests 2016-01-30 19:49:33 -05:00
RosimInc
4da2b94dff Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 2016-01-30 19:31:04 -05:00
RosimInc
7c4cef3a49 Added the word solving system. 
Bug: After a player finishes the game, application will crash. Make sure winning scenario is handled.
Gameplay scene is gameplay_02.unity.
 2016-01-30 19:30:39 -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
Patrice Vignola
3efe9826be Fix bunch of stuff 2016-01-30 18:37:40 -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
RosimInc
6ac3b0a2f1 Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 2016-01-30 16:40:25 -05:00
RosimInc
7daedf9b55 Added glow when walking onto tiles. 2016-01-30 16:40:16 -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
jparent
60bb2b4a97 add spring joint test scene [jptest] 2016-01-30 13:54:36 -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
Dmitri Kolytchev
62e1232c0e Merge branch 'master' of github.com:ConjureETS/OuijaMTLGJ2016 2016-01-30 12:34:39 -05:00
Dmitri Kolytchev
8f3979e414 tweaking ouija prefab center 2016-01-30 12:34:30 -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
Dmitri Kolytchev
470dcd59e2 Adding 3d selector with textures 2016-01-30 11:44:00 -05:00
Dmitri Kolytchev
d65784b33f removing superfluous assets 2016-01-30 10:53:11 -05:00
Dmitri Kolytchev
65abb2c0fc adding a bunch of shitty selector-related assets 2016-01-30 10:50:36 -05:00
RosimInc
068de276e1 Added tile level generation with embedded runes. 2016-01-30 09:56:50 -05:00