Conjure/EscapeTheRoom
6
0
Fork 0
mirror of https://github.com/ConjureETS/EscapeTheRoom.git synced 2026-03-24 01:00:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
47 Commits 3 Branches 0 Tags
Commit Graph

47 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
39f14c0d42 Sounds Breath 2015-11-08 18:09:48 +01: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
Patrice Vignola
0924f98096 Remove useless print message 2015-11-08 11:43:04 -05:00
max89max
b12ddfc647 FirstPerson controller 2015-11-08 17:12:24 +01:00
max89max
5c75c7412f Personnage firstPerson 2015-11-08 17:10:41 +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
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.
 2015-11-08 10:29:46 -05: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
max89max
c5a8b5d9fa Objets briquet et Allumette 2015-11-08 16:00:26 +01:00
Patrice Vignola
f667dc9e5d Add the flame particle system 2015-11-08 09:34:35 -05:00
Patrice Vignola
c40670ca18 Remove the initial test script 2015-11-08 08:39:17 -05:00
Patrice Vignola
eeccb27de3 Add the flickering light 2015-11-08 08:26:23 -05:00
Patrice Vignola
c4f42bdb43 Add the pat scene 2015-11-08 07:46:16 -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
a823aaa090 Merge branch 'monsterAI' 2015-11-07 17:21:06 -05:00
Benjamin Comeau
26737201f3 navmesh agent pour le montre 2015-11-07 17:20:12 -05:00
Benjamin Comeau
ab8c736b2d Merge branch 'monsterAI' 2015-11-07 16:31:42 -05:00
Benjamin Comeau
52e96f3d3c Merge branch 'master' of github.com:ETSConjure/EscapeTheRoom 2015-11-07 16:31:24 -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
unknown
f5a68839ee Merge branch 'master' of https://github.com/ETSConjure/EscapeTheRoom 2015-11-07 15:29:21 -05:00
Benjamin Comeau
154db088c2 bug fix 2015-11-07 15:28:15 -05:00
unknown
841f638ba8 Merge branch 'master' of https://github.com/ETSConjure/EscapeTheRoom 2015-11-07 15:22:21 -05:00
unknown
9601bea8ee premiere trap 2015-11-07 15:18:19 -05:00
max89max
0e3f27ef91 Merge branch 'master' of https://github.com/ETSConjure/EscapeTheRoom 2015-11-07 21:02:09 +01:00
max89max
92a25be9fc PlayerControler 2015-11-07 20:59:40 +01:00
max89max
d81680c68b Merge branch 'master' of https://github.com/ETSConjure/EscapeTheRoom 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2015-11-07 20:58:51 +01:00
max89max
e8e7f8a23a PlayerControl 
Hiérarchie
Standard Assets
 2015-11-07 20:56:53 +01:00
max89max
dd8661719a Player controler 
hiérarchie
standard asset
 2015-11-07 20:52:16 +01:00
Benjamin Comeau
f8c83b4d7b Add scripts folder and incomplete monsterAI 2015-11-07 14:28:52 -05:00
Patrice Vignola
63728b3229 Add the scene folder 2015-11-07 13:26:04 -05:00
Patrice Vignola
5851e45d85 Change the asset serialization mode from mixed to force text 2015-11-07 13:25:13 -05:00
Patrice Vignola
0453c544df Add Assets folder 2015-11-07 13:13:24 -05:00
Patrice Vignola
ef9b14b591 Initial commit 2015-11-07 13:12:32 -05:00
ETSConjure
b20582f14b Initial commit 2015-11-07 12:28:29 -05:00