Andrew Meadows
1e29faf365
Merge pull request #7090 from ZappoMan/fixOctreeBag
...
move back to unordered_set so that OctreeElementBag will handle uniqueness
2016-02-12 11:22:46 -08:00
Brad Hefta-Gaub
1160ecb335
improvements in HMD UI behavior
2016-02-12 10:51:33 -08:00
samcake
ef92a52777
Merge pull request #7051 from zzmp/feat/graphics-dialog
...
Move graphics settings to a new dialog
2016-02-12 10:46:00 -08:00
Howard Stearns
80baa5ce18
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-lookAt
2016-02-12 10:39:31 -08:00
Howard Stearns
874f74de04
Fix Quat.lookAt
2016-02-12 10:38:50 -08:00
samcake
2d33bb83e1
Remove a dead comment
2016-02-12 10:30:44 -08:00
samcake
c248732bc7
Getting the array initialization right ?
2016-02-12 10:27:08 -08:00
samcake
40c283cba2
Fixing some warnings
2016-02-12 10:21:28 -08:00
samcake
40455af7fc
LEss warning
2016-02-12 10:16:20 -08:00
samcake
5acfd5ff53
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-02-12 09:59:48 -08:00
samcake
171acb883f
Fixing compilation issue on mac and linux
2016-02-12 09:59:33 -08:00
Seth Alves
5659589ea1
Merge pull request #7088 from birarda/offline-domain
...
fix STUN failover for offline machines
2016-02-12 09:16:20 -08:00
Zach Pomerantz
d516e9da78
Only run AO in DEFAULT_RENDER_MODE
2016-02-12 09:01:54 -08:00
Brad Hefta-Gaub
477dfe1b10
use std::unordered_map<> instead of std::unordered_set<>
2016-02-11 20:42:42 -08:00
samcake
f12030c1a4
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-02-11 18:41:02 -08:00
samcake
b94c2c9b7f
Introducing a cleaner filtering pipeline, normally it s good to go
2016-02-11 18:40:36 -08:00
Zach Pomerantz
232f06e175
Avoid unnecessary TaskConfig dtor
2016-02-11 17:29:18 -08:00
Anthony J. Thibault
111ed65bf8
Controller Pose values are relative to Avatar.
...
Pass a InputCalibrationData to each inputPlugin and inputDevice.
This contains the most up sensorToWorldMatrix, avatarMat and hmdSensorMatrix.
Each input plugin can use this data to transform it's poses into Avatar space
before sending it up the chain.
This fixes a bug in the handControllerGrab.js script that relied on the hand controller
rotation/positions being in the avatar frame.
2016-02-11 17:18:01 -08:00
Ken Cooke
aef770fcba
fix typo
2016-02-11 16:39:23 -08:00
Ken Cooke
a712222370
fix typos
2016-02-11 16:33:13 -08:00
Ken Cooke
8a49c4b833
use cpuid.h on both GCC and Xcode
2016-02-11 16:09:04 -08:00
James B. Pollack
2889bdd8b2
Merge pull request #7083 from ZappoMan/fixDoublePreload
...
handle two corner cases where preload would get called twice
2016-02-11 16:08:43 -08:00
Andrew Meadows
b6456889ef
Merge pull request #7050 from Atlante45/fix/audio-stats
...
Fix audio stats
2016-02-11 15:56:45 -08:00
Ken Cooke
c4b09c3603
not supported by Clang
2016-02-11 15:15:50 -08:00
Seth Alves
89b85f3a78
Merge pull request #7087 from AndrewMeadows/crash-fix
...
yet another attempt to avoid physics crashes
2016-02-11 14:58:57 -08:00
Brad Hefta-Gaub
26ab1bdac4
move back to unordered_set so that OctreeElementBag will handle uniqueness
2016-02-11 14:50:18 -08:00
samcake
898cfbc043
cleaning a if into an assert
2016-02-11 14:41:37 -08:00
Stephen Birarda
a6ba8dd8e5
fix null STUN server socket check in LNL
2016-02-11 14:14:16 -08:00
Andrew Meadows
2b91a31919
check for nullptr to avoid crashes
2016-02-11 13:53:01 -08:00
samcake
dedfee3acc
Fixing a terrible bug!
2016-02-11 13:43:43 -08:00
Chris Collins
c6bc91f8b2
Merge pull request #7084 from jherico/toolTabs
...
Allow closed tabs to delete properly
2016-02-11 13:20:20 -08:00
Chris Collins
ca15638463
Merge pull request #7080 from ZappoMan/fixPersistMono
...
add support for persisting the mono preview mode option
2016-02-11 13:03:49 -08:00
Ken Cooke
27494e54c5
use the correct macro for detecting GCC
2016-02-11 12:58:23 -08:00
Zach Pomerantz
d0f3ad75b8
Nest Persistent in Config to compile on nix
2016-02-11 10:27:32 -08:00
Brad Davis
2ee1f18e06
Allow closed tabs to delete properly
2016-02-11 10:27:24 -08:00
Chris Collins
a4afa03fe5
Merge pull request #7077 from sethalves/clean-up-grab-signaling
...
Clean up grab signaling + various fixes
2016-02-11 10:20:56 -08:00
Zach Pomerantz
a7778daed2
Change graphics dialog to persisted dropdowns
2016-02-11 10:15:13 -08:00
samcake
31230e81bb
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-02-11 10:05:58 -08:00
samcake
355b8ee40d
THursday morning the frustum culling seems broken in one particular angle
2016-02-11 10:05:39 -08:00
Zach Pomerantz
84197e5eb2
Add persistent render engine configuration file
2016-02-11 10:00:44 -08:00
Zach Pomerantz
66e1d9668c
Add ComboBox preference
2016-02-11 10:00:44 -08:00
samcake
99e9b3ecdd
Merge pull request #7043 from zzmp/fix/render-ui
...
Revamp the render engine ui
2016-02-11 09:57:51 -08:00
Atlante45
51168a8a29
Explicitely cast to float
2016-02-11 09:35:31 -08:00
Brad Hefta-Gaub
a40a562db2
handle two conner cases where preload would get called twice
2016-02-11 09:33:52 -08:00
Clément Brisset
c3218a3af9
Merge pull request #7069 from AndrewMeadows/another-crash-fix
...
Fix crash when propagating simulation ownership on deleted objects
2016-02-11 09:29:08 -08:00
Zach Pomerantz
3bace3cdbb
Rework the qml for brevity
2016-02-11 08:48:01 -08:00
Zach Pomerantz
86412c1890
Fix default debug buffer size
2016-02-11 08:47:59 -08:00
Zach Pomerantz
991d6328ef
Fix JSON integration for JobConfig
2016-02-11 08:47:58 -08:00
Zach Pomerantz
5f395654f0
Integrate JobConfig with JSON/qml
2016-02-11 08:47:51 -08:00
Brad Hefta-Gaub
d77d102384
add support for persisting the mono preview mode option
2016-02-10 22:01:17 -08:00
Seth Alves
3a2b082a7f
remove incorrect assert
2016-02-10 20:47:22 -08:00
Seth Alves
ffce38769f
properties hold local velocities, not world-frame ones
2016-02-10 19:16:08 -08:00
Seth Alves
6a646f1c24
put isMoving back and change all uses to isMovingRelativeToParent
2016-02-10 19:01:41 -08:00
Seth Alves
3fe01ccf10
cleanups
2016-02-10 18:32:05 -08:00
Seth Alves
3e71efcdbb
all code that asks isMoving appears to mean relative to parent
2016-02-10 18:21:44 -08:00
Andrew Meadows
ac60917b54
sigh... protect againt null MotionStates
2016-02-10 17:58:38 -08:00
Andrew Meadows
fed03edde3
manually removing contact manifolds was a bad idea
2016-02-10 17:58:38 -08:00
Andrew Meadows
532f0683e8
remove all contact info before removing objects
2016-02-10 17:58:38 -08:00
Seth Alves
3f922240d0
clean up handling of success flag and some debugging prints
2016-02-10 16:42:13 -08:00
Seth Alves
1ae47b17f0
size-cull parent entities by their queryAABox rather than their dimensions to avoid having the entity-server send a child but not the parent
2016-02-10 16:41:35 -08:00
samcake
6922c9adf0
updating all the entity types when their bound is changing
2016-02-10 16:41:09 -08:00
Atlante45
f32562b191
Coding standard
2016-02-10 16:35:06 -08:00
Atlante45
1e3bf67fab
Fix division by 0
2016-02-10 16:35:06 -08:00
Stephen Birarda
97cd65cf80
don't use usecTimestampNow for per second actions
2016-02-10 15:07:58 -08:00
Andrew Meadows
d121dab937
Merge pull request #7057 from sethalves/grab-then-equip
...
Grab then equip
2016-02-10 14:16:31 -08:00
Seth Alves
3b1db7a522
Merge pull request #7061 from AndrewMeadows/crash-fix
...
Fix crash when deleting many moving dynamic objects.
2016-02-10 13:58:03 -08:00
Seth Alves
49f2724608
don't return void
2016-02-10 13:49:03 -08:00
Andrew Meadows
8ddbce1ee2
Merge pull request #7059 from sethalves/clamp-ik-dt
...
avoid crazy ik-induced shaking / orbits
2016-02-10 13:32:53 -08:00
James B. Pollack
b07c32e116
Merge pull request #7062 from jherico/webentitiies
...
Ensure the QML content gets destroyed on deletion of a QML surface
2016-02-10 13:27:59 -08:00
samcake
b295a3732e
Fix a bunch of warnings
2016-02-10 12:18:46 -08:00
Seth Alves
af6bb50f74
fix warning
2016-02-10 12:09:28 -08:00
samcake
51bacdebdd
Trying to notify the entity changes to the render item correctly, need more work
2016-02-10 11:52:37 -08:00
Seth Alves
9d21c3d549
Merge branch 'master' of github.com:highfidelity/hifi into grab-then-equip
2016-02-10 11:35:25 -08:00
Chris Collins
db06674f7e
Merge pull request #7058 from hyperlogic/tony/moving-platform-bugfixes
...
SpatiallyNestable: bug fixes for kinematic entities
2016-02-10 11:34:32 -08:00
Brad Davis
a4f2fc58fd
Ensure the QML content gets destroyed on deletion of a QML surface
2016-02-10 11:27:18 -08:00
Seth Alves
6fea0b9396
also make sure tau is >= 1.0
2016-02-10 11:20:56 -08:00
Andrew Meadows
84fb983da7
don't forget to remove from _outgoingChanges
2016-02-10 10:36:35 -08:00
Andrew Meadows
4bcb7b1ba9
more correct profiling
2016-02-10 10:36:34 -08:00
Andrew Meadows
9b467e94da
constify and explicit override
2016-02-10 10:36:34 -08:00
Seth Alves
b3b053ce18
if delta-time is more than 1/30th of a second, clamp it to avoid crazy ik induced orbits when main thread is blocked
2016-02-10 09:52:29 -08:00
samcake
9326aebf20
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-02-10 09:38:54 -08:00
Ken Cooke
a875542142
Merge pull request #7053 from birarda/integrate-new-hrtf
...
Integrate the new audio HRTF in AudioMixer
2016-02-10 07:34:50 -08:00
samcake
5ef7a19d67
Drafting a solution to update the render items when ENtity is moving
2016-02-09 18:29:22 -08:00
Anthony J. Thibault
727e289ecd
SpatiallyNestable: bug fixes for kinematic entities
...
* Kinematic entities were being simulated with position in the local frame but velocity in the global frame.
* Also, because getVelocity() was returning non-zero values when the parent was moving, kinematic objects were being simulated even if they should have been at rest.
* Bug fix for calculating velocity direction was incorrect, if the parent frame was rotated.
2016-02-09 17:58:54 -08:00
Stephen Birarda
ac0db04892
repair to wrapped memcpy from AudioRingBuffer
2016-02-09 16:39:22 -08:00
samcake
8a4e2cb0c5
cleaning the warnings coming from the os side
2016-02-09 16:27:40 -08:00
samcake
da158bcd85
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-02-09 15:52:28 -08:00
samcake
c96dd7f131
Cleaning up of the octree as items are removed
2016-02-09 15:51:38 -08:00
Stephen Birarda
cafcb6b109
remove degree conversion that is not used
2016-02-09 15:25:10 -08:00
Stephen Birarda
5c9f673e38
fix for missing M_PI
2016-02-09 15:05:19 -08:00
Seth Alves
251810edc5
only suppress location edits when they arrive over the network -- script can still update
2016-02-09 15:03:36 -08:00
Stephen Birarda
7b2726f89b
ensure that injectors are cleaned up once inactive
2016-02-09 14:30:59 -08:00
Stephen Birarda
1773233af4
cleanup management of HRTF objects across connected Nodes
2016-02-09 14:30:44 -08:00
Seth Alves
43592fd699
Merge pull request #7048 from hyperlogic/tony/avatar-on-moving-platform
...
Better avatar animation when attached to a moving entity
2016-02-09 14:30:02 -08:00
Anthony J. Thibault
2b10fea006
SpatiallyNestable: warn on failure.
2016-02-09 14:03:39 -08:00
Brad Hefta-Gaub
a8ec4bb844
Merge pull request #7049 from jherico/antistutter
...
Anti-stutter work
2016-02-09 12:16:15 -08:00
Stephen Birarda
a6a694c704
fix mixing bugs post HRTF integration
2016-02-09 11:58:55 -08:00
Chris Collins
cc576dd5e3
Merge pull request #7045 from sethalves/fix-query-cube
...
fix queryAACube lastEdited bug
2016-02-09 11:23:56 -08:00
Brad Davis
7d99f9e72f
PR comments
2016-02-09 10:16:44 -08:00
Brad Davis
839b8d432e
Don't burn CPU cycles calculating an average color we don't use
2016-02-09 09:39:34 -08:00
