 Jace
|
9d9c6bdf1e
|
Third person animations and shoot effects base work
|
2016-02-11 00:08:50 +01:00 |
|
 viktorljung
|
49e6252ee1
|
Merge remote-tracking branch 'origin/master' into Animations
# Conflicts:
# include/Engine/Rendering/DrawFinalPass.h
# resources/Schema/Components.xsd
# resources/Schema/Entities/CollisionTestLevel.xml
# resources/Schema/Types/Entity.xsd
# src/Engine/Collision/Collision.cpp
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Engine/Rendering/RenderSystem.cpp
|
2016-02-10 11:33:45 +01:00 |
|
 Teejoon
|
060e674a6f
|
Picking supports skinned meshes
|
2016-02-08 17:37:18 +01:00 |
|
|
Jace
|
563fd4082e
|
Updated movement test for model collisions
|
2016-02-02 12:10:39 +01:00 |
|
|
Jace
|
7b348379ac
|
Quaternions are never the solution.
|
2016-01-25 00:22:55 +01:00 |
|
|
Jace
|
04f6233d99
|
Crude animations
|
2016-01-24 23:44:29 +01:00 |
|
|
Jace
|
d0de169613
|
Instagib!
|
2016-01-24 23:05:52 +01:00 |
|
 antc13
|
aa20b48188
|
Merge remote-tracking branch 'origin/master' into Importer
# Conflicts:
# resources/Schema/Entities/MovementTest.xml
# resources/Schema/Entities/Player.xml
|
2016-01-24 16:22:22 +01:00 |
|
|
Jace
|
3261e21d96
|
Coloring players depending on team and created a blue spawn in MovementTest
|
2016-01-24 15:46:01 +01:00 |
|
|
antc13
|
3baa988ad4
|
Changed .obj files to our own format. DummyScene.mesh may be broken.
|
2016-01-23 20:35:58 +01:00 |
|
|
Jace
|
666ef6589e
|
Crouching!
|
2016-01-23 15:06:47 +01:00 |
|
|
Jace
|
ca2aab449e
|
Basic movement and camera management between players and editor
|
2016-01-22 16:12:51 +01:00 |
|
|
Jace
|
5e721325a4
|
Merge fixes
|
2016-01-14 18:20:51 +01:00 |
|
|
Jace
|
6ad1839def
|
Initial work on PlayerMovementSystem
|
2016-01-14 17:03:48 +01:00 |
|