 Jocke
|
c544f349fd
|
The logic for removing the world is working but when we send the map again the clients memory usage goes crazy.
|
2016-03-12 17:49:50 +01:00 |
|
 viktorljung
|
dfc30f4693
|
Boost fixes?
|
2016-03-12 17:39:50 +01:00 |
|
|
viktorljung
|
944d10f4bb
|
Some network fixes with sidearm
|
2016-03-12 17:34:32 +01:00 |
|
 Tleety
|
f7363eeea4
|
Boost icon fix
|
2016-03-12 17:30:28 +01:00 |
|
 antc13
|
beee2db5fb
|
Merge branch 'master' of https://github.com/teamfisk/TacticalZ
|
2016-03-12 17:08:21 +01:00 |
|
|
antc13
|
1bc4b89a53
|
Added new models with textures to the map. Every model on the map should now be using a texture.
|
2016-03-12 17:08:07 +01:00 |
|
|
Tleety
|
d51ea3cabd
|
Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement
|
2016-03-12 17:04:00 +01:00 |
|
|
Tleety
|
548efeb11e
|
EndScreen should now show when a team win
|
2016-03-12 17:03:50 +01:00 |
|
|
viktorljung
|
4ba011a098
|
Ammosharing over network test WIP
|
2016-03-12 17:01:46 +01:00 |
|
|
viktorljung
|
01cb3afb4b
|
Merge branch 'Movement' of github.com:teamfisk/TacticalZ into Movement
# Conflicts:
# resources/Schema/Entities/PlayerAssaultBlue.xml
# resources/Schema/Entities/PlayerDefenderBlue.xml
|
2016-03-12 15:48:41 +01:00 |
|
|
viktorljung
|
0b26f23188
|
3rd person animations idle bug fixed
|
2016-03-12 15:47:19 +01:00 |
|
|
Tleety
|
8c2a665ccb
|
Some Entities for endscreen and some basic logic in the EndScreenSystem
|
2016-03-12 15:45:07 +01:00 |
|
 stiffly
|
cc10e5500b
|
2x jump now only plays for local player
|
2016-03-12 15:31:44 +01:00 |
|
 Jace
|
068e151741
|
Merge pull request #173 from teamfisk/ExplosionEffectV2
Explosion effect v2
|
2016-03-12 15:25:12 +01:00 |
|
|
Jace
|
e7a3793486
|
Merge pull request #207 from teamfisk/SomeTests
Resolution should now use a dropdown
|
2016-03-12 15:23:29 +01:00 |
|
|
stiffly
|
9bac141a6b
|
WIP fixing pull request
|
2016-03-12 15:14:36 +01:00 |
|
|
Tleety
|
4334ea067e
|
System skeleton
|
2016-03-12 14:44:03 +01:00 |
|
|
Tleety
|
8e266984f4
|
Player HUD should now be ok, color of health still shit tho
|
2016-03-12 14:37:26 +01:00 |
|
|
Jocke
|
0c1a2d3160
|
WIP
|
2016-03-12 14:31:15 +01:00 |
|
|
Jace
|
eb5fcd6d19
|
Rendering back to normal
|
2016-03-12 14:28:17 +01:00 |
|
|
stiffly
|
9942747d41
|
WIP pull request fixes
|
2016-03-12 14:26:09 +01:00 |
|
|
Jace
|
24bb05ec67
|
Editor should now set dirty flag when component field changes
|
2016-03-12 05:17:56 +01:00 |
|
|
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 |
|
|
viktorljung
|
060585a388
|
Aim fixed for all weapons
|
2016-03-12 02:39:06 +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 |
|
|
viktorljung
|
2a209c5d8e
|
AmmoSharing beta
|
2016-03-11 23:58:26 +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 |
|
|
viktorljung
|
e0a6b09d36
|
Defender early alpha
|
2016-03-11 19:16:34 +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 |
|
|
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 |
|
|
FakeShemp
|
4df936ca70
|
imon's fix to rule them all
might have solved dt anormalities
|
2016-03-11 14:57:02 +01:00 |
|
 William Moberg
|
f036817c0c
|
Merge pull request #203 from teamfisk/SplitSnapshots
Split snapshots
|
2016-03-11 14:35:18 +01:00 |
|