 Jocke
|
7bf4f5c30e
|
Merge remote-tracking branch 'origin/master' into TCPConnections
|
2016-02-03 10:29:36 +01:00 |
|
|
Jocke
|
e133791369
|
WIP Reliable Message
|
2016-02-03 10:28:15 +01:00 |
|
 Jace
|
24aac6a00d
|
Merge pull request #62 from teamfisk/DoubleJump
You can now DoubleJump!
|
2016-02-02 15:31:03 +01:00 |
|
 verysecrethero
|
45a92b362f
|
DoubleJumping now in InputController instead.
|
2016-02-02 15:10:11 +01:00 |
|
|
verysecrethero
|
2085d9ec9e
|
Merge remote-tracking branch 'origin/master' into DoubleJump
|
2016-02-02 14:22:00 +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 |
|
|
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 |
|
|
Jace
|
9090be8acf
|
Merge branch 'Warnings-Simon'
|
2016-02-01 17:53:55 +01:00 |
|
|
Jace
|
a3d4eb65d5
|
Fixes #66 warnings
|
2016-02-01 17:53:01 +01:00 |
|
|
Jace
|
9b2a4be707
|
Merge pull request #71 from teamfisk/Warnings-Adam
Warnings adam
|
2016-02-01 17:52:18 +01:00 |
|
 stiffly
|
5474a18753
|
#68 Fixed warning in SoundSystem.cpp
|
2016-02-01 17:15:51 +01:00 |
|
|
Jace
|
0a43f8104e
|
Added _CRT_SECURE_NO_WARNINGS definition compiling with MSVC
|
2016-02-01 16:31:01 +01:00 |
|
|
Adam Byléhn
|
ca8b7cbee8
|
Merge pull request #65 from teamfisk/EditorUsefulness
Editor usefulness
|
2016-02-01 16:13:37 +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 |
|
|
Jace
|
a22bc00d46
|
*cough*
|
2016-02-01 13:37:51 +01:00 |
|
|
Jace
|
5bfcffc142
|
Fixed widget movement calculations going weird when world origin wasn't on screen
|
2016-02-01 11:56:21 +01:00 |
|
|
Jace
|
ee92200300
|
Improved editor pause logic. Editor now pauses when it's enabled and makes sure UI is up to date with the current state.
|
2016-02-01 10:45:37 +01:00 |
|
|
Jace
|
d3b1053f21
|
Fixes #59
|
2016-02-01 10:29:59 +01:00 |
|
|
verysecrethero
|
0c97ce7a4a
|
You can now DoubleJump!
|
2016-01-29 10:12:49 +01:00 |
|
|
Jace
|
13f020ddf5
|
Fixed #49 being able to parent an entity to itself, which resulted in infinite infinite loops everywhere! D:
|
2016-01-27 18:37:43 +01:00 |
|
|
Jace
|
65da634c71
|
File dropping into resource paths in the editor
|
2016-01-27 17:51:47 +01:00 |
|
|
Jace
|
c519ba2536
|
Component fields in the editor are now sorted in the order they're defined
|
2016-01-27 17:12:07 +01:00 |
|
|
Jace
|
4b7613a659
|
Sorted editor component dropdown and made it always be fully expanded to show as many components as possible
|
2016-01-27 17:07:48 +01:00 |
|
|
Jace
|
7408da401b
|
Merge pull request #56 from teamfisk/NormalSpecularMapping
Transparency fix and support for Normal and Specular maps
|
2016-01-27 16:44:10 +01:00 |
|
 Tleety
|
a63ecb8133
|
Some wierd shader faults and merge error fixe
|
2016-01-27 15:54:36 +01:00 |
|
|
Jace
|
788407b709
|
Made CollisionSystem aware of entities
|
2016-01-27 15:42:50 +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 |
|
|
Jace
|
6615fe9438
|
Enabled multithreaded build for MSVC
|
2016-01-27 15:09:34 +01:00 |
|
|
Jace
|
113448dbf0
|
Added DEBUG preprocessor definition in Debug and RelWithDebInfo mode
|
2016-01-27 15:09:23 +01:00 |
|
|
Tleety
|
5c9616d4af
|
Fixed asset name
|
2016-01-27 13:55:23 +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 |
|
|
Jace
|
5fcd26cd3e
|
Made TriggerSystem make use of Octree
|
2016-01-27 13:35:16 +01:00 |
|
|
Tleety
|
8102f3a2ea
|
Working transparency in most common cases.
Transparency check is automatically set if the alpha color value is under 1
|
2016-01-27 12:59:44 +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 |
|
|
Jace
|
eb42217885
|
Merge pull request #38 from teamfisk/CoolDeathAnimation
Cool death animation
|
2016-01-27 10:51:22 +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 |
|
|
Jace
|
505a6c7396
|
Hiding first person models properly
|
2016-01-25 14:32:48 +01:00 |
|
|
Jace
|
8866dd6054
|
Merge remote-tracking branch 'origin/Networking' into ShootRays
|
2016-01-25 11:57:44 +01:00 |
|
|
Jace
|
b6fd18baed
|
Hacked in serverside effects
|
2016-01-25 11:56:40 +01:00 |
|
|
Jace
|
4245264029
|
Weapon RayZ
Weapon RayZ
|
2016-01-25 11:26:33 +01:00 |
|
 viktorljung
|
d12246833e
|
Some further small fizes to resolution //Tobias
|
2016-01-25 01:26:41 +01:00 |
|
|
stiffly
|
44baa47bba
|
Merge remote-tracking branch 'origin/master' into CoolDeathAnimation
# Conflicts:
# include/Engine/Common.h
# include/Engine/Rendering/DrawFinalPass.h
# include/Engine/Rendering/DrawScenePass.h
# include/Engine/Rendering/RenderQueue.h
# include/Engine/Rendering/Renderer.h
# resources/Shaders/ForwardPlus.frag.glsl
# resources/Shaders/ForwardPlus.vert.glsl
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Engine/Rendering/DrawScenePass.cpp
# src/Engine/Rendering/RenderSystem.cpp
# src/Engine/Rendering/Renderer.cpp
# src/Game/Game.cpp
|
2016-01-25 01:21:15 +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
|
7b348379ac
|
Quaternions are never the solution.
|
2016-01-25 00:22:55 +01:00 |
|