25 Commits

Author SHA1 Message Date
max89max
61dcacb734 FirstPerson 2015-11-08 18:40:46 +01:00
unknown
fd83088183 Merge branch 'master' of https://github.com/ETSConjure/EscapeTheRoom 2015-11-08 12:11:43 -05:00
unknown
c2362e404b 3rd scrub trap mostly done 2015-11-08 12:11:26 -05:00
max89max
5d14886ea2 Merge branch 'master' of https://github.com/ETSConjure/EscapeTheRoom 2015-11-08 18:08:42 +01:00
max89max
79e803559c Breath Sound et control 2015-11-08 18:08:14 +01:00
Patrice Vignola
1c3f4c8c92 Improve lighter orientation 2015-11-08 11:59:46 -05:00
max89max
b12ddfc647 FirstPerson controller 2015-11-08 17:12:24 +01:00
max89max
7630be8ffa Merge branch 'master' of https://github.com/ETSConjure/EscapeTheRoom 2015-11-08 17:04:23 +01:00
max89max
21d644fcc8 Prefab firstPerson 2015-11-08 17:03:47 +01:00
Patrice Vignola
9a0e10fab0 Merge branch 'master' of https://github.com/ETSConjure/EscapeTheRoom 2015-11-08 10:27:46 -05:00
Patrice Vignola
e69204b80b Add lighter model to the lighter prefab 2015-11-08 10:27:09 -05:00
max89max
032ce91118 Input des boutons du joueurs 2015-11-08 16:08:55 +01:00
Patrice Vignola
f667dc9e5d Add the flame particle system 2015-11-08 09:34:35 -05:00
Patrice Vignola
eeccb27de3 Add the flickering light 2015-11-08 08:26:23 -05:00
Patrice Vignola
b3cc6f0a28 Merge branch 'master' of https://github.com/ETSConjure/EscapeTheRoom 2015-11-08 07:41:53 -05:00
Patrice Vignola
a9f1b6ae10 Add WIP for working on another PC 2015-11-08 07:41:29 -05:00
unknown
45e0719d67 trou et debut de travail sur 3eme trap 2015-11-07 18:49:21 -05:00
Benjamin Comeau
26737201f3 navmesh agent pour le montre 2015-11-07 17:20:12 -05:00
Benjamin Comeau
85e6f24f17 clean up script AI 2015-11-07 16:30:46 -05:00
Benjamin Comeau
7e35e5c6c0 Merge commit '8c800b6b4f7a67070054163054e1bc1f9ecf5bf8' into monsterAI
Conflicts:
	Assets/Scripts/FirstPersonController.cs.meta
2015-11-07 16:15:45 -05:00
Benjamin Comeau
04247b313c Le monstre va suivre le player 2015-11-07 16:11:05 -05:00
unknown
8c800b6b4f firstTrap prefab 2015-11-07 16:03:11 -05:00
Benjamin Comeau
3724a915c0 add player to scene Ben 2015-11-07 15:39:42 -05:00
max89max
e8e7f8a23a PlayerControl
Hiérarchie
Standard Assets
2015-11-07 20:56:53 +01:00
Patrice Vignola
63728b3229 Add the scene folder 2015-11-07 13:26:04 -05:00