Andrew Meadows
bcf2cc8074
use references not pointers for ViewFrustums
...
also unravelling some spaghetti:
(1) split Octree stuff out of ViewFrustum
(2) moved ViewFrustum from octree to shared lib
(3) removed some cruft
2016-05-05 18:28:27 -07:00
Andrew Meadows
60a72c6660
getViewFrustum() provides const pointer
2016-05-05 18:28:27 -07:00
Stephen Birarda
a5d09e268d
fix sessionID pull and re-sent for HB
2016-05-05 15:56:16 -07:00
Seth Alves
b5a3baf322
Merge branch 'master' of github.com:highfidelity/hifi into linux-qol
2016-05-05 15:55:37 -07:00
Stephen Birarda
839c7fb8c2
provide session ID for metaverse heartbeat once received
2016-05-05 15:45:11 -07:00
Stephen Birarda
0ea46cb415
send fallback socket, don't send HB if send usage disabled
2016-05-05 15:35:37 -07:00
Atlante45
bc6544a3c5
Fix MyAvatar's velocity change
2016-05-05 14:55:28 -07:00
Atlante45
07adef9465
Fix entities collision sounds
2016-05-05 14:55:28 -07:00
Atlante45
96ee33e80e
Fix avatars collision sounds
2016-05-05 14:55:28 -07:00
James B. Pollack
67b1015f4a
re add users to default, default to visible friends only
2016-05-05 14:54:04 -07:00
Zach Pomerantz
3619821b82
Improve timing tests with averages
2016-05-04 13:23:10 -07:00
Zach Pomerantz
0f6162d683
Use appropriate units for timing tests
2016-05-04 13:23:10 -07:00
Seth Alves
44beca1687
try having all spring derived actions agree on a target
2016-05-04 11:29:17 -07:00
howard-stearns
d3c6662198
Take the deadband down a notch, following feedback from P.
2016-05-03 16:35:20 -07:00
howard-stearns
adb11c9266
Merge branch 'master' of https://github.com/highfidelity/hifi into hand-controller-pointer
2016-05-03 14:03:10 -07:00
Howard Stearns
773770a7fc
All but origin-correction.
2016-05-03 07:01:23 -07:00
Brad Hefta-Gaub
49d02b802a
Merge pull request #7719 from zzmp/feat/resource-prefetch
...
Add prefetching to exposed caches
2016-05-02 18:04:26 -07:00
Clément Brisset
2ef87557fc
Merge pull request #7798 from zzmp/clean/override
...
Fix warnings on vanilla XCode compilations
2016-05-02 10:56:07 -07:00
Brad Hefta-Gaub
cddcac60c1
Merge pull request #7768 from ctrlaltdavid/20891
...
Add Interface "Home" bookmark function
2016-05-02 10:14:57 -07:00
Brad Hefta-Gaub
a447ce4633
Merge pull request #7770 from AndrewMeadows/avoid-crosseyes
...
don't cross the eyes
2016-05-02 10:13:25 -07:00
Brad Hefta-Gaub
44fb572248
Merge pull request #7775 from ctrlaltdavid/20896
...
Use UI Toolkit border styles for various dialogs
2016-05-02 10:11:29 -07:00
Zach Pomerantz
13945aa4d9
Annotate all virtual fns with override
2016-04-30 13:48:59 -07:00
David Rowe
6b8109f164
Fix avatar browser top border height and remove separate "close" button
2016-04-29 12:42:10 +12:00
Seth Alves
5cec928ad1
Merge pull request #7776 from huffman/fix/build-copy-scripts
...
Fix interfaces scripts not copying from /scripts in local builds
2016-04-27 19:15:09 -07:00
Andrew Meadows
5f98af1898
avoid crossed eyes
2016-04-27 16:58:13 -07:00
Andrew Meadows
8a691cf449
Merge pull request #7765 from hyperlogic/tony/cone-sphere-angle
...
Improve eye tracking when face to face
2016-04-27 16:54:07 -07:00
Ryan Huffman
f92f29ecab
Fix interfaces scripts not copying from /scripts in local builds
2016-04-27 16:34:30 -07:00
David Rowe
e5ee98ee60
Fix up filenames in headers
2016-04-28 11:19:30 +12:00
David Rowe
16874baf5f
Use UI Toolkit border styles for various dialogs
...
File > Help...
File > About Interface
Settings > Avatar Settings > Browse
Go To button (directory.js)
Examples button (examples.js)
2016-04-28 11:14:39 +12:00
Zach Pomerantz
bc8a171fde
Merge branch 'master' of github.com:highfidelity/hifi into feat/resource-prefetch
2016-04-27 11:55:24 -07:00
Andrew Meadows
5042561e80
Merge pull request #7730 from imgntn/defaultScripts
...
/scripts for launch
2016-04-27 11:36:20 -07:00
Brad Hefta-Gaub
db6a07171f
Merge pull request #7764 from zzmp/fix/text3d-pipeline
...
Fix strange rendering with Text3DOverlay
2016-04-26 17:15:09 -07:00
David Rowe
5e00a1ef49
Implement "go home" action
2016-04-27 11:24:19 +12:00
James B. Pollack
afb2342781
Merge remote-tracking branch 'upstream/master' into defaultScripts
2016-04-26 16:16:56 -07:00
David Rowe
f74be226c8
Add "home" button to address bar
2016-04-27 10:28:05 +12:00
Anthony J. Thibault
71f67c99cc
MyAvatar: use coneSphereAngle for eyeTracking look at targets
2016-04-26 13:43:03 -07:00
Brad Hefta-Gaub
82f905dc84
fix qml issue
2016-04-26 13:29:22 -07:00
Zach Pomerantz
63b0c0a9ad
Reset pipeline after rendering text3d
2016-04-26 13:23:16 -07:00
David Rowe
7406e5fd9c
Add Navigate > Set Home Location menu item
2016-04-27 07:57:43 +12:00
Brad Hefta-Gaub
e7d26a8a63
CR feedback magic numbers
2016-04-26 11:45:48 -07:00
Brad Hefta-Gaub
ee277dcf9d
Merge branch 'master' of https://github.com/highfidelity/hifi into qmlWindowFixes
2016-04-26 11:44:51 -07:00
Brad Hefta-Gaub
0ae6e9f241
remove debug messages
2016-04-26 11:36:21 -07:00
Andrew Meadows
3d1abf8fb1
use the new JS script location
2016-04-26 11:20:08 -07:00
Brad Hefta-Gaub
cf49ba26ad
Merge pull request #7760 from hyperlogic/tony/away-reset-avatar
...
Reset avatar on exit of away-mode.
2016-04-26 09:51:47 -07:00
Brad Hefta-Gaub
716d9e554c
removed a bunch of dead code
2016-04-26 09:25:28 -07:00
Brad Hefta-Gaub
4ab7b660d4
fix a bunch of bugs in qml window placement
2016-04-25 20:19:54 -07:00
Anthony J. Thibault
b7f157f4ff
Reset avatar on exit of away-mode.
...
Exposed MyAvatar.reset(bool) to script.
away.js now calls this on exit of away-mode.
2016-04-25 14:10:20 -07:00
Clément Brisset
d74b5bdb17
Merge pull request #7756 from sethalves/add-missing-delete
...
fix memory leak in AssetMappingModel
2016-04-25 12:56:26 -07:00
Anthony Thibault
6dfd174285
Merge pull request #7750 from hyperlogic/tony/thousand-yard-stare
...
Avatar eye gaze fix for HMDs
2016-04-25 10:29:41 -07:00
Seth Alves
49566c8f26
fix memory leak in AssetMappingModel
2016-04-25 10:07:08 -07:00
Anthony J. Thibault
0c200e8c00
MyAvatar: coding convention fix for updateEyeContactTarget()
2016-04-25 09:27:43 -07:00
Anthony Thibault
0da3fb8eee
Eye contact improvements
...
* After eyes change targets there is now a minimum 1/3rd second delay before they will again.
* Changing gaze from eye to mouth is less likely then switching between eyes.
2016-04-24 18:50:14 -07:00
Anthony Thibault
d8a32c8329
Avatar eye gaze fix for HMDs
...
When no avatars are chosen for more detailed eye gaze tracking the eyes should look straight ahead.
Before this fix, if you were in room scale or not aligned with the camera sensor your gaze could drift to the left or to the right of your head's forward direction.
Now it should follow your head more closely.
2016-04-24 17:59:51 -07:00
Seth Alves
2425baf6e6
don't early _exit on Linux
2016-04-24 08:14:56 -07:00
Brad Hefta-Gaub
88ab52d340
Merge pull request #7747 from hyperlogic/tony/avatar-look-at-fixes
...
Fixes for avatar eye tracking.
2016-04-23 17:04:15 -07:00
Brad Hefta-Gaub
04dab65b59
Merge pull request #7727 from ZappoMan/supportLargeClockSkew
...
support for larger than 35 minute clock skew
2016-04-23 08:42:38 -07:00
Brad Hefta-Gaub
21b324e1f3
Merge pull request #7742 from birarda/new-default-av
...
replace the default avatar with the being of light
2016-04-23 08:42:00 -07:00
Anthony J. Thibault
c850880515
Head: compute _eyePosition properly.
2016-04-22 19:16:28 -07:00
Chris Collins
9bd9de5710
Merge pull request #7636 from samcake/red
...
Stereo drawcall amplification
2016-04-22 15:46:18 -07:00
Stephen Birarda
09a068e472
add back the avatar animation file new path
2016-04-22 13:53:39 -07:00
Stephen Birarda
132d9c3486
replace the default avatar with the being of light
2016-04-22 13:48:30 -07:00
Brad Hefta-Gaub
f4e4f217e8
Merge pull request #7642 from ctrlaltdavid/20872
...
Further restyling of edit.js
2016-04-22 13:46:26 -07:00
Brad Hefta-Gaub
79a1e6264e
Merge pull request #7714 from hyperlogic/tony/default-anims-are-local
...
Avatar animations are now stored locally
2016-04-22 13:44:30 -07:00
Brad Hefta-Gaub
c410242fb2
Merge pull request #7688 from jherico/texture_derez
...
Reducing GPU texture memory footprint
2016-04-22 13:20:54 -07:00
Brad Hefta-Gaub
de17834dd1
Merge pull request #7740 from ctrlaltdavid/20887
...
Don't display "Reveal Scripts Folder" control in HMD mode
2016-04-22 13:04:07 -07:00
David Rowe
7b9e6b52fb
Merge branch 'master' into 20872
...
Conflicts:
interface/resources/qml/hifi/dialogs/RunningScripts.qml
2016-04-22 13:19:47 +12:00
David Rowe
a7b82e8cae
Decouple ui and shared libraries
2016-04-22 12:58:47 +12:00
David Rowe
266e4c998b
Don't show "Reveal Scripts Folder" link when open Running Scripts in HMD
2016-04-22 12:29:22 +12:00
Andrew Meadows
c35ddccba1
Merge pull request #7718 from zzmp/fix/release-motion-states
...
Remove myAvatar motion states on shutdown
2016-04-21 17:11:25 -07:00
Brad Hefta-Gaub
72c81e2378
Merge branch 'master' of https://github.com/highfidelity/hifi into supportLargeClockSkew
2016-04-21 16:26:44 -07:00
Brad Hefta-Gaub
0f966e934e
Merge pull request #7728 from ctrlaltdavid/20887
...
Add link in Running Scripts that opens scripts folder
2016-04-21 16:01:52 -07:00
Brad Hefta-Gaub
d87d631871
Merge pull request #7708 from zzmp/feat/render-rates
...
Add renderRates.js to visualize rates over time
2016-04-21 15:59:58 -07:00
Brad Hefta-Gaub
d9ae788818
more CR feedback
2016-04-21 15:55:50 -07:00
Brad Davis
6c30194916
Support lowering the minimum mip of a texture at runtime
2016-04-21 14:46:12 -07:00
Brad Hefta-Gaub
ddf5b0f316
some debugging
2016-04-21 10:32:22 -07:00
David Rowe
6c5335cfa7
Replace button with icon and text
2016-04-21 15:17:06 +12:00
Zach Pomerantz
e3131d2098
Rm prefetchAnimation from avatar/rig
2016-04-20 20:14:15 -07:00
Brad Hefta-Gaub
31f9d592e0
support for larger than 35 minute clock skew
2016-04-20 18:42:00 -07:00
David Rowe
9c9bca546c
Add button that opens scripts directory window
2016-04-21 11:52:03 +12:00
Zach Pomerantz
2c7cf3ea83
Fix RateScriptingInterface headers
2016-04-20 14:32:25 -07:00
David Rowe
6e8b535e80
Merge branch 'master' into 20872
2016-04-21 09:19:00 +12:00
Zach Pomerantz
ad225b3aed
Fix RatesScriptingInterface ctor
2016-04-20 13:58:06 -07:00
Zach Pomerantz
1fe12e7029
Mv Rates to RatesScriptingInterface.h
2016-04-20 13:26:23 -07:00
Anthony J. Thibault
506033a5d8
Remove old avatar-animation.json
2016-04-19 16:14:26 -07:00
Anthony J. Thibault
8e5785cdf8
Avatar animations are now stored locally
...
Improves FTUE, by no longer going over the network to download default avatar animations.
This also includes support for relative animation urls within the animation.json
2016-04-19 16:11:14 -07:00
Zach Pomerantz
4dacb04ee1
Rm myAvatar motion states on shutdown
2016-04-19 16:01:55 -07:00
David Rowe
54b032f612
Merge branch 'master' into 20872
2016-04-20 08:51:53 +12:00
Howard Stearns
cbb76013c4
Merge pull request #7710 from ZappoMan/LODtweaks
...
tweaks to LOD behavior
2016-04-19 13:50:21 -07:00
samcake
3dad4f576e
Merging with master
2016-04-19 11:59:44 -07:00
Brad Hefta-Gaub
c7ecbb6b4b
tweaks to LOD behavior
2016-04-19 11:19:28 -07:00
Howard Stearns
9ff9682b2a
Merge pull request #7692 from ZappoMan/resetScriptEngineOnDomainChange
...
Reset entities script engine on domain change
2016-04-19 11:14:28 -07:00
samcake
a997f9bb1b
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-04-19 10:49:53 -07:00
Zach Pomerantz
fc61f85bf9
Merge pull request #7698 from hyperlogic/tony/avatar-on-load-complete-callback
...
Added MyAvatar onLoadComplete Callback
2016-04-19 10:36:20 -07:00
samcake
265f6f1275
Updating & Merging with master
2016-04-19 10:05:44 -07:00
Brad Hefta-Gaub
8eff47f922
Merge pull request #7705 from hyperlogic/tony/avatar-attachment-lag-fix
...
Fix for laggy avatar attachments
2016-04-19 07:15:38 -07:00
Brad Hefta-Gaub
0ac9601ea7
Merge pull request #7690 from ZappoMan/improveHMD
...
Introduce "recommended overlay rectangle" to display plugins
2016-04-18 18:04:21 -07:00
Brad Hefta-Gaub
0a79b5dd69
Merge pull request #7707 from huffman/fix/osx-default-script-dir
...
Remove fix for old QT file path bug in OSX
2016-04-18 18:01:47 -07:00
Brad Hefta-Gaub
0e9bd9a776
Merge pull request #7682 from zzmp/clean/stars
...
Cleanup stars to persist a single BufferView
2016-04-18 17:59:48 -07:00
David Rowe
47b4c36546
Merge branch 'master' into 20872
2016-04-19 12:56:55 +12:00
Zach Pomerantz
f48541961d
Expose Rates to JS/QML
2016-04-18 17:43:34 -07:00