 Tleety
|
8299b99e2f
|
Test world changes and some other small fixes
|
2016-02-01 19:08:46 +01:00 |
|
|
Tleety
|
c708f1582c
|
Merge remote-tracking branch 'origin/master' into NormalSpecularMapping
|
2016-02-01 18:30:30 +01:00 |
|
|
Tleety
|
a188a3f7fa
|
Removed widget pointlight since it is now redundant
|
2016-02-01 18:22:36 +01:00 |
|
|
Tleety
|
ed7d00c1d8
|
Bug where widgets did not get their ambient light now fixed.
|
2016-02-01 18:19:38 +01:00 |
|
|
Tleety
|
53cae25eb2
|
WIP on widget fuckery
|
2016-02-01 16:56:55 +01:00 |
|
 William Moberg
|
30ad238697
|
Merge branch 'master' into BoxModelCollision
|
2016-02-01 16:17:10 +01:00 |
|
|
William Moberg
|
3cfbbbbf54
|
CollisionSystem now utilizes Octree for collision detection.
|
2016-02-01 16:13:48 +01:00 |
|
 Jace
|
be3cfef65f
|
Merge remote-tracking branch 'origin/master' into EditorUsefulness
# Conflicts:
# src/Engine/Rendering/DrawFinalPass.cpp
|
2016-02-01 16:00:46 +01:00 |
|
|
Jace
|
65f5bc673f
|
Functional translation widget in global and local space
|
2016-02-01 15:47:56 +01:00 |
|
 stiffly
|
c5462b0363
|
Merge remote-tracking branch 'origin/master' into Sound
|
2016-02-01 14:35:47 +01:00 |
|
|
stiffly
|
25b3c02d29
|
Adding sounds for: jump, walk, shoot
|
2016-02-01 14:35:23 +01:00 |
|
|
William Moberg
|
d7b02e79c8
|
Merge branch 'master' into BoxModelCollision
# Conflicts:
# include/Engine/Collision/CollisionSystem.h
# src/Engine/Collision/CollisionSystem.cpp
|
2016-02-01 13:48:05 +01:00 |
|
|
William Moberg
|
76274c326e
|
Fixed going through flat large triangles. Velocity affected by collision.
|
2016-02-01 13:34:39 +01:00 |
|
|
Tleety
|
7054822be2
|
SceneLight component now working
|
2016-02-01 11:12:03 +01:00 |
|
 viktorljung
|
6ba87d2942
|
Fixed, Crash when trying to animate a model that doesn't contain animations
|
2016-02-01 10:42:23 +01:00 |
|
|
viktorljung
|
51075aefc8
|
Model that has animations is now visible when it does not play an animation (T-pose)
|
2016-02-01 10:24:50 +01:00 |
|
|
Tleety
|
8bcafc1151
|
WIP
|
2016-01-27 18:07:05 +01:00 |
|
|
viktorljung
|
c9b982bc89
|
Added BoneAttachment to Entity.xsd
|
2016-01-27 17:31:57 +01:00 |
|
|
viktorljung
|
2ec5023752
|
Changed Animation and BoneAttachment "Name" field to "AnimationName" and "BoneName"
|
2016-01-27 17:27:34 +01:00 |
|
|
Tleety
|
97cbc55223
|
Some debug features for color corrections and glow strength fix.
|
2016-01-27 17:21:00 +01:00 |
|
|
viktorljung
|
405002777c
|
Merge remote-tracking branch 'origin/EditorUsefulness' into Animations
# Conflicts:
# resources/Schema/Components.xsd
# resources/Schema/Entities/FastWorld.xml
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Game/Game.cpp
|
2016-01-27 17:16:49 +01:00 |
|
|
viktorljung
|
8fc8d56ee1
|
Added BoneAttachment component
|
2016-01-27 17:14:16 +01:00 |
|
|
Tleety
|
a63ecb8133
|
Some wierd shader faults and merge error fixe
|
2016-01-27 15:54:36 +01:00 |
|
|
Tleety
|
0e70dc6fa3
|
Merge remote-tracking branch 'origin/master' into NormalSpecularMapping
# Conflicts:
# include/Engine/Rendering/RenderSystem.h
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Engine/Rendering/RenderSystem.cpp
|
2016-01-27 15:41:31 +01:00 |
|
|
Tleety
|
44302bb0f3
|
Specular support. Some edits to EditorTestWorld.xml aswell as some debugmodes for textures in the model component
|
2016-01-27 15:38:54 +01:00 |
|
|
Jace
|
181017313d
|
Made entity parser give more useful errors and fixed the errors that were while I was at it
|
2016-01-27 15:16:59 +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 |
|
|
Tleety
|
a954cbbf50
|
Normal map support
|
2016-01-27 13:52:27 +01:00 |
|
|
Jace
|
dec2234019
|
Merge branch 'Cleanup'
# Conflicts:
# src/Engine/Rendering/RenderSystem.cpp
|
2016-01-27 13:44:15 +01:00 |
|
|
Jace
|
0334ec3fa7
|
Merge remote-tracking branch 'origin/Animations'
# Conflicts:
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Game/Systems/WeaponSystem.cpp
|
2016-01-27 13:36:49 +01:00 |
|
|
Tleety
|
cbb17d22d4
|
WIP
|
2016-01-27 12:10:00 +01:00 |
|
|
Jace
|
8bed5194d8
|
"Proper" handling of conditional rendering of entities parented to camera or entities that should be hidden from the active local player perspective
|
2016-01-27 11:36:24 +01:00 |
|
|
William Moberg
|
90f05442aa
|
Merge branch 'master' into BoxModelCollision
# Conflicts:
# include/Engine/Core/Octree.h
# resources/Schema/Entities/CollisionTestLevel.xml
# src/Engine/Collision/CollisionSystem.cpp
# src/Engine/Core/Octree.cpp
|
2016-01-27 10:52:27 +01:00 |
|
|
Jace
|
7e12d00874
|
Merge branch 'master' into CoolDeathAnimation
# Conflicts:
# include/Engine/Rendering/ModelJob.h
# resources/Shaders/ForwardPlus.frag.glsl
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Engine/Rendering/RenderSystem.cpp
|
2016-01-27 10:43:23 +01:00 |
|
|
William Moberg
|
6ea490e215
|
Tried a horrible recursive method, extreme framedrop.
|
2016-01-27 10:34:26 +01:00 |
|
|
Jace
|
505a6c7396
|
Hiding first person models properly
|
2016-01-25 14:32:48 +01:00 |
|
|
Jace
|
b6fd18baed
|
Hacked in serverside effects
|
2016-01-25 11:56:40 +01:00 |
|
|
Jace
|
4245264029
|
Weapon RayZ
Weapon RayZ
|
2016-01-25 11:26:33 +01:00 |
|
|
William Moberg
|
3389b965eb
|
Test on game level v1.
|
2016-01-25 10:55:05 +01:00 |
|
|
stiffly
|
44baa47bba
|
Merge remote-tracking branch 'origin/master' into CoolDeathAnimation
# Conflicts:
# include/Engine/Common.h
# include/Engine/Rendering/DrawFinalPass.h
# include/Engine/Rendering/DrawScenePass.h
# include/Engine/Rendering/RenderQueue.h
# include/Engine/Rendering/Renderer.h
# resources/Shaders/ForwardPlus.frag.glsl
# resources/Shaders/ForwardPlus.vert.glsl
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Engine/Rendering/DrawScenePass.cpp
# src/Engine/Rendering/RenderSystem.cpp
# src/Engine/Rendering/Renderer.cpp
# src/Game/Game.cpp
|
2016-01-25 01:21:15 +01:00 |
|
|
Jace
|
b95c1fdfa4
|
Merge remote-tracking branch 'origin/Menu'
# Conflicts:
# include/Engine/Rendering/ModelJob.h
# resources/Schema/Components.xsd
# resources/Schema/Entities/Player.xml
# resources/Schema/Entities/RenderingWorld.xml
# src/Game/Game.cpp
|
2016-01-25 00:25:03 +01:00 |
|
|
Jace
|
7b348379ac
|
Quaternions are never the solution.
|
2016-01-25 00:22:55 +01:00 |
|
|
viktorljung
|
6aeb281249
|
Resolution fix in render stages //Tobias
|
2016-01-25 00:07:17 +01:00 |
|
|
Jace
|
04f6233d99
|
Crude animations
|
2016-01-24 23:44:29 +01:00 |
|
|
Jace
|
d6cc1eaac4
|
Merge remote-tracking branch 'origin/Animations'
|
2016-01-24 23:06:59 +01:00 |
|
|
Jace
|
d0de169613
|
Instagib!
|
2016-01-24 23:05:52 +01:00 |
|
|
viktorljung
|
f8b9606cdf
|
Picking animation fix
|
2016-01-24 22:59:53 +01:00 |
|
|
viktorljung
|
84fddf02e2
|
Merge remote-tracking branch 'origin/master' into Animations
|
2016-01-24 22:42:12 +01:00 |
|
|
viktorljung
|
d03b3fb071
|
Merge remote-tracking branch 'origin/master' into Menu
# Conflicts:
# resources/Schema/Entities/Player.xml
|
2016-01-24 22:23:53 +01:00 |
|
|
viktorljung
|
7e92d6f53f
|
Healthbar on player
|
2016-01-24 22:21:10 +01:00 |
|