 Jace
|
df7b4faf24
|
Now caching resulting absolute model matrices as well
|
2016-03-12 04:10:14 +01:00 |
|
|
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
|
9b98bbbea8
|
Fields are now set to dirty when they're changed!
|
2016-03-12 01:26:03 +01:00 |
|
|
Jace
|
80649ce51d
|
Updated the ENTIRE CODEBASE TO MATCH
|
2016-03-12 00:38:33 +01:00 |
|
|
Jace
|
a4b0b108d4
|
Created a wrapper for field types that is able to detect changes to set dirty flags in the future
|
2016-03-12 00:38:26 +01:00 |
|
 Tleety
|
7759af2c5a
|
Log remove
|
2016-03-11 15:52:47 +01:00 |
|
 antc13
|
ac096bbf77
|
Merge branch 'master' of https://github.com/teamfisk/TacticalZ
# Conflicts:
# resources/Schema/Entities/CP_Rocky2.xml
|
2016-03-11 15:46:39 +01:00 |
|
|
antc13
|
81634578d9
|
Updated CP_Rocky2, added a point light to pickups and created 3 different versions of the Floating Crystals above Capture Points.
|
2016-03-11 15:43:20 +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 |
|
|
Tobias Dahl
|
aa16a15693
|
Merge pull request #205 from teamfisk/Menu
Menu
|
2016-03-11 15:23:13 +01:00 |
|
|
Tleety
|
26337ff243
|
Merge remote-tracking branch 'origin/master' into Menu
|
2016-03-11 15:07:52 +01:00 |
|
 FakeShemp
|
7bdb0d410f
|
Merge branch 'master' of github.com:teamfisk/TacticalZ
|
2016-03-11 15:04:52 +01:00 |
|
|
FakeShemp
|
172fb8dfc2
|
MuzzleFlash entities
|
2016-03-11 15:04:44 +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
|
e45d0e8232
|
fix.
|
2016-03-11 14:32:55 +01:00 |
|
|
William Moberg
|
8ebf818c19
|
Merge pull request #206 from teamfisk/CapturePointFixBranch
CapturePointSystem now sets all children visible/not visible for each
|
2016-03-11 14:26:45 +01:00 |
|
|
Jocke
|
62d1cb9a69
|
fixed request.
|
2016-03-11 14:24:59 +01:00 |
|
|
Tobias Dahl
|
edb305b307
|
Merge pull request #175 from teamfisk/EntitiesWithoutTransform
No crash on missing transform in editor system.
|
2016-03-11 14:20:23 +01:00 |
|
 verysecrethero
|
0aedeb61b4
|
CapturePointSystem now sets all children visible/not visible for each red/blue/spectator
|
2016-03-11 14:15:46 +01:00 |
|
|
Tleety
|
44398eac58
|
Options now has some different resolutions.
|
2016-03-11 14:11:58 +01:00 |
|
|
Jocke
|
06bddd9d54
|
Fixed requests.
|
2016-03-11 14:07:03 +01:00 |
|
|
Tleety
|
4937bee46a
|
Unresolved externals shit
|
2016-03-11 13:38:48 +01:00 |
|
|
Tleety
|
bb0531a459
|
WIP
|
2016-03-11 13:10:08 +01:00 |
|
|
Tleety
|
8bd38bc465
|
Merge branch 'Menu' of github.com:teamfisk/TacticalZ into Menu
|
2016-03-11 13:00:43 +01:00 |
|
|
Tleety
|
8ceaae995d
|
Options menu started working on
|
2016-03-11 13:00:34 +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
|
91aedcbb14
|
Merge branch 'Menu' of https://github.com/teamfisk/TacticalZ into Menu
|
2016-03-11 11:41:11 +01:00 |
|
|
Teejoon
|
cac0522ae7
|
Fixed glow on window resize
|
2016-03-11 11:41:02 +01:00 |
|
|
Tleety
|
26dde21e3d
|
Merge branch 'Menu' of github.com:teamfisk/TacticalZ into Menu
|
2016-03-11 11:32:18 +01:00 |
|
|
Tleety
|
23e6a15c7f
|
Fixed the fill on sprites, added some config button components, started work on option menu
|
2016-03-11 11:31:53 +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 |
|