Ryan Huffman
3160aa3068
Change 0LL to INT64_C(0)
2016-01-26 09:36:52 -08:00
Ryan Huffman
5268ef8ac2
Fix else indentation
2016-01-26 09:36:40 -08:00
Ryan Huffman
0e1742588b
Fix indentation
2016-01-26 09:35:35 -08:00
Ryan Huffman
641a6e9c30
Fix injector handling for when it falls behind
2016-01-26 09:29:02 -08:00
David Rowe
956e70e415
Make entity properties return undefined value after entity is deleted
2016-01-26 22:07:05 +13:00
Anthony J. Thibault
bc9621baab
CharacterController: Improve ground support detection
...
In addition to the existing line probe ground check, also check if the bottom sphere of the capsule is contact with any geometry before going into hover mode.
This should prevent going into the fly animation when standing or walking on collision shapes with small gaps between elements.
2016-01-25 21:54:35 -08:00
Anthony J. Thibault
3b062b7a31
AnimClip: special case the translation on the eyes
2016-01-25 18:52:14 -08:00
Anthony J. Thibault
3cee3cbb5a
Avatar Developer Menu: added animation debug options
...
This options are for for developers only and might help debug animation related issues.
* Enable Inverse Kinematics: this can be toggled to disable IK for the avatar.
* Enable Anim Pre and Post Rotations: this option can be used to use FBX pre-rotations from source avatar animations, instead of the current default, which is to use them from the source model.
This only effects FBX files loaded by the animation system, it does not affect changing model orientations via JavaScript.
2016-01-25 18:52:13 -08:00
Anthony J. Thibault
1bdeeeceeb
AnimSkeleton: Added getPre and Post rotation accessors
2016-01-25 18:52:12 -08:00
Brad Hefta-Gaub
1ef01d670d
Revert "Make entity properties be undefined after entity is unloaded"
2016-01-25 18:07:14 -08:00
Zach Pomerantz
15ff106947
Merge pull request #6917 from AndrewMeadows/cf-empty-model-url
...
fix crash for empty modelUrl in ModelEntityItem
2016-01-25 16:09:00 -08:00
Zach Pomerantz
59ac93485e
Propogate configuration changes through tasks
2016-01-25 15:18:13 -08:00
Zach Pomerantz
e73902899b
Explicitly emit dirty for AO/Debug
2016-01-25 15:18:12 -08:00
Zach Pomerantz
46c937325e
Make Job MEMBER enabled explicit
2016-01-25 15:18:11 -08:00
Zach Pomerantz
14d907206e
Clean out job enable logic from Job
2016-01-25 15:17:44 -08:00
Zach Pomerantz
bed325d675
Add Graphics to general settings
2016-01-25 15:17:43 -08:00
Zach Pomerantz
b42ab2179e
Call QConfig QConfigPointer
2016-01-25 15:17:39 -08:00
James B. Pollack
4cff1ab9df
Merge pull request #6919 from ctrlaltdavid/20790
...
Make entity properties be undefined after entity is unloaded
2016-01-25 15:12:10 -08:00
Zach Pomerantz
e4af8d89f1
Only refresh engine settings on own thread
2016-01-25 12:14:58 -08:00
Zach Pomerantz
56cc4dc223
Add Job::Config to RenderShadowTask
2016-01-25 12:14:58 -08:00
Zach Pomerantz
f3265db298
Gut RenderContext
2016-01-25 12:14:58 -08:00
Zach Pomerantz
e8b8f4d535
Add Job::Config to HitEffect
2016-01-25 12:14:58 -08:00
Zach Pomerantz
772aedde91
Add Job::Config to AmbientOcclusion
2016-01-25 12:14:58 -08:00
Zach Pomerantz
ba61c1f865
Fix draw calls to use members
2016-01-25 12:14:58 -08:00
Zach Pomerantz
ccbec54f2d
Add Job::Config to DebugDeferredBuffer
2016-01-25 12:14:58 -08:00
Zach Pomerantz
f5a408d82a
Notes for later
2016-01-25 12:14:58 -08:00
Zach Pomerantz
f1b7807db7
Add Job::Config to Draw
2016-01-25 12:14:58 -08:00
Zach Pomerantz
9064438bf0
Replace RenderScriptingInterface with dynamic Task::Config
2016-01-25 12:13:55 -08:00
Zach Pomerantz
adc9d2ea07
Add Job::Config to FetchItems
2016-01-25 12:13:55 -08:00
Zach Pomerantz
c903fc4739
Pass JobConfig to jobs
2016-01-25 12:13:55 -08:00
Zach Pomerantz
5698be5435
It works
2016-01-25 12:13:55 -08:00
Zach Pomerantz
75cddec647
Add alwaysEnabled render::Job::Config
2016-01-25 12:13:55 -08:00
Zach Pomerantz
b70108bb9a
Working demo
2016-01-25 12:13:55 -08:00
Zach Pomerantz
0188a9384a
Add enabled to Job::Config
2016-01-25 12:13:55 -08:00
Zach Pomerantz
fa2782e113
Add Task implementation
2016-01-25 12:13:55 -08:00
Zach Pomerantz
2e1fbf66ad
Refine Configuration for render::Job
...
wip
wip
wip
wip
2016-01-25 12:13:55 -08:00
Zach Pomerantz
581003ec83
Use QObject-derived Configuration for render::Job
2016-01-25 12:13:55 -08:00
Zach Pomerantz
8b68d5922c
Make Engine a Task
2016-01-25 12:13:55 -08:00
Zach Pomerantz
3dab1571a5
Make Task a Job
2016-01-25 12:13:55 -08:00
David Rowe
8a8e14f54a
Rework initializers
2016-01-25 11:22:31 +13:00
Brad Davis
bbefafcb07
Break up preferences dialogs
2016-01-23 23:11:41 -08:00
Brad Hefta-Gaub
e3f861b20a
Merge pull request #6918 from jherico/running-scripts-filter
...
Several Small QML fixes
2016-01-23 22:36:36 -08:00
Brad Hefta-Gaub
7258bd9e3f
Merge pull request #6915 from samcake/hdr
...
Fixing the Anitialising breaking the transparent rendering
2016-01-23 22:30:04 -08:00
Brad Davis
a843331626
Still trying to kill OSX warning
2016-01-23 22:07:00 -08:00
David Rowe
840bf7cfb4
Fix OSX and Linux build warning
...
And a typo noticed in passing.
2016-01-24 10:53:40 +13:00
David Rowe
d020114e59
Make entity properties return undefined value after entity is deleted
2016-01-24 08:39:49 +13:00
Andrew Meadows
d25f54485c
fix crash for emtpy modelUrl in ModelEntityItem
2016-01-22 22:01:30 -08:00
Brad Davis
208d7c3cfc
Killing the old preferences dialog
2016-01-22 19:24:38 -08:00
Brad Davis
71ae36f5c0
Button prefs and conditionally enabled prefs
2016-01-22 19:06:30 -08:00
samcake
483d20d7a3
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-01-22 18:31:30 -08:00
samcake
9f87089c05
Fixing the Anitialising breaking the transparent rendering
2016-01-22 18:25:26 -08:00
Brad Davis
858bbbf987
Adding OffscreenUI API for QInputDialog functionality
2016-01-22 17:31:03 -08:00
Brad Davis
27fdb523cb
Add directory & avatar browsing preferences
2016-01-22 17:30:10 -08:00
Brad Davis
c7186590ea
Support for directory browsing
2016-01-22 17:30:09 -08:00
Brad Davis
2026821d9e
Moving preferences to dependency mananger
2016-01-22 17:30:08 -08:00
Brad Davis
205ab05506
First pass on preferences dialog
...
Conflicts:
tests/ui/qmlscratch.pro
2016-01-22 17:30:07 -08:00
Brad Hefta-Gaub
0c64d45c18
Merge pull request #6909 from hyperlogic/tony/fly
...
MyAvatar: fly animation
2016-01-22 17:04:53 -08:00
samcake
338342cdec
Merge pull request #6859 from zzmp/flag/shadows
...
Add shadows behind a render-menu flag
2016-01-22 16:28:17 -08:00
Brad Hefta-Gaub
74c37104f6
Merge pull request #6905 from jherico/focus_fix
...
Fix initial keyboard focus problems
2016-01-22 15:19:57 -08:00
Andrew Meadows
86162094c1
Merge pull request #6895 from hyperlogic/tony/hmd-recenter-on-rotation
...
MyAvatar: Recenter when the head turns away from the hips
2016-01-22 14:07:40 -08:00
Andrew Meadows
200676ac68
Merge pull request #6896 from AndrewMeadows/another-crash-fix
...
fix crash when deleting entities quickly
2016-01-22 14:04:46 -08:00
Anthony J. Thibault
7af20e90c8
Hooked up fly animation to json and Rig
2016-01-22 13:47:09 -08:00
Brad Davis
89b8eb2efa
Fix initial keyboard focus problems
2016-01-22 13:41:06 -08:00
Anthony J. Thibault
8bfa80d5fc
Merge remote-tracking branch 'upstream/master' into tony/hmd-recenter-on-rotation
2016-01-22 13:37:43 -08:00
Brad Hefta-Gaub
9ec2cf1ab9
Merge pull request #6902 from sethalves/no-nan
...
check values in location updates for NaN before using them
2016-01-22 13:34:15 -08:00
Anthony J. Thibault
61b760038a
Address feedback from code review
2016-01-22 11:54:28 -08:00
Seth Alves
2633cb1f27
rename NaN functions for vec3 and quat
2016-01-22 11:54:24 -08:00
samcake
f98f8d5bbb
Revert "Adds a fix for a rendering issue where models with a texture driving both color and opacity would be rendered fully opaque"
2016-01-22 11:51:02 -08:00
Seth Alves
b6af8ee0cc
Merge branch 'master' of github.com:highfidelity/hifi into avatar-updates-query-cube
2016-01-22 11:46:17 -08:00
Seth Alves
7a3401a8d7
Merge pull request #6867 from AndrewMeadows/collision-group-prep
...
cleanup in preparation for smarter collision grouping
2016-01-22 11:45:42 -08:00
Seth Alves
673182c091
formatting
2016-01-22 11:22:02 -08:00
Seth Alves
a9cf836cb0
added isVec3NaN and isQuatNaN functions
2016-01-22 11:13:55 -08:00
Seth Alves
6294939095
missed one
2016-01-22 10:37:11 -08:00
Seth Alves
6b15beb88a
use isNaN rather than a self-comparison
2016-01-22 10:36:21 -08:00
Zach Pomerantz
b62fc50557
Merge branch 'master' of github.com:highfidelity/hifi into flag/shadows
2016-01-22 10:32:54 -08:00
Andrew Meadows
d8fb61e820
fix crash when deleting entities quickly
2016-01-22 10:25:10 -08:00
Zach Pomerantz
dee8e0ba9d
Merge branch 'master' of github.com:highfidelity/hifi into flag/shadows
2016-01-22 10:03:06 -08:00
samcake
24d1f113f8
Fixing the warning maybe
2016-01-22 09:44:32 -08:00
Seth Alves
451464cb47
check values in location updates for NaN before using them
2016-01-22 09:41:46 -08:00
samcake
6d89f6d7b0
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-01-22 09:30:31 -08:00
samcake
6bcd7f10ad
Try the constant gaussian values which are more stable on mac...
2016-01-21 23:54:51 -08:00
Brad Hefta-Gaub
58b7708315
Merge pull request #6899 from birarda/fix-go-home
...
repairs to index path behaviour
2016-01-21 21:29:24 -08:00
Brad Hefta-Gaub
b41301d226
Merge pull request #6879 from sethalves/fix-aa-cube-bug
...
fix query-cube vs lod bug
2016-01-21 21:02:42 -08:00
samcake
b7f14789af
Refining the ao effect on the blur side
2016-01-21 19:02:32 -08:00
samcake
7df3e9f306
Merge pull request #6876 from ericrius1/droplets
...
Adds a fix for a rendering issue where models with a texture driving both color and opacity would be rendered fully opaque
2016-01-21 18:32:43 -08:00
Stephen Birarda
40f2afb284
Merge pull request #6898 from Atlante45/fix/ds-shutdown-debug
...
Postpone logging of the shutdown reason
2016-01-21 18:31:19 -08:00
Stephen Birarda
9061e33a1f
send path query once connected to domain
2016-01-21 18:24:17 -08:00
Stephen Birarda
fac30bb0ae
use the index path as default with network address
2016-01-21 18:24:16 -08:00
Brad Hefta-Gaub
e1c369dc10
Merge pull request #6766 from samcake/hdr
...
Ambient Occlusion
2016-01-21 18:10:52 -08:00
Brad Hefta-Gaub
7bfe2730e8
Merge pull request #6849 from jherico/atmosphere
...
Remove old atmosphere rendering
2016-01-21 17:58:59 -08:00
Atlante45
6fd5176474
Pospone logging of the shutdown reason
...
This makes it more obvious to the log reader why the DS went
down.
2016-01-21 17:54:10 -08:00
samcake
b5aa5fcb46
more clean up
2016-01-21 17:36:53 -08:00
Anthony J. Thibault
ca8a832818
CharacterController: added hard limit to follow displacement
...
To prevent tunneling when the rigid body cannot reach it's target due to being blocked by a wall or some other obstacle.
Also, added unit tests for physics/BulletUtil rotateVector and clampLength functions.
2016-01-21 17:27:45 -08:00
Brad Hefta-Gaub
094e41c993
Merge pull request #6888 from Atlante45/fix/wifi-ping-spikes
...
Fix wifi ping spikes
2016-01-21 17:07:38 -08:00
samcake
846c5a7b9a
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-01-21 16:56:40 -08:00
samcake
8eddd52731
Fixing coding guidelines
2016-01-21 16:54:37 -08:00
Brad Hefta-Gaub
1a98ab3fba
Merge pull request #6877 from AndrewMeadows/crash-fix
...
fix interface crash when deleting lots of objects at once
2016-01-21 16:49:21 -08:00
samcake
402809fe2f
FIxing coding standards
2016-01-21 16:44:35 -08:00
Anthony J. Thibault
a91c181a89
MyAvatar: Recenter when the head turns away from the hips
...
Compute HMD facing moving average.
When the moving average diverges from the hips by more then 45 degrees, recenter the body.
Also, the follow code has been changed, instead of a follow velocity being passed to the CharacterController
a desired target is passed. The CharacterController homes toward it's target based on the time remaining.
Any follow deltas applied to move the avatar's position closer to it's target is stored and re-applied
to the bodySensorMatrix. This centralizes the moving/homing code to one place, the CharacterContoller.
A new FollowHelper class was also introduced, it groups together the data and logic necessary to perform the
re-centering/follow procedure. This "hopefully" makes it easier to maintain.
2016-01-21 16:38:42 -08:00
samcake
9c344c6498
FIxing the bordering enble default value
2016-01-21 16:38:21 -08:00
Seth Alves
c2edb0a559
Merge branch 'master' of github.com:highfidelity/hifi into fix-aa-cube-bug
2016-01-21 16:15:06 -08:00
Seth Alves
872a00d518
entities that are children shouldn't (at this point) be dynamic.
2016-01-21 15:53:47 -08:00
samcake
2471a88e85
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-01-21 15:53:25 -08:00
Seth Alves
cbed542682
MyAvatar updates the entity-server about queryAACubes of children entities
2016-01-21 15:53:19 -08:00
samcake
16573357d8
FIxing the AO results at the border of the frame by guarding the fetch out of the frame
2016-01-21 15:50:38 -08:00
Brad Davis
47a1c16430
Resolving warnings
2016-01-21 15:15:18 -08:00
Brad Davis
f9f9ddd8bd
Yet more atmosphere removal
2016-01-21 15:15:17 -08:00
Brad Davis
3e7f29a0aa
Support debug mode for QML UI in debug builds
2016-01-21 15:15:16 -08:00
Brad Davis
ae6cba85e8
More atmosphere removal
2016-01-21 15:15:16 -08:00
Brad Davis
b8109af196
Ignite the atmosphere
2016-01-21 15:15:15 -08:00
Atlante45
db18d188b8
Fix wifi ping spikes
...
Moves the setting of Qt's bearer poll timeout earlier to be sure
it's caught.
2016-01-21 15:05:32 -08:00
Leonardo Murillo
7e19110dd5
Merge pull request #6887 from birarda/migrate-ds-old-dev
...
migrate domain-server config from single org name
2016-01-21 16:24:02 -06:00
Stephen Birarda
aa2e55a5a0
handle weird nested path on windows
2016-01-21 14:03:45 -08:00
Stephen Birarda
cddb8cd3f0
migrate domain-server config from single org name
2016-01-21 13:57:24 -08:00
Leonardo Murillo
098b7a4ff3
Merge pull request #6870 from birarda/console
...
Your Stack Manager is now a Server Console
2016-01-21 14:31:34 -06:00
Stephen Birarda
4cfe3941f4
delete the lookup timeout timer once fired
2016-01-21 11:18:53 -08:00
Seth Alves
5027157575
for LOD, allow entity-server to use getAABox if it can, but fall back to queryAABox if it can't
2016-01-21 09:31:51 -08:00
Seth Alves
729998bbf3
Merge branch 'master' of github.com:highfidelity/hifi into fix-aa-cube-bug
2016-01-21 09:19:47 -08:00
Andrew Meadows
58a7528b68
Merge pull request #6854 from sethalves/access-avatar-parent-id-from-js
...
Access avatar parent information from js
2016-01-21 09:19:40 -08:00
Seth Alves
311e0cee67
Merge pull request #6820 from AndrewMeadows/collision-mask
...
use "collidesWith" instead of "collisionMask"
2016-01-21 09:13:34 -08:00
Seth Alves
1fef78f60f
fix bug where entities that were children of avatars wouldn't be included in entity-server packets to interfaces
2016-01-20 19:03:41 -08:00
samcake
8d1ab01018
exposing one more parameter
2016-01-20 18:32:44 -08:00
Andrew Meadows
e77189fb1b
keep reference to removed entity until next frame
2016-01-20 17:09:37 -08:00
Brad Hefta-Gaub
7919d7bc17
Merge pull request #6866 from jherico/menufix
...
Fixing overlay menu popup & some more QML cleanup
2016-01-20 16:58:21 -08:00
samcake
4e5869b247
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-01-20 16:30:24 -08:00
ericrius1
0ffcf437e9
Fix for transparent textures not being rendered with opacity
2016-01-20 16:22:49 -08:00
ericrius1
eb5a950f85
texture opacity potential fix
2016-01-20 15:08:39 -08:00
Zach Pomerantz
0c798c06a9
Merge branch 'master' of github.com:highfidelity/hifi into flag/shadows
2016-01-20 14:51:42 -08:00
samcake
0da4df93b8
Merge pull request #6860 from zzmp/refactor/cull-functor
...
Refactor ShouldRenderFunctor to be out of RenderArgs
Tested on windows, checking the values returned by the culling/visible/too small
Looks good
2016-01-20 14:25:42 -08:00
Zach Pomerantz
0a34ee9138
Externalize list sizing for render::cullItems
2016-01-20 12:39:27 -08:00
samcake
07c630bcda
And cleaning again hopping to have the pr build
2016-01-20 11:44:01 -08:00
Brad Davis
d2900200a1
More cleanup & menu fixing
2016-01-20 11:23:56 -08:00
samcake
35ea04ae7c
fixing the bug that kept AO when ao is off...
2016-01-20 11:13:50 -08:00
Andrew Meadows
19d24293e1
Merge pull request #6855 from sethalves/clean-up-entities-with-bad-parent
...
don't persist entites with invalid parentIDs
2016-01-20 10:38:26 -08:00
samcake
320c799379
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-01-20 10:14:02 -08:00
Stephen Birarda
e69424e155
add parentheses to old style signal
2016-01-20 09:27:47 -08:00
samcake
379c882834
Debugging the darkness and pointing out bugs
2016-01-20 02:03:09 -08:00
Stephen Birarda
e3df02e589
fix parenting of single shot timer
2016-01-19 20:51:33 -08:00
Stephen Birarda
60bf617ea1
allow STUN to succeed started late or immediately
2016-01-19 20:41:39 -08:00
Andrew Meadows
a92c512c17
move collision group/mask calculus into EntityItem
2016-01-19 19:52:08 -08:00
samcake
c5c51f2af2
Make sure the resolution level for ao is correct
2016-01-19 18:57:03 -08:00
Zach Pomerantz
3445b7fd2c
Fix orientation aligned with Y
2016-01-19 18:39:34 -08:00
samcake
dc40337dc1
Adjusting default settings
2016-01-19 18:02:47 -08:00
samcake
584d50b594
Experimenting with AO on the lightmaped surface
2016-01-19 17:56:07 -08:00
Stephen Birarda
e5d47f3379
fix for accidental filtering of stun packets
2016-01-19 17:26:41 -08:00
Stephen Birarda
8bc063e758
Merge branch 'master' of https://github.com/highfidelity/hifi into console
2016-01-19 16:21:19 -08:00
Seth Alves
28d673cb97
try again to make this thread safe
2016-01-19 16:00:02 -08:00
Seth Alves
0064ee6ab2
try again to make this thread safe
2016-01-19 15:55:56 -08:00
Zach Pomerantz
c794ae8da2
Avoid shadow attenuation outside of mapped area
2016-01-19 15:48:20 -08:00
Zach Pomerantz
27967f6064
Use 4-sample PCF for shadowMap sampling
2016-01-19 15:48:20 -08:00
