 Jace
|
494746ad8b
|
Merge remote-tracking branch 'origin/Recording' into Recording
|
2016-03-14 16:33:53 +01:00 |
|
|
Jace
|
b886d9146b
|
WIP STUFF
|
2016-03-14 08:33:33 +01:00 |
|
|
Jace
|
57715d5846
|
Merge branch 'master' into Recording
|
2016-03-14 06:13:23 +01:00 |
|
 William Moberg
|
fb3842ba5b
|
Indentation.
|
2016-03-14 06:05:11 +01:00 |
|
|
William Moberg
|
6daaccb9ed
|
Merge branch 'Recording' of github.com:teamfisk/TacticalZ into Recording
# Conflicts:
# src/Engine/Editor/EditorSystem.cpp
|
2016-03-14 06:02:47 +01:00 |
|
|
William Moberg
|
0cd161184e
|
Smoother movement for editor camera.
|
2016-03-14 06:00:12 +01:00 |
|
|
Jace
|
87b983ec6f
|
Stuff
|
2016-03-14 05:56:09 +01:00 |
|
 Joachim Pettersson
|
16ef09b20b
|
Merge pull request #222 from teamfisk/DeathAnimation
Death effect re-added
|
2016-03-14 05:48:07 +01:00 |
|
|
Jocke
|
fe87aa8e90
|
Death effect re-added. Hands get weird when explosion is triggered.
|
2016-03-14 04:45:01 +01:00 |
|
|
Jace
|
592f33653e
|
Better shadows for recording
|
2016-03-14 04:44:53 +01:00 |
|
 viktorljung
|
b9b5f4bff7
|
Removed healing effect of defender boost
|
2016-03-14 04:37:43 +01:00 |
|
|
viktorljung
|
5db1bddd08
|
Merge branch 'master' of github.com:teamfisk/TacticalZ
|
2016-03-14 04:31:45 +01:00 |
|
|
viktorljung
|
b366a8c149
|
Red players fixes
|
2016-03-14 04:31:38 +01:00 |
|
 Adam Byléhn
|
483091a1de
|
Merge pull request #137 from teamfisk/Importer
Export and import of collision meshes
|
2016-03-14 04:26:50 +01:00 |
|
 Tleety
|
0e9be1d650
|
Merge branch 'master' of github.com:teamfisk/TacticalZ
|
2016-03-14 04:25:34 +01:00 |
|
|
Tleety
|
5679a88ddb
|
Quit working
|
2016-03-14 04:25:20 +01:00 |
|
|
Jace
|
289bde0395
|
Merge branch 'master' of github.com:teamfisk/TacticalZ
|
2016-03-14 04:25:19 +01:00 |
|
|
Jace
|
a3fef7bcd1
|
Better CP_Valhalla lighting
|
2016-03-14 04:25:07 +01:00 |
|
|
Jace
|
c74a4e375e
|
Better CP_Valhalla lighting
|
2016-03-14 04:24:40 +01:00 |
|
|
viktorljung
|
04fbd0d517
|
Merge branch 'master' of github.com:teamfisk/TacticalZ
|
2016-03-14 04:12:02 +01:00 |
|
|
viktorljung
|
9308e60932
|
Red players
|
2016-03-14 04:11:46 +01:00 |
|
|
Jace
|
78a383b03c
|
Merge branch 'master' into Recording
|
2016-03-14 04:04:20 +01:00 |
|
|
Jace
|
24de85b476
|
Editor no longer resets camera
|
2016-03-14 04:02:05 +01:00 |
|
|
Jace
|
fc97c4e8ea
|
Merge branch 'master' of github.com:teamfisk/TacticalZ
|
2016-03-14 04:01:40 +01:00 |
|
|
Jace
|
e3767996a1
|
Added DEBUG flags to all debug imgui stuff
|
2016-03-14 04:01:04 +01:00 |
|
|
William Moberg
|
809d164eba
|
Merge pull request #221 from teamfisk/PerfectSoundForRelease
Perfect sound for release
|
2016-03-14 03:54:35 +01:00 |
|
|
Tobias Dahl
|
5879cb0de4
|
Merge pull request #219 from teamfisk/FixAssaultWeaponReload
Reload for assault is only done once now.
|
2016-03-14 03:48:59 +01:00 |
|
|
Tobias Dahl
|
832a901bf6
|
Merge pull request #220 from teamfisk/Movement
Movement
|
2016-03-14 03:48:47 +01:00 |
|
|
William Moberg
|
407149fbb0
|
Merge branch 'master' into Importer
|
2016-03-14 03:23:08 +01:00 |
|
|
William Moberg
|
4c52f55bf0
|
Any collision meshes we have should be working, and RawModels should be released after being loaded.
|
2016-03-14 03:20:36 +01:00 |
|
|
viktorljung
|
8449818cb7
|
Merge branch 'Movement'
|
2016-03-14 03:13:48 +01:00 |
|
 maqu14
|
94a10c3a8f
|
New polished map
|
2016-03-14 03:07:58 +01:00 |
|
|
Jace
|
cbb2eee003
|
Merge branch 'master' of github.com:teamfisk/TacticalZ
|
2016-03-14 02:53:18 +01:00 |
|
|
Jace
|
f6d85c86c4
|
Added new team pick
|
2016-03-14 02:53:02 +01:00 |
|
|
maqu14
|
8a24a16232
|
Merge branch 'master' of github.com:teamfisk/TacticalZ
# Conflicts:
# resources/DefaultConfig.ini
# resources/Schema/Entities/CP_Rocky2.xml
|
2016-03-14 02:51:09 +01:00 |
|
|
maqu14
|
d850e116fb
|
New map, Some new assets
|
2016-03-14 02:50:24 +01:00 |
|
 Teejoon
|
a4c35e5908
|
Lower Glow intensity on players
|
2016-03-14 02:38:26 +01:00 |
|
|
Teejoon
|
ff881e1f78
|
Merge branch 'master' of https://github.com/teamfisk/TacticalZ
|
2016-03-14 02:16:07 +01:00 |
|
|
Teejoon
|
eb2e79e4cb
|
Players now got lights on them
|
2016-03-14 02:15:56 +01:00 |
|
|
William Moberg
|
f632b45c9b
|
Merge branch 'MemoryOptimization' into Importer
# Conflicts:
# include/Engine/Rendering/Model.h
# src/Engine/Collision/Collision.cpp
# src/Engine/Collision/CollisionSystem.cpp
# src/Engine/Collision/TriggerSystem.cpp
# src/Game/Systems/SpawnerSystem.cpp
|
2016-03-14 02:06:53 +01:00 |
|
|
Tleety
|
788d80f721
|
Merge branch 'master' of github.com:teamfisk/TacticalZ
|
2016-03-14 01:59:41 +01:00 |
|
|
Tleety
|
0b485163c9
|
Changes to menu
|
2016-03-14 01:59:33 +01:00 |
|
|
Jace
|
e527badab4
|
Executable name updated to "Axyz"
|
2016-03-14 01:53:20 +01:00 |
|
|
stiffly
|
8cef422ea7
|
Merge remote-tracking branch 'origin/master' into PerfectSoundForRelease
# Conflicts:
# resources/Schema/Entities/CP_Rocky2.xml
|
2016-03-14 01:51:51 +01:00 |
|
|
stiffly
|
54a03ddc0f
|
Hurt sound only played for local player.
|
2016-03-14 01:49:37 +01:00 |
|
|
viktorljung
|
a65d8c86d1
|
3rd person reload effect
|
2016-03-14 01:48:48 +01:00 |
|
|
Jace
|
d492b54687
|
Added executable icon to CMakeLists
|
2016-03-14 01:42:14 +01:00 |
|
|
stiffly
|
c1395355c6
|
Removed comment
|
2016-03-14 01:36:11 +01:00 |
|
|
Jace
|
f62f8d53db
|
Merge branch 'Setup'
|
2016-03-14 01:30:49 +01:00 |
|
|
Jace
|
51c7e92fce
|
Fixed redist install
|
2016-03-14 01:29:11 +01:00 |
|