Brad Hefta-Gaub
41dc498888
add inView simulation stats
2017-02-08 18:32:39 -08:00
Anthony J. Thibault
a209d0372a
First cut of pal on tablet.
2017-02-08 17:34:03 -08:00
Brad Hefta-Gaub
c2171ca08f
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarSimulationStats
...
Conflicts:
libraries/avatars/src/AvatarData.h
2017-02-08 16:52:38 -08:00
Brad Hefta-Gaub
6c41a25032
more stats
2017-02-08 16:51:00 -08:00
Thijs Wenker
6957ac5f8b
Fixes cursor being hidden while Window.browse(), Window.save() are being called from the defaultScript.js thread
2017-02-09 01:31:07 +01:00
Brad Hefta-Gaub
b399420190
CR
2017-02-08 15:42:59 -08:00
Brad Hefta-Gaub
357cc052e1
first cut at simulation stats
2017-02-08 15:32:48 -08:00
Andrew Meadows
e02810458b
clear old avatarEntityData when saving settings
2017-02-08 14:14:48 -08:00
Brad Hefta-Gaub
07cf87749f
Merge branch 'master' of https://github.com/highfidelity/hifi into betterBots
2017-02-08 13:41:33 -08:00
Brad Hefta-Gaub
89368afd68
add back accidentally removed line
2017-02-08 12:52:17 -08:00
Brad Hefta-Gaub
eedfc4fd38
fix various bot related bugs
2017-02-08 12:35:00 -08:00
samcake
363db8a834
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-02-08 11:52:18 -08:00
Andrew Meadows
cc301d1c1a
remove legacy empty avatarEntityData settings
2017-02-08 11:50:15 -08:00
Clément Brisset
eb0a316b6f
Merge pull request #9604 from hyperlogic/feature/allow-multiple-instances
...
Allow multiple instances to run if environment variable is set
2017-02-07 15:32:31 -08:00
samcake
2975f73fc9
merging
2017-02-07 13:13:21 -08:00
Dante Ruiz
27e1bd50d0
reworded text
2017-02-06 19:52:51 +00:00
Dante Ruiz
5ff91c018b
snapshot fix
2017-02-06 19:39:57 +00:00
samcake
9fd1d5114c
Merge branch 'master' of https://github.com/highfidelity/hifi into purple
2017-02-06 10:16:41 -08:00
samcake
c864e57855
first pass on a working image class and the mip generation
2017-02-06 08:51:04 -08:00
samcake
e8cdee71ed
avoid assertion on mac
2017-02-03 22:49:41 -08:00
Anthony J. Thibault
f8e6bd8c6b
Allow multiple instances to run if environment variable is set
...
If the environment variable HIFI_ALLOW_MULTIPLE_INSTANCES is present, the value is ignored,
then you can have multiple copies of interface running on the same machine.
2017-02-03 10:53:26 -08:00
Ryan Huffman
ce9f8bed1b
Remove duplicate fps/downloads PROFILE_COUNTER
2017-02-03 09:41:48 -08:00
Ryan Huffman
9d4fdfa38a
Add Test.profileRange
2017-02-03 09:19:10 -08:00
Ryan Huffman
e181c2a16e
Add script_udpate_rate to trace
2017-02-03 09:19:03 -08:00
Ryan Huffman
f2638637f7
Add thread names to traces
2017-02-03 09:18:58 -08:00
Anthony J. Thibault
b44e5b5a1f
tablet-ui: preferences for tablet ui scaling
...
One for the tablet in HMD mode, one for desktop mode.
The default desktop mode scaling factor is now 75%, which should
reduce the size of the for users with low resolution monitors,
while still being somewhat readable.
2017-02-02 14:05:07 -08:00
Anthony J. Thibault
9d124983a6
Tablet-ui: fix tablet orientation for users in 2d desktop mode
...
Double 180 flip. Once before to account for -z forward of camera.
Once after to account for avatar 180 flip.
2017-02-01 17:48:28 -08:00
Anthony J. Thibault
2760065ee1
Bug fix for previous commit
2017-02-01 13:51:31 -08:00
Anthony J. Thibault
9be6fe2192
tablet-ui: Fix for keyboard focus box still being visible sometimes
2017-02-01 13:44:12 -08:00
Anthony J. Thibault
ca79397ee8
tablet-ui: Fix for keyboard focus
...
Don't allow clicks on non-web entities from stealing focus away from web overlays.
2017-02-01 11:22:17 -08:00
Seth Alves
645aad7bb0
Merge pull request #9557 from hyperlogic/tablet-ui
...
Fix for one-frame lag in the tablet stylus.
2017-01-31 13:37:56 -08:00
Anthony J. Thibault
0f75668923
Moved Model setting of _spatiallyNestableOverride to constructor
2017-01-31 09:36:21 -08:00
Seth Alves
7c2957cfa7
merge from upstream
2017-01-31 08:57:36 -08:00
Anthony J. Thibault
0962a15a06
Fix for one-frame lag in the tablet stylus.
2017-01-30 15:39:55 -08:00
Andrew Meadows
0809149a8c
harvest collision events before disowning
2017-01-30 13:21:23 -08:00
Anthony J. Thibault
39d68828ab
Disable FXAA on tablet overlay in desktop mode.
...
This introduces the "isAA" property to 3d overlays. When false, the overlay is rendered after
the "Antialiasing" render pass. Ironically, disabling FXAA makes the text more readable, which is
essential in 2D desktop mode.
Two new shaders were introduced.
simple_opaque_web_browser_overlay.slf
simple_transparent_web_browser_overlay.slf
These are tailored to write into the main framebuffer instead of the g-buffer.
2017-01-30 11:24:59 -08:00
Anthony J. Thibault
a9b478888c
First cut of Web3DOverlays without FXAA applied.
2017-01-30 11:24:58 -08:00
Seth Alves
fa61bbe2a6
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-26 18:21:39 -08:00
ZappoMan
4c80422a73
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-26 14:34:58 -08:00
Seth Alves
db38503d57
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-26 13:48:59 -08:00
samcake
19858bda78
Merge pull request #9493 from AndrewMeadows/otherAvatars
...
optimize, prioritize, and timebox processing of avatar updates
2017-01-26 13:30:51 -08:00
Seth Alves
0b51b1d566
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-26 11:00:02 -08:00
Brad Hefta-Gaub
5ada689ab7
Merge pull request #9497 from ctrlaltdavid/fix-clara-download
...
Fix intermittent Clara.io download crashes
2017-01-26 10:58:27 -08:00
Andrew Meadows
5783db910b
remove some unhelpful trace profiling data
2017-01-26 08:35:26 -08:00
Andrew Meadows
82f52b9658
fix bug: Avatar instance not getting deleted
2017-01-26 08:35:26 -08:00
Andrew Meadows
2264c29604
less magic
2017-01-26 08:35:26 -08:00
Andrew Meadows
0f09e60acd
remove unhelpful comment
2017-01-26 08:35:26 -08:00
Andrew Meadows
01e14eec47
remove commented out cruft
2017-01-26 08:35:26 -08:00
Andrew Meadows
ac180758ad
sort, optimize, and timebox process avatar updates
2017-01-26 08:35:26 -08:00
Andrew Meadows
d3dcc2b415
remove cruft: billboard option for Head::simulate()
2017-01-26 08:35:26 -08:00
Andrew Meadows
887707426e
remove cruft: Head::getScalePivot()
2017-01-26 08:35:26 -08:00
Andrew Meadows
69a7b1ef76
move some stuff out of Avatar::simulate()
...
call it explicity in AvatarManager::updateOtherAvatars()
2017-01-26 08:35:26 -08:00
Andrew Meadows
b8afc87ad9
remove cruft
2017-01-26 08:35:26 -08:00
Andrew Meadows
e65d9309b3
remove cruft: Avatar::setShouldDie()
2017-01-26 08:35:26 -08:00
Andrew Meadows
e363423992
compute priority of avatar and sort before update
2017-01-26 08:35:26 -08:00
Andrew Meadows
88bf126168
remove old avatar culling and LOD logic
2017-01-26 08:35:25 -08:00
Andrew Meadows
08bba5f45f
add and remove some profile data points
2017-01-26 08:35:25 -08:00
ZappoMan
3c3dcbbbaa
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-26 08:20:03 -08:00
Anthony J. Thibault
5eb7849a80
Support for Window.geometryChanged signal.
2017-01-25 16:43:35 -08:00
Seth Alves
c317ba8054
merge from upstream
2017-01-25 15:57:53 -08:00
Seth Alves
ff8d13ecc7
get button-states for toolbar buttons working again
2017-01-25 15:38:54 -08:00
Seth Alves
98f1664a46
use a setting to decide which UI is enabled
2017-01-25 14:17:45 -08:00
Atlante45
f540c94113
Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr
2017-01-25 13:06:49 -08:00
Seth Alves
f18094f565
make use of tablet or HUD depend on a single variable. avoid some duplicated code
2017-01-25 12:00:34 -08:00
David Rowe
74b878a276
Fix threading of message box updates
2017-01-25 17:48:58 +13:00
Seth Alves
b679d94585
remove commented-out code
2017-01-24 16:04:22 -08:00
Seth Alves
601a35a9b6
try a different way of repairing tablet after a domain change
2017-01-24 15:49:49 -08:00
Seth Alves
19cf84dd5d
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-close-tablet-upon-goto
2017-01-24 12:49:47 -08:00
Seth Alves
df9bc91f01
fix near-grab to equip handoff
2017-01-24 11:39:26 -08:00
Seth Alves
4de0b94b6c
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-close-tablet-upon-goto
2017-01-24 09:42:20 -08:00
Seth Alves
a28becfb1a
close tablet before changing domains
2017-01-24 09:42:12 -08:00
Anthony J. Thibault
432bb27119
The tablet Help button should be active if window is visible
2017-01-23 18:37:08 -08:00
Seth Alves
281b7a6eca
close tablet anytime AddressManager::hostChanged fires
2017-01-23 16:49:05 -08:00
Seth Alves
69252deb2e
close the tablet when going to a new domain
2017-01-23 16:28:56 -08:00
Seth Alves
200105c856
Merge pull request #9484 from hyperlogic/tablet-ui
...
UI navigation work with game pads
2017-01-23 16:01:45 -08:00
Anthony J. Thibault
584a9a3c98
UI navigation work with game pads
...
The tablet UI can be long lived, unlike the previous VRMenu.
So instead of using a dynamic mapping that was only enabled when the VRMenu was shown, standard_navigation.json.
standard_navigation is always active. Also, standard_navigation.json has been changed.
Left and Right click and stick events never become UINav events. Only Dpad A, B, X, Y, LB and RB are mapped to UINav events.
2017-01-23 15:22:49 -08:00
ZappoMan
81b5a3c585
more cleanup
2017-01-23 15:12:54 -08:00
ZappoMan
29fff2e556
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-23 13:09:59 -08:00
ZappoMan
292d472a59
checkpoint - got first cut at distance based rotation tolerance working
2017-01-23 13:06:29 -08:00
Seth Alves
be8bc9652b
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-23 09:44:04 -08:00
Ryan Huffman
9b1cd52fb4
Add the ability to get the context that a script is running in
2017-01-23 08:58:01 -08:00
samcake
afd3c3b504
Merge pull request #9436 from AndrewMeadows/cauterization-cleanup
...
Cleanup of code that decides not to render head when in first-person
2017-01-20 14:49:08 -08:00
Atlante45
04e81c5db7
Fix interface build
2017-01-20 10:53:57 -08:00
Seth Alves
6641f9bafd
Merge pull request #9444 from druiz17/homeButtonFix
...
Home button is now an overlay
2017-01-20 10:32:31 -08:00
Stephen Birarda
25bd6fa2c1
move recording interface to Agent/Application only
2017-01-20 10:27:08 -08:00
Seth Alves
c492319be2
merge from upstream
2017-01-20 10:14:11 -08:00
Dante Ruiz
a319db3cb4
removed duplicate code
2017-01-20 00:57:48 +00:00
Dante Ruiz
1e7e4576cc
comparing with ID instead of strings
2017-01-19 16:38:55 -08:00
Andrew Meadows
10cdea9cd8
cleanup model fade logic
2017-01-19 14:17:50 -08:00
Seth Alves
47b59ffae3
don't save tablet to Settings when logging out or switching domains
2017-01-19 14:10:48 -08:00
Andrew Meadows
9631864ae2
make soft attachments cauterized for MyAvatar
2017-01-19 12:56:07 -08:00
Andrew Meadows
5a2e337758
fix comments
2017-01-19 12:56:07 -08:00
Andrew Meadows
bfbef91f53
re-enable cauterization of meshes for MyAvatar
2017-01-19 12:56:07 -08:00
Andrew Meadows
1a3fa84985
add newline at EOF
2017-01-19 12:56:07 -08:00
Andrew Meadows
189da81bb1
fix for crash on unloaded model
2017-01-19 12:56:07 -08:00
Andrew Meadows
3dd8fd838b
move cauterization out of Model class
2017-01-19 12:56:07 -08:00
David Kelly
d9fbf832e2
Some initial analytics for PAL usage
2017-01-19 11:35:17 -08:00
Seth Alves
eb25e1c12d
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-19 09:41:49 -08:00
Brad Davis
70de00c6bf
Merge pull request #9421 from jherico/more_trace_details
...
Additional trace details for GPU timing, frame data updates
2017-01-19 09:12:34 -08:00
Dante Ruiz
30b57b62da
toggle help
2017-01-19 08:12:49 -08:00
