This website requires JavaScript.
2961f198b3
PlayerDeathSystem is now working well. Changed so the model is oriented correctly. Changed so camera is behind the player. Copied the current animation and froze it.
2016-02-03 11:48:22 +01:00
455e59a04f
Made the TEMPORARY capture point boxes transparent.
2016-02-03 11:39:18 +01:00
39653a1e4c
Merge remote-tracking branch 'origin/master' into 3rdPersonDeathCam
2016-02-03 10:38:21 +01:00
2cbeef4c69
Merge pull request #74 from teamfisk/Warnings-Jocke
Jace
2016-02-03 10:37:10 +01:00
192de80782
Merge pull request #75 from teamfisk/NormalSpecularMapping
Jace
2016-02-03 10:34:22 +01:00
7bf4f5c30e
Merge remote-tracking branch 'origin/master' into TCPConnections
2016-02-03 10:29:36 +01:00
e133791369
WIP Reliable Message
2016-02-03 10:28:15 +01:00
a64d227cab
Assured the volume channels were working. Playing around with drumloop
2016-02-03 10:17:53 +01:00
51a588657e
QA map change
2016-02-03 10:11:53 +01:00
73ab9bb4c6
Merge remote-tracking branch 'origin/master' into AssaultDash
2016-02-03 09:52:54 +01:00
73716c28e2
pickpass fix
2016-02-02 17:40:22 +01:00
a3b7bd7df5
Fix in picking pass, QA map fix. Blue and red ray change. Player weapon change.
2016-02-02 17:39:57 +01:00
c4fb604617
Merge branch 'BoxModelCollision' of github.com:teamfisk/TacticalZ into BoxModelCollision
2016-02-02 17:36:50 +01:00
da49dc35ee
Added stuff to .gitignore file
2016-02-02 17:31:19 +01:00
214dad2afc
Removed commented code.
2016-02-02 17:25:59 +01:00
d99bf60510
Merge branch 'Importer' of https://github.com/teamfisk/TacticalZ into Importer
2016-02-02 17:22:06 +01:00
9cb41fcebe
Fixed the exported animation matrices
2016-02-02 17:21:51 +01:00
affcc5305b
Collision affects velocity correctly, no wierd ice cream sliding along walls.
2016-02-02 17:19:59 +01:00
11025b5466
QA-map stuff
2016-02-02 17:19:58 +01:00
4357759715
Merge branch 'Importer' of https://github.com/teamfisk/TacticalZ into Importer
2016-02-02 17:18:54 +01:00
bb4a65a1db
Non-skined mesh WIP
2016-02-02 17:18:42 +01:00
5e472cd69c
DeathExplosion is now an XML file, changed PlayerDeathSystem accordingly. The effect should show as soon as the explosioneffect-fix is merged into master. TODO: remove the test
2016-02-02 17:18:12 +01:00
eba36b8492
Some QA-map fixes
2016-02-02 17:12:14 +01:00
55854f5c0d
Merge remote-tracking branch 'origin/master' into NormalSpecularMapping
2016-02-02 16:30:57 +01:00
12a181c1ff
Fixed a bug where normals scaled with model scale. Again.
2016-02-02 16:11:03 +01:00
b131f56f5e
Made a quality assurance world that will need to be used before creating a pull request
2016-02-02 16:06:42 +01:00
24aac6a00d
Merge pull request #62 from teamfisk/DoubleJump
Jace
2016-02-02 15:31:03 +01:00
7236da09b4
Merge remote-tracking branch 'origin/master' into 3rdPersonDeathCam
2016-02-02 15:13:00 +01:00
45a92b362f
DoubleJumping now in InputController instead.
2016-02-02 15:10:11 +01:00
89bc063ef0
Merge remote-tracking branch 'origin/Importer' into Animations
2016-02-02 15:01:34 +01:00
88ad127d8d
plays notification on captured/lost point
2016-02-02 14:57:03 +01:00
dba2fbdc0c
WIP
2016-02-02 14:52:31 +01:00
69bb17aa90
Merge branch 'Importer' of https://github.com/teamfisk/TacticalZ into Importer
2016-02-02 14:50:01 +01:00
e8186a7062
Changed the way we're exporting animations.
2016-02-02 14:47:22 +01:00
2085d9ec9e
Merge remote-tracking branch 'origin/master' into DoubleJump
2016-02-02 14:22:00 +01:00
83281fdaf1
Changed model in player.xml
2016-02-02 13:39:11 +01:00
d763789490
Merge remote-tracking branch 'origin/master' into Sound
2016-02-02 13:38:49 +01:00
6a3f585fb9
Fixed warnings associated with Network.cpp, Client.cpp, Server.cpp and Packet.cpp.
2016-02-02 13:26:15 +01:00
cb0feb0b84
Tested hurt event. Randomizes between several different ones.
2016-02-02 13:25:25 +01:00
7b4826cb44
Merge remote-tracking branch 'origin/master' into NormalSpecularMapping
2016-02-02 13:24:31 +01:00
28d412f5c7
Some small changes to test world and assets
2016-02-02 13:24:18 +01:00
0e5f6da9a9
Merge pull request #73 from teamfisk/CapturePointFixBranch
Jace
2016-02-02 13:22:03 +01:00
563fd4082e
Updated movement test for model collisions
Jace
2016-02-02 12:10:39 +01:00
42b52a6766
Several changes/fixes based on the latest broken refactoring.
2016-02-02 11:37:22 +01:00
9c2e459e0c
Deatheffect color now correctly calculated
2016-02-02 10:58:00 +01:00
9573958a86
Fixed Git's shitty merge in Skeleton.cpp and The Exporter now Exports meshes with and without skins
2016-02-02 10:19:00 +01:00
796e3eac79
Merge branch 'master' into BoxModelCollision
2016-02-02 10:16:48 +01:00
8299b99e2f
Test world changes and some other small fixes
2016-02-01 19:08:46 +01:00
c708f1582c
Merge remote-tracking branch 'origin/master' into NormalSpecularMapping
2016-02-01 18:30:30 +01:00
782c1a388a
Comment
2016-02-01 18:23:40 +01:00
a188a3f7fa
Removed widget pointlight since it is now redundant
2016-02-01 18:22:36 +01:00
ed7d00c1d8
Bug where widgets did not get their ambient light now fixed.
2016-02-01 18:19:38 +01:00
210e11e659
Merge branch 'Importer' of https://github.com/teamfisk/TacticalZ into Importer
2016-02-01 18:08:22 +01:00
bbbebe077b
Merge branch 'Importer' of https://github.com/teamfisk/TacticalZ into Importer
2016-02-01 18:06:35 +01:00
30b1dab764
More efficient collision resolution case + comments.
2016-02-01 18:06:28 +01:00
4d19158600
No longer need to key frame joins for exporting. Also don't save animations between exports
2016-02-01 18:04:16 +01:00
9090be8acf
Merge branch 'Warnings-Simon'
Jace
2016-02-01 17:53:55 +01:00
a3d4eb65d5
Fixes #66 warnings
Jace
2016-02-01 17:53:01 +01:00
9b2a4be707
Merge pull request #71 from teamfisk/Warnings-Adam
Jace
2016-02-01 17:52:18 +01:00
5474a18753
#68 Fixed warning in SoundSystem.cpp
2016-02-01 17:15:51 +01:00
4dcf5a8fa0
#68 fixed warning.
2016-02-01 17:05:15 +01:00
4ccda5ee43
WIP
2016-02-01 17:03:41 +01:00
5a45f778e6
Fixed so players don't teleport to (NaN, NaN, NaN) on spawning.
2016-02-01 17:01:58 +01:00
53cae25eb2
WIP on widget fuckery
2016-02-01 16:56:55 +01:00
0a43f8104e
Added _CRT_SECURE_NO_WARNINGS definition compiling with MSVC
Jace
2016-02-01 16:31:01 +01:00
30ad238697
Merge branch 'master' into BoxModelCollision
2016-02-01 16:17:10 +01:00
3cfbbbbf54
CollisionSystem now utilizes Octree for collision detection.
2016-02-01 16:13:48 +01:00
ca8b7cbee8
Merge pull request #65 from teamfisk/EditorUsefulness
2016-02-01 16:13:37 +01:00
be3cfef65f
Merge remote-tracking branch 'origin/master' into EditorUsefulness
Jace
2016-02-01 15:49:23 +01:00
65f5bc673f
Functional translation widget in global and local space
Jace
2016-02-01 15:47:56 +01:00
c5462b0363
Merge remote-tracking branch 'origin/master' into Sound
2016-02-01 14:35:47 +01:00
25b3c02d29
Adding sounds for: jump, walk, shoot
2016-02-01 14:32:01 +01:00
d7b02e79c8
Merge branch 'master' into BoxModelCollision
2016-02-01 13:48:05 +01:00
a22bc00d46
*cough*
Jace
2016-02-01 12:01:24 +01:00
76274c326e
Fixed going through flat large triangles. Velocity affected by collision.
2016-02-01 13:34:39 +01:00
5bfcffc142
Fixed widget movement calculations going weird when world origin wasn't on screen
Jace
2016-02-01 11:56:21 +01:00
7054822be2
SceneLight component now working
2016-02-01 11:12:03 +01:00
ee92200300
Improved editor pause logic. Editor now pauses when it's enabled and makes sure UI is up to date with the current state.
Jace
2016-02-01 10:30:34 +01:00
6ba87d2942
Fixed, Crash when trying to animate a model that doesn't contain animations
2016-02-01 10:42:23 +01:00
d3b1053f21
Fixes #59
Jace
2016-02-01 10:29:59 +01:00
51075aefc8
Model that has animations is now visible when it does not play an animation (T-pose)
2016-02-01 10:24:50 +01:00
7987d4b27c
Added AssaultDash and all its logic, including a doubletapkey. Doubletapkey could be made more generic.
2016-01-29 12:06:14 +01:00
0c97ce7a4a
You can now DoubleJump!
2016-01-29 10:12:49 +01:00
df05f1909b
Completed the code to trigger the 3rd person camera on death. Cleaned up PlayerDeathSystem. Fixed HealthSystemTest. Removed the test for PlayerDeathSystem
2016-01-28 11:43:38 +01:00
2efbedd4b4
Merge branch 'master' of https://github.com/teamfisk/TacticalZ into Importer
2016-01-27 18:46:03 +01:00
8834d5f7a0
Fixed Animation Export
2016-01-27 18:37:56 +01:00
13f020ddf5
Fixed #49 being able to parent an entity to itself, which resulted in infinite infinite loops everywhere! D:
Jace
2016-01-27 18:06:33 +01:00
ac0c6ff952
WIP started on reliable messages
2016-01-27 18:22:28 +01:00
8bcafc1151
WIP
2016-01-27 18:07:05 +01:00
7497ff39d2
Simon added Copy method to ComponentWrapper. Its being used in PlayerDeathSystem to copy model,animation,transform. TODO: 3rd person camera, cleanup, tests
2016-01-27 18:00:31 +01:00
65da634c71
File dropping into resource paths in the editor
Jace
2016-01-27 17:45:25 +01:00
c9b982bc89
Added BoneAttachment to Entity.xsd
2016-01-27 17:31:57 +01:00
2ec5023752
Changed Animation and BoneAttachment "Name" field to "AnimationName" and "BoneName"
2016-01-27 17:27:34 +01:00
97cbc55223
Some debug features for color corrections and glow strength fix.
2016-01-27 17:21:00 +01:00
405002777c
Merge remote-tracking branch 'origin/EditorUsefulness' into Animations
2016-01-27 17:16:49 +01:00
8fc8d56ee1
Added BoneAttachment component
2016-01-27 17:14:16 +01:00
c519ba2536
Component fields in the editor are now sorted in the order they're defined
Jace
2016-01-27 17:12:07 +01:00
4b7613a659
Sorted editor component dropdown and made it always be fully expanded to show as many components as possible
Jace
2016-01-27 17:07:48 +01:00
7408da401b
Merge pull request #56 from teamfisk/NormalSpecularMapping
Jace
2016-01-27 16:44:10 +01:00
a63ecb8133
Some wierd shader faults and merge error fixe
2016-01-27 15:54:36 +01:00
verysecrethero
Tleety
Jace
Jocke
stiffly
William Moberg
Teejoon
antc13
viktorljung