Jace
235b26ad61
WIP shoot
2016-01-24 17:16:18 +01:00
dd80323342
Merge remote-tracking branch 'origin/master' into Animations
2016-01-24 17:06:34 +01:00
af2f017cb4
AnimationSystem base WIP
2016-01-24 17:05:34 +01:00
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
96a735c542
Changed .obj to .mesh for all meshes.
2016-01-24 16:12:31 +01:00
Jace
3261e21d96
Coloring players depending on team and created a blue spawn in MovementTest
2016-01-24 15:46:01 +01:00
c9dc9a3570
Merge branch 'master' into BoxModelCollision
2016-01-24 15:38:38 +01:00
910b3d10e4
WIP (false collisions), collision method expanded, not working.
2016-01-24 15:32:10 +01:00
666f1fd878
Removed temp variables & the "forced" animation in DrawFinalPass
2016-01-24 15:30:20 +01:00
Jace
373bb33cf0
Player jumping taking air acceleration into account
2016-01-24 15:20:34 +01:00
4c5d17b203
Merge remote-tracking branch 'origin/master' into Importer
...
# Conflicts:
# resources/Schema/Entities/RenderingWorld.xml
# resources/Shaders/ForwardPlus.frag.glsl
# src/Engine/Editor/EditorSystem.cpp
# src/Engine/Network/Server.cpp
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Tests/OctTreeTestGameClass.cpp
# src/Tests/OctTreeTestHardCodedTestWorld.h
# src/Tests/ResourceManagerTest.cpp
2016-01-24 14:40:52 +01:00
8286d052b3
Changed color values from floats to glm::vec4
2016-01-24 14:38:17 +01:00
Jace
aaa11d2109
Merge remote-tracking branch 'origin/master' into PlayerMovement
2016-01-24 14:18:23 +01:00
aa3b8cd652
Fixed text color and removed debugging code
2016-01-24 13:37:07 +01:00
b5b1140f5c
Custom Animations should now work. We also save color values if there's no texture.
2016-01-24 13:28:40 +01:00
97d70f8e32
Fixed in client for shoot event. Weapon system now damages health on any target not only players.
2016-01-24 11:36:01 +01:00
3baa988ad4
Changed .obj files to our own format. DummyScene.mesh may be broken.
2016-01-23 20:35:58 +01:00
Jace
1ce9128da8
Source-like movement
2016-01-23 19:45:23 +01:00
a28748b35d
Merge remote-tracking branch 'origin/master' into Networking
2016-01-23 18:42:16 +01:00
fcba0a28b8
Merge branch 'master' into Menu
2016-01-23 18:27:48 +01:00
ef020a3770
Text fixed
2016-01-23 18:17:20 +01:00
160b7183b2
WIP
2016-01-23 18:07:07 +01:00
f1835fd89c
Animations PROBABLY works fine if all joints got keyframes.
2016-01-23 18:02:42 +01:00
6eeb3ea524
WIP, Bug fix + nitpicks + optimizations.
2016-01-23 17:50:35 +01:00
5edf5a41f1
Transparency bug fix
2016-01-23 16:45:26 +01:00
aacfc47fb5
Merge remote-tracking branch 'origin/master' into Menu
...
# Conflicts:
# resources/Shaders/ForwardPlus.frag.glsl
# src/Engine/Rendering/DrawFinalPass.cpp
2016-01-23 15:12:19 +01:00
Jace
666ef6589e
Crouching!
2016-01-23 15:06:47 +01:00
680a12d88f
HealthMeter
2016-01-23 14:53:17 +01:00
71404c8828
Special case for collision vs ground (upward facing) triangles.
2016-01-23 14:01:54 +01:00
6a18cb88af
Merge remote-tracking branch 'origin/master' into Forward+
...
# Conflicts:
# include/Engine/Rendering/Renderer.h
# src/Engine/Rendering/PickingPass.cpp
# src/Engine/Rendering/Renderer.cpp
2016-01-23 13:59:21 +01:00
9a23d8887a
Merge remote-tracking branch 'origin/master' into TextRendering
...
# Conflicts:
# include/Engine/Rendering/RenderSystem.h
# src/Engine/Rendering/RenderSystem.cpp
2016-01-23 11:48:10 +01:00
3974c649ab
WIP on ModelBoxCollision. Octree works in Release mode.
2016-01-23 10:45:50 +01:00
Jace
31e7340daf
Ignoring interpolation and rendering for local player entities!
2016-01-23 00:40:37 +01:00
Jace
90867b094a
Merge remote-tracking branch 'origin/TextRendering' into Networking
...
# Conflicts:
# include/Engine/Rendering/RenderSystem.h
# src/Engine/Rendering/RenderSystem.cpp
2016-01-22 22:08:56 +01:00
46dff1a59c
Merge remote-tracking branch 'origin/master' into Menu
...
# Conflicts:
# include/Engine/Rendering/RenderSystem.h
# src/Engine/Rendering/RenderSystem.cpp
2016-01-22 17:02:56 +01:00
74c95089ea
Merge remote-tracking branch 'origin/PlayerMovement' into Networking
2016-01-22 16:19:35 +01:00
Jace
ca2aab449e
Basic movement and camera management between players and editor
2016-01-22 16:12:51 +01:00
7498cebf5e
Merge remote-tracking branch 'origin/master' into Forward+
...
# Conflicts:
# src/Engine/Rendering/DrawFinalPassState.cpp
# src/Engine/Rendering/PickingPass.cpp
# src/Engine/Rendering/Renderer.cpp
2016-01-22 15:57:38 +01:00
3955e1d60c
Can resolve collision when AABB corners cut through triangle.
...
At least two more cases left to resolve.
2016-01-22 13:46:09 +01:00
08fcdb382b
Used config for a lot of things
2016-01-22 13:18:53 +01:00
caf55fb8d1
Small fix to the bloom light, now feels smoother.
2016-01-22 10:52:45 +01:00
9f6fa40448
Merge branch 'master' into BoxModelCollision
...
# Conflicts:
# src/Engine/Collision/CollisionSystem.cpp
2016-01-21 17:16:55 +01:00
de7c8e9234
WIP, collision detects too much, no resolving for most cases.
2016-01-21 17:10:36 +01:00
4d60f387ed
Merge pull request #44 from teamfisk/EditorUsefulness
...
Editor refactoring
2016-01-21 17:03:52 +01:00
Jace
1c6750f5b0
Fixed uniform scale on editor widgets
2016-01-21 16:37:35 +01:00
Jace
a6548a72b3
Merge remote-tracking branch 'origin/master' into EditorUsefulness
...
# Conflicts:
# include/Engine/Collision/CollidableOctreeSystem.h
# include/Engine/Collision/CollisionSystem.h
# include/Engine/Collision/TriggerSystem.h
# include/Engine/Rendering/RenderSystem.h
# include/Game/Systems/PlayerSystem.h
# resources/Schema/Components/Physics.xsd
# resources/Schema/Types/Entity.xsd
# src/Engine/Rendering/RenderSystem.cpp
# src/Engine/Rendering/Renderer.cpp
# src/Game/Game.cpp
# src/Game/Systems/HealthSystem.cpp
# src/Game/Systems/PlayerSystem.cpp
# src/Tests/OctTreeTestGameClass.cpp
2016-01-21 16:16:35 +01:00
Jace
fc06a4babc
Editor keyboard shortcuts:
...
Ctrl+S to save the currently selected entity file (iterates to the base parent)
Ctrl+N to create a new empty entity under the selection
Ctrl+O to import an entity file
Del to delete an entity
2016-01-21 15:58:27 +01:00
382e00cff4
Randomness fixed
...
Redundant continue removed
Redundant cross product removed
2016-01-21 15:34:08 +01:00
afe43c5f44
Shader will now handle Glowmaps. However the load code is not there yet.
2016-01-21 14:53:47 +01:00
Jace
b9147344e1
Semi-working translation widget
2016-01-21 14:14:22 +01:00
Jace
viktorljung
antc13
William Moberg
Jocke
stiffly
Tleety
Ayumiwii