druiz17
|
ee9ac3e7f9
|
undo unnessary changes
|
2017-09-22 15:38:39 -07:00 |
|
druiz17
|
28d8af0b44
|
Merge branch 'master' of github.com:highfidelity/hifi into module-handcontrollerPointer
|
2017-09-22 15:33:17 -07:00 |
|
druiz17
|
e965b7fff1
|
hand controller pointer
|
2017-09-22 15:32:40 -07:00 |
|
Ryan Huffman
|
883bdc6003
|
Merge pull request #11425 from Atlante45/feat/auto-bake
Asset Browser auto-refresh
|
2017-09-22 13:17:04 -07:00 |
|
Anthony Thibault
|
20cb02dabb
|
Merge pull request #11440 from hyperlogic/bug-fix/text-entity-rendering
Fix for TextEntity rendering, the translation was incorrect
|
2017-09-22 11:19:24 -07:00 |
|
Seth Alves
|
e7f9898517
|
Merge pull request #11437 from jherico/fix/web_render_size
Fix dimensions of rendered web entities
|
2017-09-22 11:14:14 -07:00 |
|
Anthony J. Thibault
|
d3c60f3057
|
Fix for TextEntity rendering, the translation was incorrect
This was caused by the removal of _dimensions from the SpatiallyNestable scale component.
|
2017-09-22 09:44:51 -07:00 |
|
Brad Davis
|
549cb77902
|
Fix dimensions of rendered web entities
|
2017-09-21 20:59:01 -07:00 |
|
Atlante45
|
8583be41ce
|
Don't refresh if not connected to the Asset Server
|
2017-09-21 18:57:09 -07:00 |
|
Clément Brisset
|
ecca1fea93
|
Merge pull request #11434 from Atlante45/fix/running-scripts-tablet
Fix RunningScripts in tablet mode
|
2017-09-21 18:55:20 -07:00 |
|
Clément Brisset
|
c64f709380
|
Merge pull request #11435 from Atlante45/fix/use-after-free
Fix use after free in deleteMappings
|
2017-09-21 18:45:29 -07:00 |
|
druiz17
|
53efe6bfb2
|
working on fix
|
2017-09-21 18:17:05 -07:00 |
|
Atlante45
|
a4b9945226
|
Fix use after free in deleteMappings
|
2017-09-21 16:22:51 -07:00 |
|
Atlante45
|
6cdbf0c44a
|
Fix RunningScripts in tablet mode
|
2017-09-21 15:53:27 -07:00 |
|
Atlante45
|
1a571d0991
|
Add Asset Server auto refresh
|
2017-09-21 14:41:59 -07:00 |
|
Ryan Huffman
|
abbe263142
|
Fix FBXBaker not properly handling textures with the same name
|
2017-09-21 13:40:39 -07:00 |
|
Ken Cooke
|
84786ac8e3
|
Merge pull request #11424 from ctrlaltdavid/21548
Fix recording just made not playing back if reload it
|
2017-09-21 12:19:23 -07:00 |
|
David Rowe
|
a2d8152a3a
|
Coding standard
|
2017-09-22 07:13:32 +12:00 |
|
Seth Alves
|
61efaf7fc2
|
Merge pull request #11420 from druiz17/fix-parenting-overlay-module
nearParentGrab module now sets the correct previous parent id when switching grabbed overlays from one hand to another
|
2017-09-21 09:44:07 -07:00 |
|
Sam Gateau
|
11dd4d2945
|
Merge pull request #11353 from jherico/clean_runtime
Remove old versions of the VC Runtime from the installation directory
|
2017-09-21 09:02:57 -07:00 |
|
Andrew Meadows
|
6b3b3a7448
|
Merge pull request #11382 from ElderOrb/case6618
6618 [Worklist] Add Input Field On Top of Keyboard
|
2017-09-21 08:54:11 -07:00 |
|
Andrew Meadows
|
fcff198b61
|
Merge pull request #11410 from humbletim/21545
WL 21545: Fix up the doppleganger mirror script
|
2017-09-21 08:47:24 -07:00 |
|
Andrew Meadows
|
b803344f0c
|
Merge pull request #11421 from jherico/fix/transform_log_spam
Don't add items to the scene graph until they have a valid parent chain
|
2017-09-21 08:42:56 -07:00 |
|
Ryan Huffman
|
a56303a3fe
|
Merge pull request #11379 from highfidelity/feat/auto-bake
Add auto baking to Asset Server and mesh compression for FBXs
|
2017-09-21 08:33:51 -07:00 |
|
Atlante45
|
dd050e103f
|
Don't redirect to the same hash.
|
2017-09-20 18:45:45 -07:00 |
|
Sam Gateau
|
daf18156f9
|
Merge pull request #11418 from SamGondelman/laserLaser
Don't let scripts control visibility of laser pointer overlays
|
2017-09-20 17:54:00 -07:00 |
|
Anthony Thibault
|
03e278c5ae
|
Merge pull request #11416 from druiz17/stylus-pos
Pull back the stylus position in hand.
|
2017-09-20 17:40:22 -07:00 |
|
David Rowe
|
4ce5e4ac46
|
Fix recording just made not playing back if reload it
|
2017-09-21 12:19:32 +12:00 |
|
Brad Davis
|
27350bd7de
|
Don't add items to the scene graph until they have a valid parent chain
|
2017-09-20 16:52:23 -07:00 |
|
druiz17
|
2c55419c60
|
change tablet forward offset
|
2017-09-20 16:49:45 -07:00 |
|
Dante Ruiz
|
4f328524b1
|
Merge pull request #11182 from vladest/audio_devices_split
Audio devices split
|
2017-09-20 16:43:30 -07:00 |
|
Seth Alves
|
90c97319ea
|
Merge pull request #11408 from druiz17/fix-tablet-input
fixing/improving and cleanup tablet inputs
|
2017-09-20 16:36:07 -07:00 |
|
Clément Brisset
|
48bb36a249
|
Merge pull request #11423 from birarda/feat/auto-bake
fix baking of skybox immediately upon query
|
2017-09-20 16:03:10 -07:00 |
|
Stephen Birarda
|
f6d3960160
|
fix call to maybeBake when looking at skybox
|
2017-09-20 15:58:52 -07:00 |
|
Thijs Wenker
|
4d99430ef1
|
Merge pull request #11419 from highfidelity/feat/optional_makeUserConnection_debug
Optionalize the debug spam of makeUserConnection.js
|
2017-09-20 15:49:17 -07:00 |
|
druiz17
|
949c343604
|
fixing nearGrabParentModule switching grabbed overlays
|
2017-09-20 15:34:01 -07:00 |
|
Thijs Wenker
|
7ea1968b33
|
Tip, Code Writer which comes standard with Windows 10, does enter tabs by default when using the tab key. >=)
|
2017-09-20 14:59:15 -07:00 |
|
Thijs Wenker
|
60a566768a
|
removed debug spam from makeUserConnection, to reactivate it set Settings.setValue('MAKE_USER_CONNECTION_DEBUG', true); and reload the script
|
2017-09-20 14:39:13 -07:00 |
|
SamGondelman
|
f21c99257e
|
don't let scripts control visibility of laser pointers
|
2017-09-20 14:35:29 -07:00 |
|
druiz17
|
92f3dfe2ab
|
move the stylus back a bit
|
2017-09-20 14:23:43 -07:00 |
|
druiz17
|
c20c5ee2b5
|
fixed tablet grabbing issue
|
2017-09-20 14:10:10 -07:00 |
|
vladest
|
c48aba423a
|
Rename check box
|
2017-09-20 22:48:39 +02:00 |
|
vladest
|
7c049d2764
|
Merge branch 'master' into audio_devices_split
|
2017-09-20 22:38:42 +02:00 |
|
anshuman64
|
4a95023a2d
|
Merge pull request #11399 from cain-kilgore/21540
WL 21540 - Make Rotation using Vive Controller Work
|
2017-09-20 13:25:33 -07:00 |
|
Stephen Birarda
|
e75ece8fc4
|
Merge pull request #11415 from birarda/feat/auto-bake
change include for QUrlQuery to be consistent
|
2017-09-20 12:56:52 -07:00 |
|
Stephen Birarda
|
29a9331f14
|
change include for QUrlQuery to be consistent
|
2017-09-20 12:55:50 -07:00 |
|
Seth Alves
|
a4082dc7e9
|
Merge pull request #11411 from ctrlaltdavid/21546
Fix Record app's toolbar button not highlighting when app dialog open
|
2017-09-20 12:31:33 -07:00 |
|
Seth Alves
|
1ca42cc632
|
Merge pull request #11414 from druiz17/fix-tablet-position
Fix tablet up orientation for wiki planet
|
2017-09-20 12:30:00 -07:00 |
|
druiz17
|
2ce6dcf89d
|
fixing spelling error
|
2017-09-20 11:45:42 -07:00 |
|
druiz17
|
5d87036f32
|
make changes requests and slight fixes
|
2017-09-20 11:41:31 -07:00 |
|