 Jace
|
01db8e0615
|
Merge remote-tracking branch 'origin/master' into Dirtybit
# Conflicts:
# src/Engine/Collision/CollisionSystem.cpp
# src/Engine/Core/Transform.cpp
# src/Engine/Editor/EditorSystem.cpp
# src/Engine/Rendering/AnimationSystem.cpp
# src/Engine/Rendering/BoneAttachmentSystem.cpp
# src/Game/Systems/CapturePointSystem.cpp
# src/Game/Systems/ExplosionEffectSystem.cpp
# src/Game/Systems/PlayerMovementSystem.cpp
|
2016-03-12 04:09:53 +01:00 |
|
|
Jace
|
5baac926aa
|
Perfectly working abs pos caching using dirty flags! :D
|
2016-03-12 03:29:41 +01:00 |
|
|
Jace
|
ee5c13d463
|
Merge branch 'Dirtybit-imon' into Dirtybit
# Conflicts:
# src/Engine/Core/Transform.cpp
|
2016-03-12 01:32:09 +01:00 |
|
|
Jace
|
671079764e
|
Merge branch 'Dirtybit' of github.com:teamfisk/TacticalZ into Dirtybit
|
2016-03-12 01:26:56 +01:00 |
|
|
Jace
|
80649ce51d
|
Updated the ENTIRE CODEBASE TO MATCH
|
2016-03-12 00:38:33 +01:00 |
|
 stiffly
|
28d576bfc0
|
Now the bgm should loop again.
|
2016-03-11 21:04:33 +01:00 |
|
|
stiffly
|
66d0f9fa47
|
Added menu music
|
2016-03-11 20:28:09 +01:00 |
|
 Tleety
|
dc09ba9158
|
Resolution should now use a dropdown
|
2016-03-11 20:02:25 +01:00 |
|
 Teejoon
|
1ad087dc75
|
MSAA mostly working. Only merging the MS render buffer to a single texture so that others could use the AA texture easly
|
2016-03-11 19:05:34 +01:00 |
|
|
stiffly
|
157a54e845
|
Merge remote-tracking branch 'origin/master' into Kill-streak-sounds
|
2016-03-11 18:19:22 +01:00 |
|
|
Tleety
|
7759af2c5a
|
Log remove
|
2016-03-11 15:52:47 +01:00 |
|
|
Tobias Dahl
|
2f61171d16
|
Merge pull request #185 from teamfisk/TextColor
Text that handles color, alpha and icon parsing
|
2016-03-11 15:25:06 +01:00 |
|
|
Tleety
|
26337ff243
|
Merge remote-tracking branch 'origin/master' into Menu
|
2016-03-11 15:07:52 +01:00 |
|
|
Tleety
|
0ca627eb8b
|
Merge remote-tracking branch 'origin/master' into Menu
|
2016-03-11 14:57:59 +01:00 |
|
|
Tobias Dahl
|
530c0fd9b0
|
Merge pull request #204 from teamfisk/RendererBugFixes
Getting ShaderID fewer times
|
2016-03-11 14:57:36 +01:00 |
|
 William Moberg
|
f036817c0c
|
Merge pull request #203 from teamfisk/SplitSnapshots
Split snapshots
|
2016-03-11 14:35:18 +01:00 |
|
 Jocke
|
06bddd9d54
|
Fixed requests.
|
2016-03-11 14:07:03 +01:00 |
|
|
Jocke
|
5f959ded89
|
Did changes upon pull request's request.
|
2016-03-11 12:54:59 +01:00 |
|
|
Jocke
|
0fbc482f9c
|
Changed getters to return reinterpret_casted data.
|
2016-03-11 12:22:55 +01:00 |
|
|
Jocke
|
2eb863757b
|
renamed variabels
|
2016-03-11 11:55:16 +01:00 |
|
|
Teejoon
|
cac0522ae7
|
Fixed glow on window resize
|
2016-03-11 11:41:02 +01:00 |
|
|
Teejoon
|
e96ad44e44
|
BlurHUDPass now works correct when resizing window.
|
2016-03-11 11:23:23 +01:00 |
|
|
stiffly
|
a3ab844cc4
|
Makes sure m_CurrentSelection is valid before using it.
|
2016-03-11 11:12:49 +01:00 |
|
|
stiffly
|
03493df213
|
Merge remote-tracking branch 'origin/master' into EntitiesWithoutTransform
|
2016-03-11 11:06:23 +01:00 |
|
|
Jocke
|
7febb7681c
|
Merge remote-tracking branch 'origin/master' into SplitSnapshots
|
2016-03-11 11:05:41 +01:00 |
|
|
Teejoon
|
e000408593
|
Getting ShaderID one time per material in total instead of one time every frame
|
2016-03-11 11:03:09 +01:00 |
|
|
Jocke
|
33627f917c
|
removed debug info.
|
2016-03-11 11:01:10 +01:00 |
|
 verysecrethero
|
0869afd529
|
Merge pull request #193 from teamfisk/BoxModelCollision
Removed collision jittering effects
|
2016-03-11 10:48:25 +01:00 |
|
|
Adam Byléhn
|
56a13d03fc
|
Merge pull request #197 from teamfisk/SpectatorCamera
Properly unlocked mouse
|
2016-03-11 10:43:29 +01:00 |
|
|
Adam Byléhn
|
dad18a200f
|
Merge pull request #202 from teamfisk/Trigger
Triggersystem updated for the capturepoints
|
2016-03-11 10:38:20 +01:00 |
|
|
Tleety
|
dab58e09a0
|
Merge branch 'master' into Menu
|
2016-03-11 10:20:25 +01:00 |
|
|
Tleety
|
cd6967b310
|
Merge
|
2016-03-11 10:20:13 +01:00 |
|
 FakeShemp
|
937bf823f3
|
Merge branch 'master' of github.com:teamfisk/TacticalZ
|
2016-03-10 21:59:23 +01:00 |
|
|
FakeShemp
|
e35b09cc68
|
Add alpha clipping
Tobbe sa att jag fick pusha direkt
|
2016-03-10 21:59:01 +01:00 |
|
|
Tleety
|
ab70aed840
|
WIP
|
2016-03-10 16:15:57 +01:00 |
|
|
William Moberg
|
d6e3a47182
|
Merge branch 'master' into Trigger
|
2016-03-10 16:14:17 +01:00 |
|
|
William Moberg
|
038a706e28
|
Don't collide against disabled (invisible) models. Triggers uses model vs. box instead of only box vs. box.
|
2016-03-10 16:05:30 +01:00 |
|
|
Jocke
|
a8a4b5d2a2
|
Disconnect on udp
|
2016-03-10 15:59:55 +01:00 |
|
|
Jace
|
777f382772
|
Merge branch 'master' of github.com:teamfisk/TacticalZ
|
2016-03-10 15:48:05 +01:00 |
|
|
Jace
|
78129cf432
|
Fixed picking depth values after depth buffer was changed to a texture.
|
2016-03-10 15:47:47 +01:00 |
|
|
William Moberg
|
c9fef65c4f
|
Merge pull request #198 from teamfisk/Menu
Menu
|
2016-03-10 15:38:06 +01:00 |
|
|
Tleety
|
7e6288c597
|
Some merge fixes and some sprite fixes.
|
2016-03-10 15:36:33 +01:00 |
|
|
Tleety
|
4322a5d8da
|
Some fixes for sprites
|
2016-03-10 15:21:11 +01:00 |
|
|
Jocke
|
67dfbfff01
|
Fixed multiply connections
|
2016-03-10 14:44:06 +01:00 |
|
|
Jace
|
dd63f4a1b4
|
Fixed FOV being used to calculate projection matrix being degrees when it should be radians, AGAIN. FOV angles are now correct!
|
2016-03-10 13:51:18 +01:00 |
|
|
Tleety
|
50dbbb4ed4
|
SSAO now send in 0 as Lod level and some optimizations in SSAO and Blur pass.
|
2016-03-10 13:47:16 +01:00 |
|
|
Tleety
|
329a15e08b
|
Bloom bad edge clamp fixed
|
2016-03-10 13:42:33 +01:00 |
|
|
Jace
|
416f55b6ce
|
Merge pull request #196 from teamfisk/RendererBugFixes
Fixed on window resize memory leak
|
2016-03-10 13:11:23 +01:00 |
|
|
Jace
|
0346f81234
|
Renderer resizing updated to send EResolutionChanged when the resolution is updated so cameras can update their aspect ratio and have a correct FOV. Renderer::SetResolution actually changes the resolution now too.
|
2016-03-10 13:09:34 +01:00 |
|
|
Tleety
|
c3255519bf
|
Blur is now looking like real blur
|
2016-03-10 13:07:41 +01:00 |
|