 FakeShemp
|
0908be1e02
|
Shadows are pretty much done.
|
2016-02-29 19:45:56 +01:00 |
|
|
FakeShemp
|
2ed5fad699
|
The shadows are working
|
2016-02-29 19:17:16 +01:00 |
|
|
FakeShemp
|
70374fa10e
|
It compiles, but no shadows
|
2016-02-29 18:20:32 +01:00 |
|
|
FakeShemp
|
20468cba1b
|
Merge branch 'master' into Shadows
# Conflicts:
# assets
# include/Engine/Rendering/DrawFinalPass.h
# include/Engine/Rendering/Renderer.h
# resources/Shaders/ForwardPlus.frag.glsl
# resources/Shaders/ForwardPlus.vert.glsl
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Engine/Rendering/FrameBuffer.cpp
# src/Engine/Rendering/Renderer.cpp
|
2016-02-29 18:03:00 +01:00 |
|
|
FakeShemp
|
7749fc5474
|
Small fixing up
|
2016-02-28 19:46:50 +01:00 |
|
|
FakeShemp
|
6dd7f1a657
|
Buggy transparent shadows.
Transparent textures might glow.
|
2016-02-28 18:00:23 +01:00 |
|
|
FakeShemp
|
14b0a64720
|
begin fixing transparent object's shadows
|
2016-02-27 18:42:51 +01:00 |
|
|
FakeShemp
|
8647267cad
|
Make code less dumb, save 7 fps
|
2016-02-27 18:04:33 +01:00 |
|
|
FakeShemp
|
ecab5de056
|
Various shadow calculation methods implemented and ready for use.
|
2016-02-27 16:35:15 +01:00 |
|
|
FakeShemp
|
38d8cdded2
|
Texture Array is now working. Enjoy your single Bind().
|
2016-02-27 15:53:28 +01:00 |
|
|
FakeShemp
|
22c391df54
|
Initial work on texture arrays
|
2016-02-26 17:40:35 +01:00 |
|
 Jace
|
0c60b637c3
|
Who's merging without compiling?
|
2016-02-26 12:52:10 +01:00 |
|
 William Moberg
|
d411de894f
|
Merge pull request #140 from teamfisk/FixNetworkBugs
Death explosion should always get triggered now.
|
2016-02-26 12:01:19 +01:00 |
|
 Jocke
|
18450ff4f3
|
Death explosion should always get triggered now. (I hope)
|
2016-02-26 11:08:05 +01:00 |
|
|
William Moberg
|
22b473a0b6
|
Merge pull request #139 from teamfisk/EditorCopyPaste
Editor copy paste
|
2016-02-26 11:01:18 +01:00 |
|
|
FakeShemp
|
f220d8088c
|
Begin clean-up
|
2016-02-26 10:53:16 +01:00 |
|
|
FakeShemp
|
df2e4abb52
|
WE HAVE WORKING CASCADE SHADOWS
|
2016-02-25 21:21:38 +01:00 |
|
|
FakeShemp
|
8867e7ac3c
|
Working shadows, no cascade blend yet
|
2016-02-25 20:29:41 +01:00 |
|
|
Jace
|
f161fce719
|
Merge pull request #138 from teamfisk/PlayerAtOriginFix
Teleporting to origin on spawn fixed.
|
2016-02-25 17:55:03 +01:00 |
|
|
Jace
|
0343683678
|
Fixed cubemaps being generated over and over again each frame.
|
2016-02-25 17:51:40 +01:00 |
|
|
Jace
|
9e6c67596d
|
Basic editor copy and paste. Doesn't actually copy the entity until you paste it.
|
2016-02-25 17:51:28 +01:00 |
|
|
William Moberg
|
89d0d5753f
|
Fix for player teleporting to (0,0,0). Saves player previous position in CollisionSystem instead of Physics component so it won't be saved when editing Players.
|
2016-02-25 16:16:24 +01:00 |
|
 Adam Byléhn
|
748a178801
|
Merge pull request #136 from teamfisk/FixNetworkBugs
Fix network bugs
|
2016-02-25 16:09:08 +01:00 |
|
|
Jocke
|
eac9a9daf6
|
Pull request #136 Merge remote-tracking branch 'origin/master' into FixNetworkBugs
# Conflicts:
# src/Engine/Network/Client.cpp
|
2016-02-25 16:07:06 +01:00 |
|
|
Jocke
|
059fe5c6c0
|
Fixed typo m_EPDoubleJump to m_EDoubleJump.
|
2016-02-25 16:04:27 +01:00 |
|
|
Joachim Pettersson
|
fb465ede81
|
Merge pull request #134 from teamfisk/HUDDesync
Good job! 👍
|
2016-02-25 15:53:07 +01:00 |
|
|
Jocke
|
f66fa7a183
|
Merge remote-tracking branch 'origin/master' into FixNetworkBugs
# Conflicts:
# include/Engine/Network/Client.h
# include/Engine/Network/MessageType.h
# include/Engine/Network/Server.h
# include/Engine/Network/TCPServer.h
# src/Engine/Network/Client.cpp
# src/Engine/Network/TCPServer.cpp
|
2016-02-25 15:13:11 +01:00 |
|
|
Jocke
|
508d8a6f00
|
Fixed memory leak in TCPServer::AcceptNewConnections caused by acceptor->async_accept().
Fixed some formating and comments.
|
2016-02-25 14:24:38 +01:00 |
|
|
stiffly
|
8ce6308649
|
In snapshot: now sends player information and also CP information. Now it is no longer true that they will arrive in pre order. Appropriate actions were therefor implemented.
|
2016-02-25 11:56:40 +01:00 |
|
|
stiffly
|
f10958c268
|
Capturepoint logic is now purely done on the serverside.
|
2016-02-25 11:50:29 +01:00 |
|
|
William Moberg
|
da1c7b3093
|
Merge pull request #133 from teamfisk/AndersTest
Ammo,HealthPickup now takes in account for possible parenting/childin…
|
2016-02-25 09:58:14 +01:00 |
|
 verysecrethero
|
ef87102d1f
|
Ammo,HealthPickup now takes in account for possible parenting/childing of the pickup. Also saved the xml files with the new scaling
|
2016-02-24 17:53:37 +01:00 |
|
|
Jace
|
9a41bda4cf
|
Merge pull request #132 from teamfisk/CubeMap
Cube map
|
2016-02-24 16:03:49 +01:00 |
|
 Tleety
|
fc18932068
|
Merge remote-tracking branch 'origin/master' into CubeMap
# Conflicts:
# src/Engine/Rendering/Renderer.cpp
|
2016-02-24 15:45:30 +01:00 |
|
|
Tobias Dahl
|
b874ea8641
|
Merge pull request #131 from teamfisk/ResizeWindowFixFromSSAOMerge
Have fix the resizing errors
|
2016-02-24 15:22:12 +01:00 |
|
|
Tobias Dahl
|
2609a0253d
|
Merge pull request #129 from teamfisk/HUDDesync
Networking improvements
|
2016-02-24 15:22:01 +01:00 |
|
|
William Moberg
|
de309d3b9d
|
Merge pull request #130 from teamfisk/AndersTest
CapturePointSystem fix, DamageIndicatorSystem fix
|
2016-02-24 15:17:36 +01:00 |
|
|
Tobias Dahl
|
f7ef6707a7
|
Merge pull request #116 from teamfisk/SeeTeamMates
See team mates
|
2016-02-24 15:05:19 +01:00 |
|
|
Tleety
|
feeff5b164
|
Debug tool for different CubeMap
changed cubemap influence.
|
2016-02-24 14:47:47 +01:00 |
|
|
stiffly
|
7394436e7a
|
Removed unnecessary comment.
|
2016-02-24 14:23:54 +01:00 |
|
|
Tleety
|
f41e0b29be
|
assets
|
2016-02-24 14:21:48 +01:00 |
|
|
Tleety
|
607e83134d
|
Cubemaps working
|
2016-02-24 14:16:49 +01:00 |
|
|
verysecrethero
|
5af4f9d8e7
|
Removed a comment originating from HUDDesynch branch
|
2016-02-24 14:06:41 +01:00 |
|
|
verysecrethero
|
af68236e71
|
now using a define INDICATOR_TEST to activate the DamageIndicatorSystem test.
|
2016-02-24 13:58:05 +01:00 |
|
|
Tleety
|
6f9ce8a0c1
|
WIP
|
2016-02-24 13:57:54 +01:00 |
|
 Teejoon
|
6465fe6ed6
|
Have fix the resizing errors
|
2016-02-24 13:22:41 +01:00 |
|
|
Jocke
|
fa13c1d065
|
Double jump is now working.
|
2016-02-23 18:24:46 +01:00 |
|
|
verysecrethero
|
e2831c5593
|
CapturePointSystem fix, DamageIndicatorSystem fix
|
2016-02-23 17:29:33 +01:00 |
|
|
Tleety
|
8d23c531af
|
Cubemaps kinda functioning, still somthing wierd with the vectors.
|
2016-02-23 17:17:50 +01:00 |
|
|
Tleety
|
91b0ac5fbd
|
Some groundwork for cubemaps.
|
2016-02-23 16:00:43 +01:00 |
|