 viktorljung
|
de125663fd
|
Merge remote-tracking branch 'origin/master' into Movement
# Conflicts:
# assets
# resources/Schema/Entities/Player.xml
# resources/Schema/Entities/PlayerAssaultFallbackBlue.xml
# resources/Schema/Entities/PlayerAssaultFallbackRed.xml
# resources/Schema/Entities/PlayerAssaultRed.xml
# resources/Schema/Entities/aaaatestremoveme.xml
# resources/Schema/Entities/aim_rays.xml
# src/Engine/Rendering/BoneAttachmentSystem.cpp
|
2016-03-09 15:54:00 +01:00 |
|
 Jace
|
34e551663f
|
Merge remote-tracking branch 'origin/master' into Weapons
# Conflicts:
# assets
# resources/Schema/Entities/Player.xml
# resources/Schema/Entities/PlayerAssaultFallbackBlue.xml
# resources/Schema/Entities/PlayerAssaultFallbackRed.xml
# resources/Schema/Entities/PlayerAssaultRed.xml
# resources/Schema/Entities/aaaatestremoveme.xml
# resources/Schema/Entities/aim_rays.xml
|
2016-03-09 15:52:13 +01:00 |
|
 stiffly
|
fa0b52caec
|
When you disconnect you will delete the world and return to the menu.
|
2016-03-09 15:49:42 +01:00 |
|
|
stiffly
|
1211888ce1
|
The world is deleted upon connection to a server.
|
2016-03-09 15:10:32 +01:00 |
|
|
stiffly
|
877defdfee
|
Merge remote-tracking branch 'origin/master' into FriendlyHost/Join
|
2016-03-09 14:47:24 +01:00 |
|
|
stiffly
|
09171a1a18
|
WIP connect from menu
|
2016-03-09 14:33:20 +01:00 |
|
|
viktorljung
|
ddde50b690
|
Inverse seems to be the same as -w
|
2016-03-09 14:27:50 +01:00 |
|
|
viktorljung
|
555b19c41d
|
BoneAttachments now working perfectly
|
2016-03-09 13:49:28 +01:00 |
|
|
stiffly
|
67ccb5bee5
|
Merge remote-tracking branch 'origin/master' into FriendlyHost/Join
|
2016-03-09 13:23:31 +01:00 |
|
 FakeShemp
|
ba6d2b758d
|
Add killstreak icon
|
2016-03-09 12:34:09 +01:00 |
|
|
FakeShemp
|
12dd1d21de
|
Text now handles color, alpha and icon parsing
|
2016-03-09 12:11:26 +01:00 |
|
 Tleety
|
704242597a
|
Merge remote-tracking branch 'origin/master' into Menu
# Conflicts:
# resources/Schema/Components.xsd
# resources/Schema/Entities/NewMapWSpectatorCam.xml
# resources/Schema/Types/Entity.xsd
# src/Game/Game.cpp
|
2016-03-09 11:49:42 +01:00 |
|
|
Tobias Dahl
|
697da620d3
|
Merge pull request #179 from teamfisk/TeamPickCamera
Spectator camera system
|
2016-03-09 11:41:05 +01:00 |
|
|
stiffly
|
c1f38a71ba
|
Merge remote-tracking branch 'origin/master' into FriendlyHost/Join
|
2016-03-09 10:12:57 +01:00 |
|
|
stiffly
|
d7c30450dc
|
Should now read servername from config.
|
2016-03-09 10:08:23 +01:00 |
|
 verysecrethero
|
7ee4ea637b
|
Merge remote-tracking branch 'origin/master' into TeamPickCamera
|
2016-03-08 17:30:22 +01:00 |
|
|
Tleety
|
280de0e984
|
Merge remote-tracking branch 'origin/FriendlyHost/Join' into Menu
# Conflicts:
# include/Game/Systems/MainMenuSystem.h
# src/Engine/GUI/MainMenuSystem.cpp
|
2016-03-08 17:03:50 +01:00 |
|
|
stiffly
|
17e2ebeaa7
|
Merge remote-tracking branch 'origin/master' into FriendlyHost/Join
# Conflicts:
# include/Engine/Network/Client.h
|
2016-03-08 16:59:24 +01:00 |
|
 Teejoon
|
d51bea798a
|
Merge remote-tracking branch 'origin/Render_Optimization' into RendererBugFixes
|
2016-03-08 16:20:23 +01:00 |
|
|
Teejoon
|
155d700a44
|
WIP
|
2016-03-08 16:19:56 +01:00 |
|
|
Tleety
|
f8ab52c72c
|
WIP
|
2016-03-08 16:15:54 +01:00 |
|
 Jocke
|
3828616b60
|
Made it easier to maintain changes in packet header, prepared for reliable UDP packets.
|
2016-03-08 14:44:35 +01:00 |
|
|
viktorljung
|
f934f972e8
|
Merge remote-tracking branch 'origin/Weapons' into Movement
# Conflicts:
# resources/Schema/Entities/PlayerDefenderBlue.xml
|
2016-03-08 14:34:21 +01:00 |
|
|
viktorljung
|
8d1877321a
|
Fixed BoneAttachment offset rotation
|
2016-03-08 14:32:50 +01:00 |
|
|
Tleety
|
a0ca4df3be
|
Some server list components and entities.
|
2016-03-08 13:29:21 +01:00 |
|
|
viktorljung
|
f77a610519
|
Dash now looking good
|
2016-03-08 13:26:01 +01:00 |
|
|
Jocke
|
9cbc582be2
|
Kinda works like before
|
2016-03-08 11:29:47 +01:00 |
|
|
viktorljung
|
2ba245368b
|
Improved movement animaitons
Added a SetBlendWeight event that sets the weight for all nodes with a name.
|
2016-03-08 11:21:40 +01:00 |
|
|
Tleety
|
01f29b6d4e
|
Blur behind buttons/sprites should now be working as intended.
|
2016-03-08 11:14:09 +01:00 |
|
|
stiffly
|
ec3ed1f46f
|
Merge remote-tracking branch 'origin/master' into Kill-streak-sounds
# Conflicts:
# include/Game/Systems/Weapon/DefenderWeaponBehaviour.h
|
2016-03-08 10:39:52 +01:00 |
|
|
Tleety
|
6b7f598c4d
|
WIP
|
2016-03-07 23:35:58 +01:00 |
|
|
Tleety
|
5c0d9070c7
|
WIP
|
2016-03-07 23:25:06 +01:00 |
|
|
Jace
|
7b0f887332
|
fixup! fixup! Disabled InputCommand processing while you fiddle with editor UI elements
|
2016-03-07 19:59:57 +01:00 |
|
|
FakeShemp
|
e494f6a495
|
Merge branch 'master' into Shadows
|
2016-03-07 19:46:04 +01:00 |
|
|
FakeShemp
|
2049d630e9
|
Revert "Revert "Shadows""
This reverts commit 73b8bff1f3.
|
2016-03-07 19:45:46 +01:00 |
|
|
Jace
|
8bcb15a128
|
Disabled InputCommand processing while you fiddle with editor UI elements
|
2016-03-07 17:53:32 +01:00 |
|
|
Teejoon
|
fd994ca93d
|
Deleting texture thats getting rended too.
|
2016-03-07 17:52:47 +01:00 |
|
 William Moberg
|
1516ed8e2d
|
Removed debug logging. PlayerID in InputCommands from buttons is corrected.
|
2016-03-07 17:35:01 +01:00 |
|
|
stiffly
|
9e8df340b3
|
Merge remote-tracking branch 'origin/master' into NetworkComponent
# Conflicts:
# src/Engine/Network/Server.cpp
|
2016-03-07 17:21:24 +01:00 |
|
|
stiffly
|
f00fb836fb
|
Oops.
|
2016-03-07 17:10:13 +01:00 |
|
|
stiffly
|
13c3bcb290
|
Now only entities with NetworkComponent will be send in Snapshots.
|
2016-03-07 16:52:51 +01:00 |
|
|
Jocke
|
68a88ed756
|
We are now using udp again
|
2016-03-07 16:07:54 +01:00 |
|
|
FakeShemp
|
ee99821164
|
Add reverse and scalar for ColorByDistance
|
2016-03-07 15:45:06 +01:00 |
|
|
verysecrethero
|
3eaad275ba
|
New CapturePointAddition fixed to work on Network by Joachim
|
2016-03-07 14:50:31 +01:00 |
|
|
stiffly
|
9cc8124847
|
Renamed IsAnyParentMissingTransform -> isAnyParentMissingTransform (member function).
|
2016-03-07 14:34:45 +01:00 |
|
|
Jocke
|
078d6eb712
|
Added sequnceNumber and totalNumberOfPackets to packet for packet splitting.
|
2016-03-07 14:22:09 +01:00 |
|
|
stiffly
|
a369c26a28
|
Blend tree nodes can now exist without transform components, without the game crashing.
|
2016-03-07 14:19:22 +01:00 |
|
|
Teejoon
|
b38ebbe676
|
Shadows now working on NVIDIA cards too
|
2016-03-07 14:00:08 +01:00 |
|
|
FakeShemp
|
243276707a
|
Merge remote-tracking branch 'origin/master' into ExplosionEffectV2
|
2016-03-07 13:52:29 +01:00 |
|
|
Jace
|
b7a7f7fd5e
|
????
|
2016-03-04 15:02:01 +01:00 |
|