 FakeShemp
|
20468cba1b
|
Merge branch 'master' into Shadows
# Conflicts:
# assets
# include/Engine/Rendering/DrawFinalPass.h
# include/Engine/Rendering/Renderer.h
# resources/Shaders/ForwardPlus.frag.glsl
# resources/Shaders/ForwardPlus.vert.glsl
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Engine/Rendering/FrameBuffer.cpp
# src/Engine/Rendering/Renderer.cpp
|
2016-02-29 18:03:00 +01:00 |
|
 verysecrethero
|
42b49f9dba
|
Added more timers to Rendering.
|
2016-02-16 17:51:39 +01:00 |
|
|
FakeShemp
|
69db32337d
|
Shado wip
|
2016-02-10 15:16:58 +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 |
|
 Jace
|
90192e016a
|
Merge pull request #82 from teamfisk/BoxModelCollision
Small fixes to collision/trigger-boxes, etc.
|
2016-02-10 10:08:54 +01:00 |
|
 Teejoon
|
060e674a6f
|
Picking supports skinned meshes
|
2016-02-08 17:37:18 +01:00 |
|
 William Moberg
|
93c6f3c0a3
|
AABBs are auto attached when adding Trigger/Collideable/etc, also added AttachComponent method to ComponentWrapper.
|
2016-02-08 14:34:37 +01:00 |
|
|
Jace
|
70f8237a16
|
Merge pull request #60 from teamfisk/3rdPersonDeathCam
3rd person death cam
|
2016-02-08 11:39:57 +01:00 |
|
|
William Moberg
|
3cfbbbbf54
|
CollisionSystem now utilizes Octree for collision detection.
|
2016-02-01 16:13:48 +01:00 |
|
|
William Moberg
|
76274c326e
|
Fixed going through flat large triangles. Velocity affected by collision.
|
2016-02-01 13:34:39 +01:00 |
|
|
verysecrethero
|
5cdf6db340
|
Modified HealthSystem so it actually publishes the DeathEvent. Modified EPlayerHealthPickup. Fixed 2 tests. Started work on PlayerDeathSystem
|
2016-01-27 14:46:45 +01:00 |
|
|
Jace
|
505a6c7396
|
Hiding first person models properly
|
2016-01-25 14:32:48 +01:00 |
|
 Tleety
|
d4797b0808
|
Some entity files
|
2016-01-24 21:08:01 +01:00 |
|