33 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
jparent	a44a6d11dd	Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016	2016-01-30 15:45:00 -05:00
jparent	a403d653ee	move the right characer prefabs to the prefab folder	2016-01-30 15:43:31 -05:00
maksimsen	892414bd36	SoundGen V2 for Game and Menu ... SoundGen package now has different sound systems for both the Game and the Menu	2016-01-30 15:42:36 -05:00
maksimsen	d33d8ecc73	Package with the static word generator script in it	2016-01-30 15:14: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	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	4400c1e7fe	Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016	2016-01-30 12:31:37 -05:00
antoine.mcnabb	196376316d	Selector with bolts	2016-01-30 12:31:33 -05:00
maksimsen	cbc1eed215	Second version of music generator	2016-01-30 12:29:14 -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
Patrice Vignola	dbf913a02f	Add player controls	2016-01-30 09:49:32 -05:00
antoine.mcnabb	5fee223ff5	Personnage 3D	2016-01-30 09:21:16 -05:00
maksimsen	731b759b0c	The assets for the music generator ... Attached in the UnityPackage is the code for the procedural music generator.	2016-01-30 05:52:32 -05:00
jparent	a73dd37967	add basic splashscreen with skippable settings	2016-01-30 04:58:39 -05:00
jparent	409c8ef571	add Thumbs.db to .gitignore	2016-01-30 04:04:14 -05:00
Dmitri Kolytchev	562bb78aae	Merge branch 'master' of github.com:ConjureETS/OuijaMTLGJ2016	2016-01-30 02:17:20 -05:00
Dmitri Kolytchev	96101e66d8	adding limits to player movement	2016-01-30 02:17:13 -05:00
jparent	a0b0c5f054	change settings to show meta files and force text	2016-01-30 01:34:03 -05:00
Dmitri Kolytchev	b94005c0cd	Merge github.com:ConjureETS/OuijaMTLGJ2016	2016-01-30 01:15:51 -05:00
Dmitri Kolytchev	27fbca1c46	initial commit	2016-01-30 01:15:35 -05:00
jparent	a804311222	add .gitignore	2016-01-30 00:29:57 -05:00