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
ecdb5ed07d
Merge remote-tracking branch 'origin/master' into Networking
2016-01-23 17:51:06 +01:00
6d2c656a04
Merge remote-tracking branch 'origin/Networking' into Networking
2016-01-23 16:41:42 +01:00
2bf0434bcb
Remade Snapshot logic from component based to entity based.
2016-01-23 16:40:38 +01:00
bd62b5873d
Revert "Merge pull request #43 from teamfisk/Forward+"
...
This reverts commit d59ab5aba2bef95235d0
2016-01-23 15:57: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
680a12d88f
HealthMeter
2016-01-23 14:53:17 +01:00
f623232a2b
Removed a temp variable.
2016-01-23 14:52:29 +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
b499f4b020
Fixed some rendering bugs and some code refactoring
2016-01-23 12:17:38 +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
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
445248af55
Changed name and made a TextPassState
2016-01-23 11:38:31 +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
b37b20b7d8
Didn't bulid lol. Fixed.
2016-01-22 17:57:31 +01:00
389e057611
EPlayerSpawned special logic added to server and client.
2016-01-22 17:49:21 +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
2b8debbfff
Added MipMap texture generation
2016-01-22 15:55:32 +01:00
08c476e9e3
Added kick logic to the server. Also typedefed.
2016-01-22 15:42:36 +01:00
08fcdb382b
Used config for a lot of things
2016-01-22 13:18:53 +01:00
fcc9d64e7a
Now publishes an EPlayerDisconnected event
2016-01-22 10:58:10 +01:00
7a95880e10
Merge remote-tracking branch 'origin/master' into Networking
2016-01-22 10:36:11 +01:00
6cd073c3c8
Added network metrics logging and reactored code.
2016-01-22 10:32:54 +01:00
Jace
8cf83454d7
Fixed input going through editor UI
2016-01-21 17:45:20 +01:00
4d60f387ed
Merge pull request #44 from teamfisk/EditorUsefulness
...
Editor refactoring
2016-01-21 17:03:52 +01:00
Jace
75dcdcec41
Fixed inconsistent editor input controls. Left mouse = select and move. Right mouse = camera.
2016-01-21 17:00:47 +01:00
973ccd34c9
Removed unnecessary string in EPlayerDamage (TypeOfDamage). Renamed a variable in WeaponSystem
2016-01-21 16:30:07 +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
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
983f90504d
Bloom effect added, will have to see if it needs improving. Also added HDR colors and gamma correction.
2016-01-21 12:02:28 +01:00
Jace
f1345419b6
EditorWidgetSystem that takes care of moving widgets around
2016-01-21 10:30:19 +01:00
Jace
5e70d6eef6
EntityWrapper::Parent helper function
2016-01-21 10:29:48 +01:00
Jace
4aa9100c69
Camera::WorldToScreen helper function
2016-01-21 10:29:36 +01:00
7b34e001ba
Merge remote-tracking branch 'origin/master' into ShootEvent
2016-01-21 10:26:42 +01:00
c2e05de89f
Deleted some components, etc for ShootEvent that will likely be used in a WeaponSystem instead
2016-01-21 10:24:34 +01:00
ea9c4d19d0
Merge remote-tracking branch 'origin/master' into TextRendering
...
# Conflicts:
# include/Game/Game.h
2016-01-21 10:19:32 +01:00
f3bfe388af
Clean up
2016-01-21 10:16:03 +01:00
viktorljung
antc13
stiffly
Jocke
Tleety
Jace
William Moberg
verysecrethero