Commit Graph

Select branches

Hide Pull Requests

develop

master

monsterAI

Mono Color

• ede48331d2 Merge branch 'master' of https://github.com/ETSConjure/EscapeTheRoom master max89max 2015-11-08 15:00:12 +01:00
• b5c83a1f79 Merge branch 'master' of https://github.com/ETSConjure/EscapeTheRoom Patrice Vignola 2015-11-08 14:58:24 -05:00
• 9e3108bd72 Add the Cap rotation on the lighter Patrice Vignola 2015-11-08 14:58:02 -05:00
• 1f58fea146 Briquet allumettes et autres pour le joueur max89max 2015-11-08 14:59:44 +01:00
• d821e34dca Menu max89max 2015-11-08 14:17:37 +01:00
• 5f93c5965a ajout sur bladeTrap unknown 2015-11-08 12:41:53 -05:00
• 61dcacb734 FirstPerson max89max 2015-11-08 18:40:46 +01:00
• fd83088183 Merge branch 'master' of https://github.com/ETSConjure/EscapeTheRoom unknown 2015-11-08 12:11:43 -05:00
• c2362e404b 3rd scrub trap mostly done unknown 2015-11-08 12:11:26 -05:00
• 39f14c0d42 Sounds Breath max89max 2015-11-08 18:09:48 +01:00
• 5d14886ea2 Merge branch 'master' of https://github.com/ETSConjure/EscapeTheRoom max89max 2015-11-08 18:08:42 +01:00
• 79e803559c Breath Sound et control max89max 2015-11-08 18:08:14 +01:00
• 1c3f4c8c92 Improve lighter orientation Patrice Vignola 2015-11-08 11:59:46 -05:00
• 0924f98096 Remove useless print message Patrice Vignola 2015-11-08 11:43:04 -05:00
• b12ddfc647 FirstPerson controller max89max 2015-11-08 17:12:24 +01:00
• 5c75c7412f Personnage firstPerson max89max 2015-11-08 17:10:41 +01:00
• 7630be8ffa Merge branch 'master' of https://github.com/ETSConjure/EscapeTheRoom max89max 2015-11-08 17:04:23 +01:00
• 21d644fcc8 Prefab firstPerson max89max 2015-11-08 17:03:47 +01:00
• 884d529762 Warning: Some metas/files have not been pushed correctly, so unity removes them automatically. Push your files (Assets/Characters/PhysicsMaterials and Assets/Sound) again. Patrice Vignola 2015-11-08 10:29:46 -05:00
• 9a0e10fab0 Merge branch 'master' of https://github.com/ETSConjure/EscapeTheRoom Patrice Vignola 2015-11-08 10:27:46 -05:00
• e69204b80b Add lighter model to the lighter prefab Patrice Vignola 2015-11-08 10:27:09 -05:00
• 032ce91118 Input des boutons du joueurs max89max 2015-11-08 16:08:55 +01:00
• c5a8b5d9fa Objets briquet et Allumette max89max 2015-11-08 16:00:26 +01:00
• f667dc9e5d Add the flame particle system Patrice Vignola 2015-11-08 09:34:35 -05:00
• c40670ca18 Remove the initial test script Patrice Vignola 2015-11-08 08:39:17 -05:00
• eeccb27de3 Add the flickering light Patrice Vignola 2015-11-08 08:26:23 -05:00
• c4f42bdb43 Add the pat scene Patrice Vignola 2015-11-08 07:46:16 -05:00
• b3cc6f0a28 Merge branch 'master' of https://github.com/ETSConjure/EscapeTheRoom Patrice Vignola 2015-11-08 07:41:53 -05:00
• a9f1b6ae10 Add WIP for working on another PC Patrice Vignola 2015-11-08 07:41:29 -05:00
• 45e0719d67 trou et debut de travail sur 3eme trap unknown 2015-11-07 18:49:21 -05:00
• a823aaa090 Merge branch 'monsterAI' Benjamin Comeau 2015-11-07 17:21:06 -05:00
• 26737201f3 navmesh agent pour le montre monsterAI Benjamin Comeau 2015-11-07 17:20:12 -05:00
• ab8c736b2d Merge branch 'monsterAI' Benjamin Comeau 2015-11-07 16:31:42 -05:00
• 52e96f3d3c Merge branch 'master' of github.com:ETSConjure/EscapeTheRoom Benjamin Comeau 2015-11-07 16:31:24 -05:00
• 85e6f24f17 clean up script AI Benjamin Comeau 2015-11-07 16:30:46 -05:00
• 7e35e5c6c0 Merge commit '8c800b6b4f7a67070054163054e1bc1f9ecf5bf8' into monsterAI Benjamin Comeau 2015-11-07 16:15:45 -05:00
• 04247b313c Le monstre va suivre le player Benjamin Comeau 2015-11-07 16:11:05 -05:00
• 8c800b6b4f firstTrap prefab unknown 2015-11-07 16:03:11 -05:00
• 3724a915c0 add player to scene Ben Benjamin Comeau 2015-11-07 15:39:42 -05:00
• f5a68839ee Merge branch 'master' of https://github.com/ETSConjure/EscapeTheRoom unknown 2015-11-07 15:29:21 -05:00
• 154db088c2 bug fix Benjamin Comeau 2015-11-07 15:28:15 -05:00
• 841f638ba8 Merge branch 'master' of https://github.com/ETSConjure/EscapeTheRoom unknown 2015-11-07 15:22:21 -05:00
• 9601bea8ee premiere trap unknown 2015-11-07 15:18:19 -05:00
• 0e3f27ef91 Merge branch 'master' of https://github.com/ETSConjure/EscapeTheRoom max89max 2015-11-07 21:02:09 +01:00
• 92a25be9fc PlayerControler max89max 2015-11-07 20:59:40 +01:00
• d81680c68b Merge branch 'master' of https://github.com/ETSConjure/EscapeTheRoom max89max 2015-11-07 20:58:51 +01:00
• e8e7f8a23a PlayerControl Hiérarchie Standard Assets max89max 2015-11-07 20:56:53 +01:00
• dd8661719a Player controler hiérarchie standard asset max89max 2015-11-07 20:52:16 +01:00
• f8c83b4d7b Add scripts folder and incomplete monsterAI Benjamin Comeau 2015-11-07 14:28:52 -05:00
• 63728b3229 Add the scene folder Patrice Vignola 2015-11-07 13:26:04 -05:00
• 5851e45d85 Change the asset serialization mode from mixed to force text Patrice Vignola 2015-11-07 13:25:13 -05:00
• 0453c544df Add Assets folder Patrice Vignola 2015-11-07 13:13:24 -05:00
• ef9b14b591 Initial commit Patrice Vignola 2015-11-07 13:12:32 -05:00
• b20582f14b Initial commit develop ETSConjure 2015-11-07 12:28:29 -05:00