 stiffly
|
2eaad2aa00
|
Client now responds to deleted entity and component in server
|
2016-01-24 17:16:26 +01:00 |
|
 Jace
|
235b26ad61
|
WIP shoot
|
2016-01-24 17:16:18 +01:00 |
|
|
Jace
|
3261e21d96
|
Coloring players depending on team and created a blue spawn in MovementTest
|
2016-01-24 15:46:01 +01:00 |
|
|
Jace
|
373bb33cf0
|
Player jumping taking air acceleration into account
|
2016-01-24 15:20:34 +01:00 |
|
|
Jace
|
aaa11d2109
|
Merge remote-tracking branch 'origin/master' into PlayerMovement
|
2016-01-24 14:18:23 +01:00 |
|
|
Jace
|
67477ff3ae
|
EEntityDeleted and EComponentDeleted events published by World
|
2016-01-24 13:49:45 +01:00 |
|
 viktorljung
|
aa3b8cd652
|
Fixed text color and removed debugging code
|
2016-01-24 13:37:07 +01:00 |
|
 Jocke
|
7567f47a68
|
Weapon system now searches parents for health component (stops at first health component).
|
2016-01-24 11:56:46 +01:00 |
|
|
Jocke
|
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 |
|
|
Jace
|
1ce9128da8
|
Source-like movement
|
2016-01-23 19:45:23 +01:00 |
|
|
stiffly
|
ecdb5ed07d
|
Merge remote-tracking branch 'origin/master' into Networking
|
2016-01-23 17:51:06 +01:00 |
|
|
viktorljung
|
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 |
|
|
Jace
|
b83d773627
|
Infinite respawning for now
|
2016-01-23 15:06:41 +01:00 |
|
|
viktorljung
|
680a12d88f
|
HealthMeter
|
2016-01-23 14:53:17 +01:00 |
|
|
Jace
|
32f73201c5
|
Basic jumping!
|
2016-01-23 12:15:33 +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 |
|
|
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 |
|
|
Jace
|
55ee2bb3bf
|
Player input properly separated from editor input and server
|
2016-01-22 21:35:31 +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 |
|
|
viktorljung
|
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 |
|
|
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 |
|
|
stiffly
|
08fcdb382b
|
Used config for a lot of things
|
2016-01-22 13:18:53 +01:00 |
|
|
Jace
|
1e3fc1ae2d
|
Created EPlayerSpawned that gets published when a player spawns
|
2016-01-22 10:16:35 +01:00 |
|
 verysecrethero
|
6f739e22f3
|
Crash fix for: if you delete a team component in editor.
|
2016-01-22 10:10:39 +01:00 |
|
|
verysecrethero
|
deb6ff1b16
|
Changed some files so it works with the changes in master. (weaponsystem,capturepoint,some tests)
|
2016-01-21 17:36:47 +01:00 |
|
 William Moberg
|
4d60f387ed
|
Merge pull request #44 from teamfisk/EditorUsefulness
Editor refactoring
|
2016-01-21 17:03:52 +01:00 |
|
|
William Moberg
|
3548cfa248
|
Merge pull request #27 from teamfisk/ShootEvent
Shoot event
|
2016-01-21 16:35:55 +01:00 |
|
|
verysecrethero
|
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 |
|
|
verysecrethero
|
7deb32431e
|
Removed Color TestCode in WeaponSystem
|
2016-01-21 16:03:30 +01:00 |
|
|
verysecrethero
|
2381f01d12
|
HealthSystem now deletes the entity after publishing the PlayerDeath event
|
2016-01-21 14:25:01 +01:00 |
|
|
verysecrethero
|
bdebc9de62
|
WeaponSystem now handles "PrimaryFire" input events. It sends out ePlayerDamage event if it hits a player. Included some tests
|
2016-01-21 11:55:51 +01:00 |
|
|
viktorljung
|
ea9c4d19d0
|
Merge remote-tracking branch 'origin/master' into TextRendering
# Conflicts:
# include/Game/Game.h
|
2016-01-21 10:19:32 +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 |
|
|
verysecrethero
|
a596b8746b
|
CapturePointTimers are now reset for "inactive" CapturePoints after a capture.
|
2016-01-20 17:32:20 +01:00 |
|
|
verysecrethero
|
35876f6425
|
Removed membervariable m_NextPossibleCapturePointand added it as local instead
|
2016-01-20 16:37:10 +01:00 |
|
|
verysecrethero
|
f6ce98249e
|
Merge remote-tracking branch 'origin/master' into CapturePointTake
|
2016-01-20 16:32:14 +01:00 |
|
|
verysecrethero
|
8189e3c00c
|
Logic in CapturePointSystem is working again. Need to update all Tests!
|
2016-01-20 14:59:18 +01:00 |
|
|
stiffly
|
85523343b2
|
Merge remote-tracking branch 'origin/master' into Networking
|
2016-01-20 10:24:53 +01:00 |
|
|
William Moberg
|
410e349329
|
Added test map for capture points and some debug code.
|
2016-01-19 18:27:58 +01:00 |
|
|
viktorljung
|
ce27b224df
|
Merge remote-tracking branch 'origin/master' into TextRendering
# Conflicts:
# include/Engine/Rendering/RenderQueue.h
# include/Engine/Rendering/RenderSystem.h
# include/Engine/Rendering/Renderer.h
# src/Engine/Rendering/RenderSystem.cpp
|
2016-01-19 17:27:09 +01:00 |
|
|
verysecrethero
|
b45de542da
|
CapturePointSystem updated, all tests are green
|
2016-01-19 17:19:58 +01:00 |
|
 Tleety
|
a8ffb24040
|
latest commit fix
|
2016-01-19 16:08:09 +01:00 |
|
|
Tleety
|
893ef38237
|
Removed world from renderer and moved depth-calculation code to modeljob
|
2016-01-19 15:41:17 +01:00 |
|
|
verysecrethero
|
f197993beb
|
Changed CapturePointSystem in light of new enums in the components and a teamcomponent. Half the tests are currently working
|
2016-01-19 15:31:15 +01:00 |
|