 Tleety
|
949ee76f55
|
Fallow and name fix
|
2016-02-19 13:52:16 +01:00 |
|
|
Tleety
|
cf2bf4e14d
|
Merge remote-tracking branch 'origin/master' into ResolutionChange
|
2016-02-19 13:17:31 +01:00 |
|
 Jace
|
2ac584bafb
|
Merge pull request #113 from teamfisk/Menu-Tobias
Menu tobias
|
2016-02-19 13:16:50 +01:00 |
|
|
Tleety
|
fc5d054cb2
|
Entity is now sent with the click events.
Fixed small things
|
2016-02-19 12:49:07 +01:00 |
|
|
Tleety
|
8c9f4bb84b
|
Resize should now be working correctly.
|
2016-02-19 11:42:52 +01:00 |
|
|
Tleety
|
e15a7b9485
|
You can now change resolution without any apparent bugs.
|
2016-02-18 18:00:26 +01:00 |
|
|
Tleety
|
3e7936ef00
|
You can now change resolution by pressing buttons.
|
2016-02-17 17:44:33 +01:00 |
|
 verysecrethero
|
42b49f9dba
|
Added more timers to Rendering.
|
2016-02-16 17:51:39 +01:00 |
|
|
Tleety
|
8f84a5ddd6
|
Buttons are now clickable
|
2016-02-16 16:28:19 +01:00 |
|
|
Tleety
|
6bc7131290
|
Glow Intencity can now be changed in the model component.
|
2016-02-16 14:57:21 +01:00 |
|
|
Jace
|
ca457d9c00
|
Player names
|
2016-02-12 09:07:59 +01:00 |
|
|
Tleety
|
d357e365cb
|
Merge remote-tracking branch 'origin/TCPConnections' into WeaponSystem
# Conflicts:
# include/Engine/Network/Server.h
# src/Engine/Network/Client.cpp
# src/Engine/Network/Server.cpp
|
2016-02-12 05:21:00 +01:00 |
|
 Jocke
|
7de76376cf
|
Merge remote-tracking branch 'origin/master' into TCPConnections
# Conflicts:
# src/Engine/Network/Client.cpp
# src/Engine/Network/Server.cpp
# src/Engine/Rendering/PickingPass.cpp
# src/Game/Systems/PlayerSpawnSystem.cpp
|
2016-02-12 05:16:30 +01:00 |
|
|
Jace
|
47053285c8
|
Merge remote-tracking branch 'origin/Menu' into WeaponSystem
# Conflicts:
# resources/Schema/Entities/Player.xml
# resources/Schema/Types/Entity.xsd
|
2016-02-12 02:30:38 +01:00 |
|
|
Jace
|
bee0630a26
|
Merge remote-tracking branch 'origin/master' into WeaponSystem
|
2016-02-12 02:27:44 +01:00 |
|
|
Tleety
|
e1196204eb
|
asdfsdaferf
|
2016-02-12 02:20:40 +01:00 |
|
 viktorljung
|
fb5164221f
|
HealthHUD redesigned
|
2016-02-12 01:57:53 +01:00 |
|
|
Jace
|
88c7c57671
|
Merge remote-tracking branch 'origin/master' into WeaponSystem
|
2016-02-12 01:46:45 +01:00 |
|
|
Jace
|
5295133311
|
Hack to sync ammo over network until we have input replaying + Reload effect from all views
|
2016-02-12 01:45:54 +01:00 |
|
|
viktorljung
|
648d864d6e
|
Merge remote-tracking branch 'origin/master' into Animations
|
2016-02-11 23:48:30 +01:00 |
|
|
Jace
|
e473194671
|
Merge branch 'WeaponSystem'
|
2016-02-11 23:46:23 +01:00 |
|
|
Jace
|
b761439c84
|
Added config flag Debug.OutOfBodyExperience that allows you to spawn and view a player from a third person perspective, without the active camera being changed.
|
2016-02-11 23:45:30 +01:00 |
|
|
Jace
|
c4c53944d9
|
Merge pull request #103 from teamfisk/WeaponSystem
Working weapon system
|
2016-02-11 23:16:44 +01:00 |
|
 stiffly
|
70f4002d70
|
Merge remote-tracking branch 'origin/Animations' into TCPConnections
|
2016-02-11 22:15:59 +01:00 |
|
|
stiffly
|
055f6517a1
|
Merge remote-tracking branch 'origin/master' into TCPConnections
|
2016-02-11 21:24:16 +01:00 |
|
|
stiffly
|
afd9e24df6
|
Reverted last commit. Also testing to delay OnPlayerSpawn event for clients. No progress...
|
2016-02-11 21:23:53 +01:00 |
|
 Teejoon
|
f79649cf9a
|
Fixed material file reading bug
|
2016-02-11 19:38:43 +01:00 |
|
|
Teejoon
|
2096779eb6
|
Merge branch 'master' of https://github.com/teamfisk/TacticalZ into Importer
|
2016-02-11 18:48:21 +01:00 |
|
|
Teejoon
|
f088aa1d85
|
Commit the files now....
|
2016-02-11 18:45:48 +01:00 |
|
|
Jace
|
e2a8605101
|
Merge remote-tracking branch 'origin/master' into WeaponSystem
|
2016-02-11 17:25:37 +01:00 |
|
|
Jace
|
e47201ff61
|
First person shoot animations
|
2016-02-11 17:06:34 +01:00 |
|
|
Jocke
|
49d4a45ef8
|
Client crashed when connecting, this was a hot fix.
|
2016-02-11 16:27:33 +01:00 |
|
|
Tleety
|
51e0b852d2
|
Adamfix
|
2016-02-11 15:43:41 +01:00 |
|
|
Tleety
|
6ba1e95da7
|
Fixed depth sorting for HUD elements.
|
2016-02-11 15:27:07 +01:00 |
|
|
Tleety
|
9f657ada4e
|
merge fixes
|
2016-02-11 14:52:52 +01:00 |
|
|
Tleety
|
f0ae365401
|
Merge remote-tracking branch 'origin/master' into Menu
# Conflicts:
# src/Engine/Rendering/Texture.cpp
# src/Game/Game.cpp
|
2016-02-11 14:43:30 +01:00 |
|
|
viktorljung
|
7d4a4ed7cf
|
Merge remote-tracking branch 'origin/master' into Animations
# Conflicts:
# src/Engine/Rendering/Skeleton.cpp
|
2016-02-11 14:38:23 +01:00 |
|
|
viktorljung
|
97de31be65
|
Fixed BoneAttachment component
|
2016-02-11 13:36:27 +01:00 |
|
|
Jace
|
95289f47d6
|
Merge branch 'master' into WeaponSystem
|
2016-02-11 12:58:09 +01:00 |
|
|
Jace
|
ccf4cae74b
|
Merge remote-tracking branch 'origin/Animations'
|
2016-02-11 12:54:42 +01:00 |
|
|
Jace
|
81943516a9
|
Protected inheritance, not even once.
|
2016-02-11 11:36:39 +01:00 |
|
|
viktorljung
|
607150189c
|
Different animations can now be played on multiple meshes, AnimationOffset seems to make the lighting buggy
|
2016-02-11 10:51:11 +01:00 |
|
|
Jace
|
0394eacb6b
|
Merge remote-tracking branch 'origin/Animations' into WeaponSystem
|
2016-02-11 00:18:36 +01:00 |
|
|
Jace
|
9d9c6bdf1e
|
Third person animations and shoot effects base work
|
2016-02-11 00:08:50 +01:00 |
|
|
viktorljung
|
9c08c351b8
|
fixed reverse Animation looping
|
2016-02-10 23:33:23 +01:00 |
|
|
viktorljung
|
dded296cde
|
Animation looping fix
|
2016-02-10 23:19:44 +01:00 |
|
 Viktor Ljung
|
c3cc5ae70b
|
Merge pull request #92 from teamfisk/Importer
Importer
|
2016-02-10 22:51:46 +01:00 |
|
|
Teejoon
|
675a80e905
|
Merge branch 'master' of https://github.com/teamfisk/TacticalZ into Importer
|
2016-02-10 22:18:42 +01:00 |
|
|
Tleety
|
f5de267f25
|
Merge fixes and CapturePointHUD component skeleton added.
|
2016-02-10 20:58:10 +01:00 |
|
|
Jace
|
6396925b68
|
Merge remote-tracking branch 'origin/Animations' into WeaponSystem
|
2016-02-10 20:47:33 +01:00 |
|