 Viktor Ljung
|
f80fb5eda8
|
Merge pull request #52 from teamfisk/Importer
Importer
|
2016-01-24 17:05:02 +01:00 |
|
 antc13
|
aa115befa9
|
UnitRaptor is now displayed while models are being loaded in.
|
2016-01-24 17:04:12 +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 |
|
|
antc13
|
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 |
|
|
antc13
|
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 |
|
|
antc13
|
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 |
|
|
antc13
|
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 |
|
|
antc13
|
b5b1140f5c
|
Custom Animations should now work. We also save color values if there's no texture.
|
2016-01-24 13:28:40 +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
|
1ce9128da8
|
Source-like movement
|
2016-01-23 19:45:23 +01:00 |
|
|
Viktor Ljung
|
132de88d28
|
Merge pull request #50 from teamfisk/Forward+
Forward+
|
2016-01-23 18:23:16 +01:00 |
|
 viktorljung
|
df485ccf7b
|
Merge branch 'master' into Forward+
|
2016-01-23 18:21:35 +01:00 |
|
|
viktorljung
|
85a4d98c81
|
Revert "Revert "Merge pull request #43 from teamfisk/Forward+""
This reverts commit bd62b5873d.
|
2016-01-23 18:21:10 +01:00 |
|
|
viktorljung
|
ef020a3770
|
Text fixed
|
2016-01-23 18:17:20 +01:00 |
|
|
viktorljung
|
160b7183b2
|
WIP
|
2016-01-23 18:07:07 +01:00 |
|
|
antc13
|
f1835fd89c
|
Animations PROBABLY works fine if all joints got keyframes.
|
2016-01-23 18:02:42 +01:00 |
|
 Tleety
|
5edf5a41f1
|
Transparency bug fix
|
2016-01-23 16:45:26 +01:00 |
|
|
viktorljung
|
ff6ec82a6c
|
AMD fix
|
2016-01-23 16:27:01 +01:00 |
|
|
viktorljung
|
bd62b5873d
|
Revert "Merge pull request #43 from teamfisk/Forward+"
This reverts commit d59ab5aba2, reversing
changes made to bef95235d0.
|
2016-01-23 15:57:26 +01:00 |
|
|
Jace
|
666ef6589e
|
Crouching!
|
2016-01-23 15:06:47 +01:00 |
|
|
Jace
|
b83d773627
|
Infinite respawning for now
|
2016-01-23 15:06:41 +01:00 |
|
|
Viktor Ljung
|
d59ab5aba2
|
Merge pull request #43 from teamfisk/Forward+
Bloom render pass and HDR colors
|
2016-01-23 14:58:10 +01:00 |
|
|
Tleety
|
f623232a2b
|
Removed a temp variable.
|
2016-01-23 14:52:29 +01:00 |
|
|
Tleety
|
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 |
|
|
Tleety
|
b499f4b020
|
Fixed some rendering bugs and some code refactoring
|
2016-01-23 12:17:38 +01:00 |
|
|
Jace
|
482689fd48
|
fixup! Moved FirstPersonInputController implementation out of header
|
2016-01-23 12:16:40 +01:00 |
|
|
Jace
|
32f73201c5
|
Basic jumping!
|
2016-01-23 12:15:33 +01:00 |
|
|
Jace
|
3aeeb3cad5
|
Moved FirstPersonInputController implementation out of header
|
2016-01-23 12:15:32 +01:00 |
|
|
Jace
|
4d5cbb6057
|
fixup! Added EntityWrapper::IsChildOf and made snapshot interpolation and rendering exceptions for player less hacky
|
2016-01-23 12:14:29 +01:00 |
|
|
Jace
|
bef95235d0
|
Merge pull request #41 from teamfisk/TextRendering
Text rendering
|
2016-01-23 11:51:11 +01:00 |
|
|
viktorljung
|
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 |
|
|
Jace
|
db0e67b9bd
|
Added EntityWrapper::IsChildOf and made snapshot interpolation and rendering exceptions for player less hacky
|
2016-01-23 11:44:16 +01:00 |
|
|
viktorljung
|
e4513376bb
|
fixup! Changed name and made a TextPassState
|
2016-01-23 11:39:10 +01:00 |
|
|
viktorljung
|
445248af55
|
Changed name and made a TextPassState
|
2016-01-23 11:38:31 +01:00 |
|
|
Jace
|
64a7239b17
|
Merge pull request #46 from teamfisk/CapturePointCrashFixBranch
Crash fix for: if you delete a team component in editor.
|
2016-01-23 11:10:57 +01:00 |
|
|
Jace
|
31e7340daf
|
Ignoring interpolation and rendering for local player entities!
|
2016-01-23 00:40:37 +01:00 |
|
|
Jace
|
3ac3311c0c
|
"inline" caused missing symbol when compiling in Release for some reason
|
2016-01-23 00:38:11 +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 |
|
|
Jace
|
55ee2bb3bf
|
Player input properly separated from editor input and server
|
2016-01-22 21:35:31 +01:00 |
|
 stiffly
|
406b730ef3
|
Sends entity names. Temporarily
|
2016-01-22 19:07:20 +01:00 |
|
|
stiffly
|
b37b20b7d8
|
Didn't bulid lol. Fixed.
|
2016-01-22 17:57:31 +01:00 |
|
|
stiffly
|
750442d224
|
Merge remote-tracking branch 'origin/Networking' into Networking
|
2016-01-22 17:49:56 +01:00 |
|
|
stiffly
|
389e057611
|
EPlayerSpawned special logic added to server and client.
|
2016-01-22 17:49:21 +01:00 |
|
|
Jace
|
74d9bae896
|
Added conditional spawning based on whether the running instance is a server or not
|
2016-01-22 17:34:57 +01:00 |
|
|
stiffly
|
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 |
|
|
Tleety
|
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 |
|