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
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
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
1670fb4e48
Moved triangle vs ray code to method.
2016-01-22 14:45:50 +01:00
08fcdb382b
Used config for a lot of things
2016-01-22 13:18:53 +01:00
d25804e6f8
Merge branch 'master' into BoxModelCollision
2016-01-22 11:24:19 +01:00
52765cc85b
TriangleVsBox detection seems to work in all cases, but cannot resolve all cases yet.
...
Also added default ctor for Ray and removed compilation errors in CollisionSystem.
2016-01-22 11:22:56 +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
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
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
Jace
70cab9ef30
Merge pull request #40 from teamfisk/Networking
...
Networking
2016-01-21 10:03:44 +01:00
Jace
f1a54a89b3
Merge pull request #37 from teamfisk/OctTree
...
Oct tree
2016-01-21 09:57:46 +01:00
c984f76b2f
Importing & Reading Custom animation data. TODO: Shaders.
2016-01-20 18:36:03 +01:00
b098bd2bd3
Merge remote-tracking branch 'origin/master' into ShootEvent
...
# Conflicts:
# include/Engine/Core/ComponentWrapper.h
# include/Game/PlayerSystem.h
# include/Game/Systems/HealthSystem.h
# resources/Schema/Components.xsd
# resources/Schema/Components/Player.xml
# resources/Schema/Types/Entity.xsd
# src/Game/PlayerSystem.cpp
# src/Tests/HealthSystemTest.cpp
# src/Tests/OctTreeTestAnders.cpp
# src/Tests/OctTreeTestGameClass.cpp
# src/Tests/OctTreeTestGameClass.h
# src/Tests/OctTreeTestHardCodedTestWorld.h
2016-01-20 17:53:33 +01:00
cd67253173
Added logic to go from spectator to player.
2016-01-20 17:41:16 +01:00
f6ce98249e
Merge remote-tracking branch 'origin/master' into CapturePointTake
2016-01-20 16:32:14 +01:00
Jace
viktorljung
William Moberg
stiffly
Tleety
Jocke
verysecrethero
antc13