ZappoMan
636ade9eb7
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-09 11:29:54 -08:00
Ryan Huffman
39070fe0d1
Merge pull request #9065 from huffman/fix/script-engine-abuse
...
Fix deleteLater() vulnerability in scripts
2017-01-09 11:02:28 -08:00
Chris Collins
30d5f70e11
Merge pull request #9278 from jherico/cpu_opt_scene
...
More low level optimizations
2017-01-09 10:10:40 -08:00
Brad Hefta-Gaub
ef7b9bfde0
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-09 10:07:05 -08:00
Brad Hefta-Gaub
785582057e
more comments
2017-01-08 20:35:52 -08:00
Brad Hefta-Gaub
a1ee76d250
Merge pull request #9332 from cozza13/21123
...
Change default scripts to include clara
2017-01-08 09:15:41 -08:00
Chris Collins
215659c695
Enabled the ability to have other marketplaces.
...
Enabled the ability to have other marketplaces.
2017-01-07 08:17:13 -08:00
Brad Hefta-Gaub
1a7b5ab520
Merge pull request #9326 from jherico/oculus_budget_stats
...
Adding tracking of Oculus renders, submits, and frames that are over budget
2017-01-06 18:18:16 -08:00
Howard Stearns
b432ffa78d
Merge pull request #9323 from zfox23/FixPalSpaceBubbleInteraction
...
Fix the PAL & Space Bubble interaction
2017-01-06 16:47:43 -08:00
Zach Fox
afa6d54ac4
Actually fix the behavior...
2017-01-06 14:20:25 -08:00
Zach Fox
dec41f67cc
Fix bugs and generally fix behavior
2017-01-06 13:58:23 -08:00
Howard Stearns
36c99a604b
Merge pull request #9319 from howard-stearns/edit-button-to-select-in-pal
...
Edit button to select in pal
2017-01-06 13:17:29 -08:00
Clément Brisset
48459be13c
Merge pull request #9312 from ZappoMan/fixMouseLasers
...
fix competition between seek mouse and lasers
2017-01-06 13:11:01 -08:00
Brad Davis
15b9e750f9
Adding tracking of Oculus renders, submits, and frames that are over budget
2017-01-06 10:51:26 -08:00
Clément Brisset
0a08563b1f
Merge pull request #9325 from Atlante45/log-dialog
...
Log dialog doesn't float on top
2017-01-06 10:40:09 -08:00
howard-stearns
2f5f53c8e4
cr
2017-01-06 10:28:09 -08:00
howard-stearns
b149fa3d79
Merge branch 'master' of https://github.com/highfidelity/hifi into edit-button-to-select-in-pal
2017-01-06 10:21:22 -08:00
Howard Stearns
220880d6f8
Merge pull request #9311 from davidkelly/dk/prettierPAL
...
Somewhat prettier node overlays for PAL
2017-01-06 09:54:38 -08:00
Brad Hefta-Gaub
349f0763e5
Merge pull request #9310 from PhilipRosedale/chair
...
Simple chair script
2017-01-06 08:18:31 -08:00
David Kelly
a107b2f06e
lost my - sign
2017-01-06 08:44:22 -07:00
Zach Fox
b7d64804c1
Remove errant //FIXME
2017-01-05 21:55:09 -08:00
Brad Hefta-Gaub
251495978c
more work on delta sending
2017-01-05 19:46:19 -08:00
Atlante45
428a7f3bf8
Log Dialog doesn't float on top
2017-01-05 17:49:39 -08:00
David Kelly
88ed96918a
Merge branch 'master' of github.com:highfidelity/hifi into dk/prettierPAL
2017-01-05 18:30:28 -07:00
David Kelly
4504b31c1d
Bugfix, plus minor cr stuff
...
Seems to solve the 'due north' issue - we now have the main overlay as
the sphere, and it is the only thing clickable. The model is no longer
clickable, so you cannot click clouds to select things. Prevents some
confusion when opaque objects have ignoreRayIntersection, allowing you
to select a cloud you cannot see (i.e clicking near but not on the
sphere you can see).
2017-01-05 18:20:40 -07:00
Zach Fox
495925a017
This behavior was harder to change than expected...
2017-01-05 16:58:32 -08:00
howard-stearns
83685740c4
change wording for common case
2017-01-05 16:37:40 -08:00
howard-stearns
f5c4535115
Merge branch 'master' of https://github.com/highfidelity/hifi into edit-button-to-select-in-pal
2017-01-05 16:29:34 -08:00
Howard Stearns
3f54428744
Merge pull request #9313 from howard-stearns/pal
...
People Action List
2017-01-05 15:49:56 -08:00
David Kelly
1f3c2bb271
Merge branch 'master' of github.com:highfidelity/hifi into dk/prettierPAL
2017-01-05 16:35:47 -07:00
howard-stearns
ef02c84759
further simplification of letterbox, and use for selection failures
2017-01-05 14:46:32 -08:00
howard-stearns
0cdeac8736
abstract out letterbox message
2017-01-05 14:32:31 -08:00
David Kelly
ef92a091b2
node overlay model now an asset
2017-01-05 15:19:09 -07:00
David Kelly
c95e880677
scale offsets to avatar height
2017-01-05 15:04:40 -07:00
Brad Hefta-Gaub
86c0d76955
Merge pull request #9314 from jherico/present_priority
...
Use a higher thread priority for Oculus present
2017-01-05 14:02:50 -08:00
howard-stearns
c4c1ea9578
Merge branch 'master' of https://github.com/highfidelity/hifi into edit-button-to-select-in-pal
2017-01-05 14:02:44 -08:00
Howard Stearns
64a706f9e2
Merge pull request #9315 from zfox23/FixModJSAfterPAL
...
Allow for compatibility with old mod.js script after PAL changes
2017-01-05 14:00:41 -08:00
howard-stearns
0670a4689f
Merge branch 'master' of https://github.com/highfidelity/hifi into edit-button-to-select-in-pal
2017-01-05 13:57:44 -08:00
Philip Rosedale
9bd858c1ab
no log spam
2017-01-05 13:49:38 -08:00
Philip Rosedale
07ecf60485
remove sit when close
2017-01-05 13:48:31 -08:00
Howard Stearns
bbf7d16537
process consistent select message
2017-01-05 13:45:03 -08:00
Howard Stearns
28326ff47a
Merge pull request #9306 from zfox23/PALVisualUpdates
...
Fix PAL scrollbar; add helper popup to ADMIN tab
2017-01-05 13:29:21 -08:00
Zach Fox
2f503d0bcc
Allow for compatibility with old mod.js script
2017-01-05 13:25:27 -08:00
David Kelly
2949560e90
Corrected lame math error
...
so we are centered now, and put the overlay up a bit higher. Still need
to make that scale properly with avatar size.
2017-01-05 14:22:35 -07:00
Philip Rosedale
65b9aaed1b
one more try
2017-01-05 13:13:50 -08:00
Philip Rosedale
a689d52004
wrap far trigger too with seated check
2017-01-05 13:08:50 -08:00
Philip Rosedale
0ad9a8625b
Added far trigger
2017-01-05 12:58:26 -08:00
howard-stearns
47aa1e4f8e
add pal to defaultScripts
2017-01-05 12:23:17 -08:00
Brad Hefta-Gaub
cb69e70781
fix competition between seek mouse and lasers
2017-01-05 11:31:50 -08:00
Brad Davis
9bf4804d3d
Use a higher thread priority for Oculus present
2017-01-05 11:04:50 -08:00
