 Jocke
|
3209e36176
|
We can now send more data with UDP than previously, the splitting seems to work fine but receiving has some problems.
|
2016-03-09 18:26:33 +01:00 |
|
 William Moberg
|
8a3564ad49
|
Merge remote-tracking branch 'origin/master' into BoxModelCollision
|
2016-03-09 18:03:39 +01:00 |
|
|
William Moberg
|
9581e9ac84
|
Don't set the player to previous position when uncrouching.
|
2016-03-09 17:51:26 +01:00 |
|
 Teejoon
|
974d9101bd
|
Merge remote-tracking branch 'origin/master' into RendererBugFixes
Conflicts:
assets
|
2016-03-09 17:50:42 +01:00 |
|
 stiffly
|
99ccca6273
|
Merge remote-tracking branch 'origin/master' into FriendlyHost/Join
|
2016-03-09 17:38:37 +01:00 |
|
 Tleety
|
7e7d98eaae
|
Merge remote-tracking branch 'origin/master' into Menu
|
2016-03-09 17:24:41 +01:00 |
|
|
Tleety
|
1104166039
|
TextureSprite Resource that use GL_NEAREST for sampling aswell as some StartMenu changes
|
2016-03-09 17:24:21 +01:00 |
|
|
Teejoon
|
fad93ca5aa
|
Merge remote-tracking branch 'origin/master' into RendererBugFixes
Conflicts:
include/Engine/Rendering/DrawFinalPass.h
|
2016-03-09 16:54:26 +01:00 |
|
|
Teejoon
|
91cad561a4
|
Some more optimization and fixed sorting of render job objects in RenderSystem
|
2016-03-09 16:51:24 +01:00 |
|
 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
|
09171a1a18
|
WIP connect from menu
|
2016-03-09 14:33:20 +01:00 |
|
|
stiffly
|
67ccb5bee5
|
Merge remote-tracking branch 'origin/master' into FriendlyHost/Join
|
2016-03-09 13:23:31 +01:00 |
|
 FakeShemp
|
12dd1d21de
|
Text now handles color, alpha and icon parsing
|
2016-03-09 12:11:26 +01:00 |
|
|
stiffly
|
d7c30450dc
|
Should now read servername from config.
|
2016-03-09 10:08:23 +01:00 |
|
|
Tleety
|
95f68cc888
|
ConnectRequest event and some other shit
|
2016-03-08 22:24:32 +01:00 |
|
|
Jace
|
b7d93058b1
|
Added base work for dity bits in components
|
2016-03-08 21:11:59 +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 |
|
|
Tleety
|
1d8b5abfde
|
Fuck aff
|
2016-03-08 16:53:35 +01:00 |
|
|
Teejoon
|
d51bea798a
|
Merge remote-tracking branch 'origin/Render_Optimization' into RendererBugFixes
|
2016-03-08 16:20:23 +01:00 |
|
|
Tleety
|
f8ab52c72c
|
WIP
|
2016-03-08 16:15:54 +01:00 |
|
|
Jace
|
5d53fc74cb
|
Merge branch 'Dirtybit' of github.com:teamfisk/TacticalZ into Dirtybit
|
2016-03-08 15:46:21 +01:00 |
|
|
Jace
|
ecc8d998cf
|
Added ComponentInfo::Field_t::Index
|
2016-03-08 15:46:14 +01:00 |
|
|
William Moberg
|
e3c0fb2178
|
Added SetDirty function.
|
2016-03-08 15:44:02 +01:00 |
|
|
William Moberg
|
090bd806ce
|
Added DirtyBit enum to Dirty getter in ComponentWrapper.
|
2016-03-08 15:39:16 +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
|
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 |
|
|
Teejoon
|
e902110d4b
|
Commiting the files since they didn't get commited
|
2016-03-08 11:16:56 +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 |
|
|
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
|
f923872e51
|
fixup! Disabled InputCommand processing while you fiddle with editor UI elements
|
2016-03-07 17:54:01 +01:00 |
|
|
Teejoon
|
fd994ca93d
|
Deleting texture thats getting rended too.
|
2016-03-07 17:52:47 +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 |
|
|
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 |
|
|
Jace
|
e58b5ffd6f
|
Merge remote-tracking branch 'origin/Movement' into Weapons
# Conflicts:
# resources/Schema/Entities/Player.xml
# src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp
|
2016-03-04 09:43:34 +01:00 |
|