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

460 Commits

Author SHA1 Message Date
Tleety eba36b8492 Some QA-map fixes 2016-02-02 17:12:14 +01:00
Tleety 55854f5c0d Merge remote-tracking branch 'origin/master' into NormalSpecularMapping 2016-02-02 16:30:57 +01:00
Tleety 12a181c1ff Fixed a bug where normals scaled with model scale. Again. 2016-02-02 16:11:03 +01:00
Tleety b131f56f5e Made a quality assurance world that will need to be used before creating a pull request 2016-02-02 16:06:42 +01:00
verysecrethero 7236da09b4 Merge remote-tracking branch 'origin/master' into 3rdPersonDeathCam 2016-02-02 15:13:00 +01:00
viktorljung 89bc063ef0 Merge remote-tracking branch 'origin/Importer' into Animations 
# Conflicts:
#	src/Engine/Rendering/DrawFinalPass.cpp
 2016-02-02 15:01:34 +01:00
stiffly 88ad127d8d plays notification on captured/lost point 2016-02-02 14:57:03 +01:00
viktorljung dba2fbdc0c WIP 2016-02-02 14:52:31 +01:00
stiffly 83281fdaf1 Changed model in player.xml 2016-02-02 13:39:11 +01:00
stiffly d763789490 Merge remote-tracking branch 'origin/master' into Sound 
# Conflicts:
#	src/Engine/Sound/SoundSystem.cpp
 2016-02-02 13:38:49 +01:00
Tleety 28d412f5c7 Some small changes to test world and assets 2016-02-02 13:24:18 +01:00
Jace 0e5f6da9a9 Merge pull request #73 from teamfisk/CapturePointFixBranch 
Several changes/fixes based on the latest broken refactoring in master
 2016-02-02 13:22:03 +01:00
Jace 563fd4082e Updated movement test for model collisions 2016-02-02 12:10:39 +01:00
verysecrethero 42b52a6766 Several changes/fixes based on the latest broken refactoring. 
Fixed Simon's mistake in CapturePointLogic. William fixed so TriggerSystem works again with CapturePoints.
 2016-02-02 11:37:22 +01:00
Tleety 9c2e459e0c Deatheffect color now correctly calculated 2016-02-02 10:58:00 +01:00
Tleety 8299b99e2f Test world changes and some other small fixes 2016-02-01 19:08:46 +01:00
Tleety c708f1582c Merge remote-tracking branch 'origin/master' into NormalSpecularMapping 2016-02-01 18:30:30 +01:00
Tleety a188a3f7fa Removed widget pointlight since it is now redundant 2016-02-01 18:22:36 +01:00
Tleety ed7d00c1d8 Bug where widgets did not get their ambient light now fixed. 2016-02-01 18:19:38 +01:00
Tleety 53cae25eb2 WIP on widget fuckery 2016-02-01 16:56:55 +01:00
William Moberg 30ad238697 Merge branch 'master' into BoxModelCollision 2016-02-01 16:17:10 +01:00
William Moberg 3cfbbbbf54 CollisionSystem now utilizes Octree for collision detection. 2016-02-01 16:13:48 +01:00
Jace be3cfef65f Merge remote-tracking branch 'origin/master' into EditorUsefulness 
# Conflicts:
#	src/Engine/Rendering/DrawFinalPass.cpp
 2016-02-01 16:00:46 +01:00
Jace 65f5bc673f Functional translation widget in global and local space 2016-02-01 15:47:56 +01:00
stiffly c5462b0363 Merge remote-tracking branch 'origin/master' into Sound 2016-02-01 14:35:47 +01:00
stiffly 25b3c02d29 Adding sounds for: jump, walk, shoot 2016-02-01 14:35:23 +01:00
William Moberg d7b02e79c8 Merge branch 'master' into BoxModelCollision 
# Conflicts:
#	include/Engine/Collision/CollisionSystem.h
#	src/Engine/Collision/CollisionSystem.cpp
 2016-02-01 13:48:05 +01:00
William Moberg 76274c326e Fixed going through flat large triangles. Velocity affected by collision. 2016-02-01 13:34:39 +01:00
Tleety 7054822be2 SceneLight component now working 2016-02-01 11:12:03 +01:00
viktorljung 6ba87d2942 Fixed, Crash when trying to animate a model that doesn't contain animations 2016-02-01 10:42:23 +01:00
viktorljung 51075aefc8 Model that has animations is now visible when it does not play an animation (T-pose) 2016-02-01 10:24:50 +01:00
Tleety 8bcafc1151 WIP 2016-01-27 18:07:05 +01:00
viktorljung c9b982bc89 Added BoneAttachment to Entity.xsd 2016-01-27 17:31:57 +01:00
viktorljung 2ec5023752 Changed Animation and BoneAttachment "Name" field to "AnimationName" and "BoneName" 2016-01-27 17:27:34 +01:00
Tleety 97cbc55223 Some debug features for color corrections and glow strength fix. 2016-01-27 17:21:00 +01:00
viktorljung 405002777c Merge remote-tracking branch 'origin/EditorUsefulness' into Animations 
# Conflicts:
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/FastWorld.xml
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Game/Game.cpp
 2016-01-27 17:16:49 +01:00
viktorljung 8fc8d56ee1 Added BoneAttachment component 2016-01-27 17:14:16 +01:00
Tleety a63ecb8133 Some wierd shader faults and merge error fixe 2016-01-27 15:54:36 +01:00
Tleety 0e70dc6fa3 Merge remote-tracking branch 'origin/master' into NormalSpecularMapping 
# Conflicts:
#	include/Engine/Rendering/RenderSystem.h
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Engine/Rendering/RenderSystem.cpp
 2016-01-27 15:41:31 +01:00
Tleety 44302bb0f3 Specular support. Some edits to EditorTestWorld.xml aswell as some debugmodes for textures in the model component 2016-01-27 15:38:54 +01:00
Jace 181017313d Made entity parser give more useful errors and fixed the errors that were while I was at it 2016-01-27 15:16:59 +01:00
verysecrethero 5cdf6db340 Modified HealthSystem so it actually publishes the DeathEvent. Modified EPlayerHealthPickup. Fixed 2 tests. Started work on PlayerDeathSystem 2016-01-27 14:46:45 +01:00
Tleety a954cbbf50 Normal map support 2016-01-27 13:52:27 +01:00
Jace dec2234019 Merge branch 'Cleanup' 
# Conflicts:
#	src/Engine/Rendering/RenderSystem.cpp
 2016-01-27 13:44:15 +01:00
Jace 0334ec3fa7 Merge remote-tracking branch 'origin/Animations' 
# Conflicts:
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Game/Systems/WeaponSystem.cpp
 2016-01-27 13:36:49 +01:00
Tleety cbb17d22d4 WIP 2016-01-27 12:10:00 +01:00
Jace 8bed5194d8 "Proper" handling of conditional rendering of entities parented to camera or entities that should be hidden from the active local player perspective 2016-01-27 11:36:24 +01:00
William Moberg 90f05442aa Merge branch 'master' into BoxModelCollision 
# Conflicts:
#	include/Engine/Core/Octree.h
#	resources/Schema/Entities/CollisionTestLevel.xml
#	src/Engine/Collision/CollisionSystem.cpp
#	src/Engine/Core/Octree.cpp
 2016-01-27 10:52:27 +01:00
Jace 7e12d00874 Merge branch 'master' into CoolDeathAnimation 
# Conflicts:
#	include/Engine/Rendering/ModelJob.h
#	resources/Shaders/ForwardPlus.frag.glsl
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Engine/Rendering/RenderSystem.cpp
 2016-01-27 10:43:23 +01:00
William Moberg 6ea490e215 Tried a horrible recursive method, extreme framedrop. 2016-01-27 10:34:26 +01:00