BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
954 Commits 116 Branches 0 Tags
becb197feb237fb034f3a4a8d1c670b176f09e49
Commit Graph

44 Commits

Author SHA1 Message Date
stiffly becb197feb Player walk is now based on distance traveled, and it is also reset when key is released. However when dashing the player step sound is still played. The distance of a step is also hard coded in the header file. Will config it up some day. 2016-02-05 17:46:27 +01:00
stiffly 454eef8225 WIP. Improving player walk logic. 2016-02-05 17:21:48 +01:00
stiffly fbdaf92953 Started refactoring. Put player walk logic in a designated sound system. 2016-02-05 16:39:23 +01:00
stiffly e90f802d48 Merge remote-tracking branch 'origin/master' into Sound 2016-02-05 13:59:21 +01:00
stiffly 0a8ee1623f Merge remote-tracking branch 'origin/master' into Sound 
# Conflicts:
#	assets
 2016-02-04 10:47:30 +01:00
verysecrethero 13161b4f57 Merge remote-tracking branch 'origin/master' into AssaultDash 2016-02-03 15:07:19 +01:00
verysecrethero 9d3171540d AssaultDashCheck is now in FirstPersonInputController instead. TODO: config option, shift button, forward/backward dash 2016-02-03 11:54:14 +01:00
Jocke 6a3f585fb9 Fixed warnings associated with Network.cpp, Client.cpp, Server.cpp and Packet.cpp. 
BOOST_ASIO_ERROR_CATEGORY_NOEXCEPT': macro redefinition was fixed by https://svn.boost.org/trac/boost/ticket/11539
 2016-02-02 13:26:15 +01:00
verysecrethero 7987d4b27c Added AssaultDash and all its logic, including a doubletapkey. Doubletapkey could be made more generic. 2016-01-29 12:06:14 +01:00
Jace 5fcd26cd3e Made TriggerSystem make use of Octree 2016-01-27 13:35:16 +01:00
Jace 4245264029 Weapon RayZ 
Weapon RayZ
 2016-01-25 11:26:33 +01:00
Jace b95c1fdfa4 Merge remote-tracking branch 'origin/Menu' 
# Conflicts:
#	include/Engine/Rendering/ModelJob.h
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/Player.xml
#	resources/Schema/Entities/RenderingWorld.xml
#	src/Game/Game.cpp
 2016-01-25 00:25:03 +01:00
Jace d0de169613 Instagib! 2016-01-24 23:05:52 +01:00
viktorljung d03b3fb071 Merge remote-tracking branch 'origin/master' into Menu 
# Conflicts:
#	resources/Schema/Entities/Player.xml
 2016-01-24 22:23:53 +01:00
viktorljung ada1bac2a7 Merge remote-tracking branch 'origin/master' into Menu 
# Conflicts:
#	include/Engine/Rendering/RenderSystem.h
#	resources/Schema/Entities/RenderingWorld.xml
#	resources/Shaders/ForwardPlus.frag.glsl
#	src/Engine/Rendering/RenderSystem.cpp
 2016-01-24 20:48:17 +01:00
Jace 235b26ad61 WIP shoot 2016-01-24 17:16:18 +01:00
Jace 1ce9128da8 Source-like movement 2016-01-23 19:45:23 +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 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 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 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
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 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
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 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
Jace 70cab9ef30 Merge pull request #40 from teamfisk/Networking 
Networking
 2016-01-21 10:03:44 +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 8189e3c00c Logic in CapturePointSystem is working again. Need to update all Tests! 2016-01-20 14:59:18 +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
stiffly ad9bb5fba4 Added an extra interpolation point. 2016-01-19 15:03:10 +01:00
stiffly e0c4394f20 Merge. Also fixed interpolation for scale and rotation. 
Merge remote-tracking branch 'origin/master' into Networking

# Conflicts:
#	include/Game/Game.h
#	src/Game/CMakeLists.txt
#	src/Game/Game.cpp
 2016-01-19 14:04:25 +01:00
Jace 51979d7f0c Changed System to take World through constructor and store it instead, cause it makes more sense. 2016-01-18 23:59:33 +01:00
William Moberg 942064c450 Removed class PlayerSystem and associated files. 2016-01-18 13:07:04 +01:00
Jace f281d220de Working Spawner, SpawnPoint, PlayerSpawn and Team components, along with their systems. 2016-01-17 01:00:48 +01:00
Jace db1b972cd1 Spawner, SpawnPoint and PlayerSpawn components, and base work on their systems 2016-01-15 18:32:47 +01:00
Jace 6ad1839def Initial work on PlayerMovementSystem 2016-01-14 17:03:48 +01:00