Conjure/VZ
6
0
Fork 0
mirror of https://github.com/ConjureETS/VZ.git synced 2026-03-24 02:11:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
66 Commits 3 Branches 0 Tags
Commit Graph

66 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
samJa
9c95f4066c - Added a Integration scene (cette scène sera une scène qui intègre tous les assets) 
- Added squad scene
 2015-08-20 14:56:07 -04:00
samJa
909eb9c31f - Removed useless comments. 2015-08-20 14:13:05 -04:00
samJa
3a5294091b - Updated prefabs 
- VampireSquad
	- ZombieSquad
- Removed class
	ZombieSquad
	VampireSquad
- Refactoring
	- Updated Squad.cs
	- Updated Unit.cs
- New functions
	- Now the class unit have new class members
	- The the Squad class have new class members and functions
 2015-08-20 14:01:28 -04:00
Samuel
8b94ce59c2 - Fix squad scene 2015-08-17 19:03:18 -04:00
jdastous
d871e9c682 Implementation eclair aleatoire 
Eclair scripter
 2015-08-17 18:42:45 -04:00
Samuel
3827ca6722 Fix tag layer manager bug. 2015-08-17 17:25:04 -04:00
jdastous
5cf59ae91a Tentative Optimisation scene 
enlever lumiere sur lampadaires ramplacer par plane additif
 2015-08-17 16:17:15 -04:00
jparent
64f51c9f1e make the nav path always visible in the editor 2015-08-17 15:56:18 -04:00
jparent
a9a9317ec1 uniformise the Vampire and Zombie squad prefabs 2015-08-16 17:10:13 -04:00
jparent
44d60f829c add a node prefab 2015-08-16 17:09:29 -04:00
jparent
340bcd256f Merge branch 'master' of http://github.com/conjureets/vz 2015-08-16 16:29:33 -04:00
jparent
7ec7c2847c add squad movement script to prefabs 2015-08-16 16:28:06 -04:00
jdastous
09e78939df Map Pas mal fini 
Pas mal fini la map. il manquerait à fair un script pour faire des
éclairs avec la lumière : Lumiere pour éclair.
 2015-08-16 16:13:05 -04:00
jparent
20c0e48bbe fix typo getNewBuffet() -> getNewBuffer() 2015-08-16 15:00:30 -04:00
jparent
5256bd716f Merge branch 'master' of http://github.com/conjureets/vz 2015-08-16 14:53:34 -04:00
jparent
6239893ce1 fix camera following the squad after transitioning 2015-08-16 14:49:25 -04:00
Samuel
9de4c9ee7c - Updated CharacterBehavior 
- Updated mapped dead animaition for vampire,squad,unit and zombie
- Removed unused variable in tag and layer manager.
- Updated sam_capture scene
- Updated sam_squad scene
 2015-08-15 18:10:37 -04:00
Samuel
b678de5b82 - Added Scene sam_capture 2015-08-15 11:37:54 -04:00
Samuel
702f323edc - Improved the capture functionnality for Squad objects 
-> see : http://http://unitydojo.blogspot.ca/2014/03/how-to-use-lerp-in-unity-like-boss.html
- Created ZombieSquad prefab
- Created VampireSquad prefab
 2015-08-15 11:34:56 -04:00
Samuel
7342d75101 Merge branch 'master' of github.com:ConjureETS/VZ 2015-08-14 20:53:38 -04:00
Samuel
182ba37655 - Added class CharacterBehavior 
- Added Basic animation Script (CharacterBehavior.cs)
 2015-08-14 20:49:55 -04:00
jdastous
0e48eef913 Map 
Debut Constrution map
 2015-08-14 20:20:56 -04:00
jparent
42f7739be9 Merge branch 'master' of http://github.com/conjureets/vz 2015-08-14 18:46:28 -04:00
jparent
7d97ddcc5d add move enqueuing to PlayerController 
refactor of MovementManager to allow PlayerController to handle the player
inputs.

refactor of PlayerController to have only one script and identify the
player in the editor.
 2015-08-14 18:37:16 -04:00
Samuel
425aed7057 Merge branch 'master' of github.com:ConjureETS/VZ 2015-08-14 17:42:22 -04:00
Samuel
e1d74f3042 - Mapping of the animation states. 2015-08-14 17:41:49 -04:00
jparent
e71ce63d66 add z-axis offset to the cameras 2015-08-14 16:45:10 -04:00
Samuel
49470678d8 Merge branch 'master' of github.com:ConjureETS/VZ 2015-08-14 16:18:34 -04:00
Samuel
71071add2d - Segmented animations 2015-08-14 16:18:10 -04:00
Cyberslash17
ab5bd58e7a Movement fonctionnels, doit être intégeré au squads 2015-08-14 16:11:14 -04:00
Samuel
962a9ed35c Merge branch 'master' of github.com:ConjureETS/VZ 2015-08-14 14:57:50 -04:00
Samuel
679fa6d3be - Assets integration 2015-08-14 14:57:28 -04:00
jparent
0af5f7821d Merge branch 'master' of http://github.com/conjureets/vz 2015-08-14 14:12:06 -04:00
jparent
df305682c8 refactor inputs into a playerController 
add the possibility of changing destination of the camera transition
before it reaches its destination.
 2015-08-14 14:09:44 -04:00
jparent
415d634162 fix duplicate input for player 2 2015-08-14 14:08:26 -04:00
Samuel
260a6c9941 - Updated Capture function and AbandonUnit function. 2015-08-14 12:57:47 -04:00
Samuel
c12f4497fd - Updated Unity Layers 
- Refactoring rename Class TagManager to TagLayerManager
- Added Layer Property in class Unit.cs
- Updated method InitializeDefaultTagAndLayer in class ZombieSquad
	and VampireSquad
- Layers now are instancied at run time if the user ommit to specify a layer
  by default the human layer is set to any gameObject that have an Unit.cs script
  attached to it's component. Idem for ZombieSquad and VampireSquad
 2015-08-14 12:22:10 -04:00
Samuel
a4320a4b80 - Added relative movement towards the squad leader (hard code) 2015-08-13 19:16:24 -04:00
Samuel
df64a801c1 - Added capture option 2015-08-13 19:09:23 -04:00
jparent
fb114dcf59 Merge branch 'master' of http://github.com/conjureets/vz 2015-08-13 16:55:35 -04:00
jparent
07af87e036 add basic camera transition between squads 
for now, the cameras have a reference to the squads they track, and check
for player inputs to know when it needs to transition to another squad.
This will be fixed with the GameController/PlayerController.
 2015-08-13 16:55:08 -04:00
jparent
c23edfae6b add two player inputs in editor's Input Manager 2015-08-13 16:45:18 -04:00
Samuel
06d135e179 Merge branch 'master' of github.com:ConjureETS/VZ 2015-08-13 15:27:29 -04:00
Samuel
93f8868ba1 - Upgraded the AttackSquad functions 
- Upgraded the default positions of the prefabs : Zombie and Vampire
 2015-08-13 15:25:55 -04:00
MAM
3bfee9df14 debut de script pour les humains 2015-08-13 13:28:52 -04:00
Samuel
6152a68a3d - Updated Zombie and vampire prefabs. 
- Added Squad scene (not complete)
 2015-08-13 13:12:57 -04:00
Samuel
dc19a98560 - Upgraded Squad, ZombieSquad, VampireSquad 
- Refactored the class ZombieUnit, VampireUnit now are renamed
	to ZombieSquad and VampireSquad
 2015-08-13 13:02:34 -04:00
Samuel
bc759b6ad9 - Improved Squad class 
- Updated ZombieUnit and VampireUnit now hinerits from squad
 2015-08-12 21:22:05 -04:00
Samuel
97b6e28cf0 Merge branch 'master' of github.com:ConjureETS/VZ 2015-08-12 18:53:29 -04:00
Samuel
280fd57c2b - Added Squad script (not done) 
- Updated Unit Hp property
- Added functions
	- addHuman
	- AddSoldier
	- healSquad( unit humanUnit )
	- abandonUnits( int nbUnits )
	- removeHuman( Unit humanUnit )
	- removeSoldier( Unit soldierUnit )
	- transformHuman() (not done)
 2015-08-12 18:50:11 -04:00