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

50 Commits

Author SHA1 Message Date
jparent
c9371d36e7 make splashscreen background stretch full screen 2016-01-31 14:34:04 -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
jparent
744bd8cbab fix particle system for character dash 2016-01-31 13:39:53 -05:00
Patrice Vignola
866f08d2e7 xaby to dash 2016-01-31 12:49:58 -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
Patrice Vignola
80f6bd622a Fix the fucking physics 2016-01-31 10:59:05 -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
1670768031 Adjusted some code, changed the floor assets again 2016-01-31 06:26:04 -05:00
Patrice Vignola
13179d0be0 Fix bug on symbols not changing color correctly 2016-01-31 01:31:30 -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
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
7daedf9b55 Added glow when walking onto tiles. 2016-01-30 16:40:16 -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
8f3979e414 tweaking ouija prefab center 2016-01-30 12:34:30 -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
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
Patrice Vignola
dbf913a02f Add player controls 2016-01-30 09:49:32 -05:00
jparent
a73dd37967 add basic splashscreen with skippable settings 2016-01-30 04:58:39 -05:00
jparent
a0b0c5f054 change settings to show meta files and force text 2016-01-30 01:34:03 -05:00
Dmitri Kolytchev
27fbca1c46 initial commit 2016-01-30 01:15:35 -05:00