Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• d1cd2c3aa5 final touch ups before submitting! master jparent 2016-01-31 18:27:31 -05:00
• 852b474c87 dsggesgsrg Patrice Vignola 2016-01-31 16:40:34 -05:00
• 2b39079cbe Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 Patrice Vignola 2016-01-31 15:48:08 -05:00
• 53478b8bca blabla Patrice Vignola 2016-01-31 15:47:59 -05:00
• 27a2a44362 Adjusted hint texts RosimInc 2016-01-31 15:46:17 -05:00
• 2937472366 Finalized game ending RosimInc 2016-01-31 15:19:13 -05:00
• 445a1b3da7 Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 RosimInc 2016-01-31 15:14:12 -05:00
• b0723b1bc4 Did the game ending scene RosimInc 2016-01-31 15:08:14 -05:00
• 885c9a0002 build settings jparent 2016-01-31 15:06:02 -05:00
• e3692abe21 add missing short horn wav jparent 2016-01-31 15:05:29 -05:00
• 25a7693960 Menu dans scene antoine.mcnabb 2016-01-31 15:00:29 -05:00
• 26ceb963dc Menu antoine.mcnabb 2016-01-31 14:57:20 -05:00
• a8aecd2713 Merge Menu antoine.mcnabb 2016-01-31 14:54:16 -05:00
• 5053a93150 Menu Screen antoine.mcnabb 2016-01-31 14:51:12 -05:00
• c9562f239e Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 jparent 2016-01-31 14:45:46 -05:00
• 40f280ea3e add horn sound on match start jparent 2016-01-31 14:45:13 -05:00
• 66a69365e9 Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 Patrice Vignola 2016-01-31 14:38:38 -05:00
• 8ec3a069e6 Balancing Patrice Vignola 2016-01-31 14:36:26 -05:00
• c9371d36e7 make splashscreen background stretch full screen jparent 2016-01-31 14:34:04 -05:00
• 7ba3cdd21f make the menu screen skippable after certain time jparent 2016-01-31 14:27:50 -05:00
• f092ab1aa4 add Splashscreen jparent 2016-01-31 14:26:59 -05:00
• 1ad03a8d4b dammit merge undid my tweaks Dmitri Kolytchev 2016-01-31 13:51:49 -05:00
• 1328c75351 Merge branch 'master' of github.com:ConjureETS/OuijaMTLGJ2016 Dmitri Kolytchev 2016-01-31 13:50:03 -05:00
• cca76b6f04 more GUI tweaks Dmitri Kolytchev 2016-01-31 13:47:54 -05:00
• 47e12265fb Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 jparent 2016-01-31 13:40:41 -05:00
• 744bd8cbab fix particle system for character dash jparent 2016-01-31 13:39:53 -05:00
• e10a68b829 GUI Tweaks and Merge branch 'master' of github.com:ConjureETS/OuijaMTLGJ2016 Dmitri Kolytchev 2016-01-31 13:34:23 -05:00
• bc6f577139 GUI Tweaks Dmitri Kolytchev 2016-01-31 13:34:10 -05:00
• d0266fd58c Main menu scene maksimsen 2016-01-31 13:31:20 -05:00
• 3107c23599 Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 Patrice Vignola 2016-01-31 12:50:11 -05:00
• 866f08d2e7 xaby to dash Patrice Vignola 2016-01-31 12:49:58 -05:00
• c81cba0d26 make the Rune pickup sound longer jparent 2016-01-31 12:47:32 -05:00
• 9bf26919e6 Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 jparent 2016-01-31 12:25:34 -05:00
• 221eecbc8d adjust scrapping volume threshold + velo factor jparent 2016-01-31 12:24:29 -05:00
• 41e620a54c Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 antoine.mcnabb 2016-01-31 12:23:44 -05:00
• eea923860e Beard UI antoine.mcnabb 2016-01-31 12:22:50 -05:00
• 9f091574fc Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 jparent 2016-01-31 12:07:35 -05:00
• 2523ce3680 fix scrapping sound volume jumping around jparent 2016-01-31 12:00:05 -05:00
• c4a88873e2 add rune pickup sound jparent 2016-01-31 11:27:38 -05:00
• a29a601772 New Floor (and merge) Dmitri Kolytchev 2016-01-31 11:24:41 -05:00
• ee00ea6566 new floor Dmitri Kolytchev 2016-01-31 11:24:36 -05:00
• 1d4c40adf9 Adjust.. whatever Patrice Vignola 2016-01-31 11:18:06 -05:00
• 4a8d88e7a1 Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 Patrice Vignola 2016-01-31 10:59:54 -05:00
• 80f6bd622a Fix the fucking physics Patrice Vignola 2016-01-31 10:59:05 -05:00
• e161bf8411 add gameplay music and scrapping sounds jparent 2016-01-31 10:50:01 -05:00
• 00cc176081 Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 jparent 2016-01-31 10:31:17 -05:00
• cfa24430c1 add SFX and play scrapping sound based on velocity jparent 2016-01-31 10:29:38 -05:00
• 7664e645d1 GUI de gameplay antoine.mcnabb 2016-01-31 10:26:14 -05:00
• 01361d8ae8 Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 Patrice Vignola 2016-01-31 09:58:35 -05:00
• fe98521b0d Fix Patrice Vignola 2016-01-31 09:53:08 -05:00
• a53fef82d4 tweaking the board to a manageable size Dmitri Kolytchev 2016-01-31 09:41:29 -05:00
• da8d5a0506 Added Fenrir Dmitri Kolytchev 2016-01-31 08:38:21 -05:00
• ece88e2c7e Stuff Patrice Vignola 2016-01-31 08:32:38 -05:00
• 072de8a736 Importing room .obj because I'm an idiot and forgot people don't all have blender Dmitri Kolytchev 2016-01-31 07:40:36 -05:00
• 3854ff44e7 Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 Patrice Vignola 2016-01-31 07:27:16 -05:00
• cd53d3f012 Add the rune capture basic behavior Patrice Vignola 2016-01-31 07:26:29 -05:00
• 4001d0cc15 Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 RosimInc 2016-01-31 06:26:12 -05:00
• 1670768031 Adjusted some code, changed the floor assets again RosimInc 2016-01-31 06:26:04 -05:00
• 2a731d0532 add visual feedback (particles) when player dashes jparent 2016-01-31 03:25:35 -05:00
• 9685919fef Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 RosimInc 2016-01-31 02:41:39 -05:00
• 4701ef72ef Darker floor design RosimInc 2016-01-31 02:41:20 -05:00
• 12925f9e29 Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 Patrice Vignola 2016-01-31 01:32:38 -05:00
• 13179d0be0 Fix bug on symbols not changing color correctly Patrice Vignola 2016-01-31 01:31:30 -05:00
• 802f7a3eb2 Updated the last two runes RosimInc 2016-01-30 23:02:01 -05:00
• a8eb1d12f8 Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 jparent 2016-01-30 22:50:58 -05:00
• 75a825c62d add lookAt offset to camera for more control jparent 2016-01-30 22:48:06 -05:00
• a936b3e77c Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 RosimInc 2016-01-30 22:47:12 -05:00
• 87d8f9558c Added new rune assets RosimInc 2016-01-30 22:46:37 -05:00
• b52cf7f70e Fix camera Patrice Vignola 2016-01-30 22:38:55 -05:00
• f436e8f341 Add the dash colors to the ropes Patrice Vignola 2016-01-30 22:22:33 -05:00
• 1bd8898fa7 Start integrating the main gameplay scene Patrice Vignola 2016-01-30 21:35:28 -05:00
• c90d913cf4 Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 Patrice Vignola 2016-01-30 20:12:57 -05:00
• bd34106af1 Combine de board with the players and Ouija Patrice Vignola 2016-01-30 20:08:24 -05:00
• 5af916dd4a Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 jparent 2016-01-30 19:50:26 -05:00
• ea674245cf add anchored and fixed camera behavior tests jparent 2016-01-30 19:49:33 -05:00
• 4da2b94dff Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 RosimInc 2016-01-30 19:31:04 -05:00
• 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. RosimInc 2016-01-30 19:30:39 -05:00
• 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 Dmitri Kolytchev 2016-01-30 19:19:33 -05:00
• 3efe9826be Fix bunch of stuff Patrice Vignola 2016-01-30 18:37:40 -05:00
• 4b4b2f5963 Merge branch 'master' of github.com:ConjureETS/OuijaMTLGJ2016 Dmitri Kolytchev 2016-01-30 18:09:25 -05:00
• 072315abc3 a bunch of stuff Dmitri Kolytchev 2016-01-30 18:09:21 -05:00
• a486e6d2ba Sound effects with scripts and prefabs maksimsen 2016-01-30 17:44:06 -05:00
• f731d34fda Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 jparent 2016-01-30 17:35:06 -05:00
• 2863b716a1 add facecam prototype jparent 2016-01-30 17:33:45 -05:00
• d8027c6a88 Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 Patrice Vignola 2016-01-30 16:54:00 -05:00
• 793ad331b8 Add working ropes Patrice Vignola 2016-01-30 16:52:43 -05:00
• 6ac3b0a2f1 Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 RosimInc 2016-01-30 16:40:25 -05:00
• 7daedf9b55 Added glow when walking onto tiles. RosimInc 2016-01-30 16:40:16 -05:00
• a44a6d11dd Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 jparent 2016-01-30 15:45:00 -05:00
• a403d653ee move the right characer prefabs to the prefab folder jparent 2016-01-30 15:41:57 -05:00
• 892414bd36 SoundGen V2 for Game and Menu maksimsen 2016-01-30 15:42:36 -05:00
• d33d8ecc73 Package with the static word generator script in it maksimsen 2016-01-30 15:14:16 -05:00
• 307643d2f3 Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 RosimInc 2016-01-30 14:30:05 -05:00
• e60530c787 Merge branch 'master' of github.com:ConjureETS/OuijaMTLGJ2016 Dmitri Kolytchev 2016-01-30 14:26:32 -05:00
• 322dc6e8e5 Adding room with lighting, textures and narmal maps (but no colors) Dmitri Kolytchev 2016-01-30 14:26:25 -05:00
• bb6233ad93 Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 RosimInc 2016-01-30 13:59:35 -05:00
• 3e259dfb9c Added a collider to the tiles, and created a makeshift player controller to test it. Changed the level generation to be centered. RosimInc 2016-01-30 13:59:24 -05:00
• 60bb2b4a97 add spring joint test scene [jptest] jparent 2016-01-30 13:54:36 -05:00
• 1cc4ddc40f Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 Patrice Vignola 2016-01-30 12:59:59 -05:00
• 2f3eca693c Add the players models and animations blending Patrice Vignola 2016-01-30 12:35:04 -05:00