Olivier Prat
25ff132fc7
Debugging scripts working again with correct occlusion management
2017-09-06 19:05:15 +02:00
druiz17
6ffcf73d0e
Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1
2017-09-06 09:47:54 -07:00
Olivier Prat
10643feb78
Working with specific zpass rendering for outline. Debug script needs relinking to correct config
2017-09-06 18:40:38 +02:00
Chris Collins
8563a05431
Merge pull request #11255 from misslivirose/feat/tablet-tutorial
...
Removing tutorial paths for first run experience
2017-09-06 09:23:45 -07:00
Olivier Prat
d6ea01c4f3
Created outline task but still need to create specific render job with z-pass shaders
2017-09-06 17:34:29 +02:00
Dante Ruiz
15c853567d
Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1
2017-09-06 08:34:28 -07:00
Olivier Prat
75e06b691f
Simplified version that works directly with metas
2017-09-06 15:59:04 +02:00
Olivier Prat
700d4a4b43
First working version of outline working with selection interface.
2017-09-06 15:47:10 +02:00
Cain Kilgore
d429bd0b01
Changed the Interface text to say 'Task bar' instead of 'system tray'
2017-09-06 13:42:13 +01:00
Cain Kilgore
2a6b523542
Again
2017-09-06 13:09:43 +01:00
Cain Kilgore
14e5cf31f2
Apparently I didn't need 'em
2017-09-06 12:42:17 +01:00
Cain Kilgore
4d0df705a9
Forgot some {}'s
2017-09-06 11:46:57 +01:00
Dante Ruiz
e216fe51ea
Merge pull request #11221 from vladest/flickable_web_pages
...
Flickable web pages
2017-09-05 18:49:57 -07:00
Cain Kilgore
e9f666d970
Made the system tray message specific to Sandbox only
2017-09-06 02:06:10 +01:00
Liv
930243539c
add back first run to false and fix formatting
2017-09-05 17:50:25 -07:00
anshuman64
3a44c6977e
Merge pull request #11300 from ElderOrb/case7196
...
7196 Mouse pointer no longer visible in HMD mode
2017-09-05 17:42:36 -07:00
David Kelly
89cda8d306
oops -- === not ==
2017-09-05 17:15:25 -07:00
David Kelly
1fd30b1e0f
fix passphrase reset
2017-09-05 17:03:11 -07:00
David Kelly
350cee5f35
Wallet cleanup
2017-09-05 16:33:16 -07:00
beholder
41d014ca0c
6718 PR11082: Help text cannot be dismissed by clicking on the text inside the box.
2017-09-06 02:11:40 +03:00
Thijs Wenker
08baa96dc9
Merge pull request #11296 from misslivirose/fix-content-message
...
More detailed domain replacement message
2017-09-06 00:44:48 +02:00
Melissa Brown
fe1b614f39
Merge pull request #11213 from MidnightRift/21341
...
WL 21341 DodgeBall
2017-09-05 15:33:31 -07:00
vladest
85a3771a98
Remove commented out code
2017-09-05 22:19:38 +02:00
vladest
dd6d530853
Merge branch 'master' into flickable_web_pages
2017-09-05 22:14:52 +02:00
Dante Ruiz
ad5b8c438e
Merge pull request #11107 from mnafees/21412
...
CR for Job #21412 - Add "Report a Problem" feature
2017-09-05 13:05:05 -07:00
Dante Ruiz
9f2bdce190
Merge pull request #11005 from Armads/WL21424
...
WL21424 hide head attachments when head joint is hidden
2017-09-05 13:04:14 -07:00
David Kelly
ee70df502e
Merge pull request #11307 from davidkelly/dk/commerceRegression
...
Regression in injection script
2017-09-05 13:02:33 -07:00
Dante Ruiz
e69227aef8
Merge pull request #11209 from vladest/tablet_login_button
...
Added login button to Tablet
2017-09-05 12:59:02 -07:00
David Kelly
4bdfe092cf
Regression in injection script
2017-09-05 12:28:31 -07:00
Dante Ruiz
cefa65de5e
some more small changes
2017-09-05 12:06:32 -07:00
Dante Ruiz
28694dcf8a
small change to contextOVerlays in farActionGrab
2017-09-05 11:46:06 -07:00
David Kelly
b3132e9871
Merge pull request #11304 from davidkelly/dk/commerceResetBug
...
Reset passphrase fix
2017-09-05 11:27:02 -07:00
beholder
c0e7e5a8b2
7385 - Collect Stats on "Exit VR" button
2017-09-05 21:26:35 +03:00
Cain Kilgore
0e57df5483
Deleted unnecessary file
2017-09-05 18:54:54 +01:00
David Kelly
3bc45aefb1
Reset passphrase fix
2017-09-05 10:04:16 -07:00
Andrew Meadows
4b8840f307
Merge pull request #11282 from sethalves/fix-winking-dynamic-children-1
...
fix a bug that caused dynamic children to wink in and out and then vanish
2017-09-05 10:02:47 -07:00
Olivier Prat
b619b2311d
Merged with master
2017-09-05 10:27:53 +02:00
Menithal
856452405e
Made Code abit more concise for better compilation
2017-09-05 08:46:37 +03:00
Cain Kilgore
99a99ce71b
WL 21513 - Update text in the "How to Quit The Sandbox" Prompt
2017-09-04 21:14:26 +01:00
Menithal
119a2703f7
Removed Debug Joints that wasnt used anylonger
2017-09-04 22:20:00 +03:00
Menithal
03e076046b
Added Joint Name check for translations
...
This way if there is a mismatch in the skeleton, the translations are
applied to the models correctly
2017-09-04 22:16:02 +03:00
Brad Davis
e64227bccd
Fix mac build
2017-09-03 09:50:25 -07:00
beholder
c62f9007e9
7196 Mouse pointer no longer visible in HMD mode
...
The issue was caused by creation of additional instances of 'Cursor::Manager' in plugins, which happened because
Cursor::Manager's code is inside static library so every module was getting its own copy of it. As the result cursor-related settings from Application never reached plugins.
The fix is based on converting 'Cursor::Manager' into 'Dependency' to avoid additional instances creation in plugins
2017-09-03 15:20:59 +03:00
Brad Davis
9c03fa0369
Cleanup CMake
2017-09-02 16:15:14 -07:00
beholder
b5faa8ac56
7382 Create Menu does not Work on Tablet
2017-09-02 18:20:00 +03:00
David Kelly
8723ff2df2
Merge pull request #11294 from zfox23/commerce_walletPassphraseModal
...
Commerce: Wallet Passphrase Input Modal
2017-09-01 17:46:09 -07:00
Seth Alves
91ee22e5a7
Merge pull request #11297 from sethalves/fix-protocol-for-pr-11290
...
PR-11290 didn't actually bump protocol version
2017-09-01 17:27:28 -07:00
Seth Alves
0855dfc1c6
PR-11290 didn't actually bump protocol version
2017-09-01 17:26:32 -07:00
Dante Ruiz
3b357ad61e
finshed handControllerGrab refactoring
2017-09-01 17:07:26 -07:00
Seth Alves
8ccacf34f4
Merge pull request #11290 from Menithal/21484
...
WL21484 - Add an additional parameter for entity animations to "allow translation"
2017-09-01 15:34:07 -07:00
