Chris Collins
4f22e0ad5a
Merge pull request #7828 from sethalves/show-other-sim-owner
...
show with debug icons when someone else is the simulation owner
2016-05-09 10:49:30 -07:00
Clément Brisset
b234d94d25
Merge pull request #7832 from birarda/session-location
...
repairs to user heartbeats
2016-05-06 15:15:52 -07:00
Chris Collins
8eb61e9470
Merge pull request #7820 from imgntn/usersJS
...
Add users.js to default, start visible to friends only
2016-05-06 16:07:23 -06:00
Stephen Birarda
fb09efc0c9
send location updates immediately on mode change and startup
2016-05-06 12:01:03 -07:00
Stephen Birarda
258c5308db
don't require an active domain connection for location update
2016-05-06 11:57:25 -07:00
Stephen Birarda
ed1ddc2a8b
remove code to update/store wallet balance
2016-05-06 11:54:49 -07:00
Stephen Birarda
7dd8515bd8
send a simple heartbeat if location has not changed
2016-05-06 11:50:40 -07:00
Seth Alves
073d845bb5
show with debug icons when someone else is the simulation owner
2016-05-05 18:33:01 -07:00
Stephen Birarda
a5d09e268d
fix sessionID pull and re-sent for HB
2016-05-05 15:56:16 -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
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
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
