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

22 Commits

Author SHA1 Message Date
FrancisGallant
2bfff5b899 fix de missile 2015-12-03 11:35:20 -05:00
jventalon
9e679ed0af Add heart pick up prefab 2015-11-19 22:10:04 -05:00
jventalon
a904cf25ab Pick up hearts 2015-11-19 22:09:05 -05:00
jventalon
222f6e6d37 Merge branch 'master' into justine_develop 2015-11-19 21:26:27 -05:00
jventalon
0819f51529 Player health 2015-11-19 21:24:31 -05:00
marcmad
73ace19d57 Add prefab player and put in the master scene with an enemy 2015-11-19 17:46:46 -05:00
jventalon
1daff51b46 Merge branch 'master' into justine_develop 
Conflicts:
	Assets/Prefabs.meta
 2015-11-19 12:06:19 -05:00
jventalon
23424c7b2d health added 2015-11-19 11:58:17 -05:00
FrancisGallant
97abe3ae11 shoot de missile et tuer les ennemis 2015-11-16 18:24:36 -05:00
FrancisGallant
8426a784f8 prefab ennemy et floor pour patrol 2015-11-11 18:42:02 -05:00
Marc-Antoine Dumont
08dac02a63 Took xavier_scene to change master_scene 2015-11-09 23:06:15 -05:00
Marc-Antoine Dumont
b860d7f90d Merge branch 'xavier_develop' of https://github.com/ConjureETS/Labo_2_Equ_1_a15 2015-11-09 23:02:14 -05:00
Marc-Antoine Dumont
bd062cb2f3 Merge branch 'xavier_develop' 2015-11-09 22:57:33 -05:00
Xavier314
a201fdc345 new file: Assets/Animations/Jump0.anim 
new file:   Assets/Animations/Jump0.anim.meta
	renamed:    Assets/Sprites/Shooting.anim -> Assets/Animations/Shooting.anim
	renamed:    Assets/Sprites/Shooting.anim.meta -> Assets/Animations/Shooting.anim.meta
	modified:   Assets/Animations/megaman.controller
	modified:   Assets/Scenes/XavierScene.unity
	modified:   Assets/Scripts/Animations.cs
	modified:   Assets/Scripts/Control.cs
	modified:   Assets/Scripts/Gravity.cs
	modified:   Assets/Scripts/Jump.cs
	new file:   Assets/Scripts/MainCamera.cs
	new file:   Assets/Scripts/MainCamera.cs.meta
	modified:   Assets/Sprites/mm.png.meta
	modified:   ProjectSettings/TagManager.asset
 2015-11-07 20:35:49 -05:00
unknown
b3732e2aab t 2015-11-07 01:27:21 -05:00
jventalon
d75a31ff14 added main menu 2015-11-05 18:03:10 -05:00
Xavier314
fc5660d32a transitions imparfaites lorsque nous appuyons sur X(ATTAQUE) et que nous bougeons par la suite 2015-11-04 21:39:45 -05:00
Xavier314
7f57e57a1e transitions imparfaites lorsque nous appuyons sur X(ATTAQUE) et que nous bougeons par la suite 2015-11-04 21:36:56 -05:00
Xavier314
eb22bf7e8b test 2015-11-03 23:27:13 -05:00
Marc-Antoine Dumont
a7c78fc497 Add scene for each personne 2015-10-29 20:44:15 -04:00
Marc-Antoine Dumont
4a2a0fd111 First part 2015-10-29 20:42:26 -04:00
Marc-Antoine Dumont
1ec4de6231 Initial commit 2015-10-27 22:47:35 -04:00