NissimHadar
|
6026044526
|
Merge pull request #12558 from NissimHadar/shadowControlsOffZvork
Shadow control for zones, models and shapes
|
2018-03-08 15:04:19 -08:00 |
|
NissimHadar
|
fda32e4aa4
|
Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork
|
2018-03-08 12:16:36 -08:00 |
|
NissimHadar
|
a703b5a3b5
|
Added check to correct crashing when selecting ambient occlusion from menu.
|
2018-03-08 12:15:26 -08:00 |
|
NissimHadar
|
d1b87b3116
|
Added missing avatar shadows.
|
2018-03-08 12:14:42 -08:00 |
|
Zach Fox
|
a479439b23
|
Merge pull request #12572 from zfox23/sendMoney_connectionInstructions
Show Connection instructions in Send Money when 0 connections
|
2018-03-08 11:20:23 -08:00 |
|
Brad Hefta-Gaub
|
d2e264ab32
|
Merge pull request #12583 from samcake/punk
Fix Local lights not showing anymore
|
2018-03-08 10:31:58 -08:00 |
|
Sam Gondelman
|
1e9cfe29f2
|
Merge pull request #12388 from highfidelity/android
Android Tip
|
2018-03-08 10:18:35 -08:00 |
|
John Conklin II
|
1341774450
|
Merge pull request #12482 from SimonWalton-HiFi/declare-metatype
Add a Q_DECLARE_METATYPE in TextureCache.
|
2018-03-08 09:37:06 -08:00 |
|
Clément Brisset
|
b7ac07f590
|
Merge pull request #12589 from highfidelity/RC65
merge back RC65 to master after RC hotfixes
|
2018-03-07 17:22:41 -08:00 |
|
John Conklin II
|
fcb2f358f8
|
Merge pull request #12579 from SimonWalton-HiFi/RC65
Fix for avatar record only replaying once
|
2018-03-07 14:55:03 -08:00 |
|
Sam Gondelman
|
f51a35455a
|
Merge pull request #12515 from SamGondelman/scriptableMaterials
Material reflection
|
2018-03-07 14:29:31 -08:00 |
|
SamGondelman
|
0aacdcd558
|
docs
|
2018-03-07 13:34:48 -08:00 |
|
John Conklin II
|
7381bb0d7e
|
Merge pull request #12447 from birarda/feat/oven-no-dock-bounce
use QCoreApplication for Oven when headless version is used
|
2018-03-07 12:56:25 -08:00 |
|
John Conklin II
|
e0a11271bf
|
Merge pull request #12573 from birarda/bug/domain-settings-metaverse
fix for getSetting QVariant ref in DomainServer
|
2018-03-07 12:11:45 -08:00 |
|
John Conklin II
|
84c9016e2a
|
Merge pull request #12548 from Atlante45/fix/ds-consolidate-crash
Prevent crash during long backup web requests
|
2018-03-07 12:11:04 -08:00 |
|
Brad Hefta-Gaub
|
9595049e01
|
Merge pull request #12582 from thoys/fix/JSDOCtypo
fix JSDOC typo rule -> role
|
2018-03-07 07:50:07 -08:00 |
|
Bradley Austin Davis
|
3f762c7900
|
Merge pull request #12519 from gcalero/android_experimental_joystick_fixed
Android - Make the virtual pad (joystick) position fixed. Change assets.
|
2018-03-06 20:06:35 -08:00 |
|
Bradley Austin Davis
|
36d02389d9
|
Merge pull request #12499 from gcalero/android_bubble_fix
Set bubble default state off for android.
|
2018-03-06 20:04:59 -08:00 |
|
samcake
|
923c81ae28
|
Swap order of the ZoneRendererJob with DrawLocalLights to fix the local lights
|
2018-03-06 17:38:27 -08:00 |
|
Thijs Wenker
|
866bec0b34
|
rule -> role
|
2018-03-07 02:36:07 +01:00 |
|
Cristian Luis Duarte
|
4f0cecefc3
|
Merge remote-tracking branch 'gcgithub/android_bubble_fix' into android_experimental_joystick_fixed
|
2018-03-06 22:03:39 -03:00 |
|
Cristian Luis Duarte
|
bde2ba9272
|
Merge remote-tracking branch 'gcgithub/android_bubble_fix' into android_experimental_joystick_fixed
|
2018-03-06 22:02:23 -03:00 |
|
Gabriel Calero
|
243e79df4a
|
Fix merge of radar.js
|
2018-03-06 21:59:59 -03:00 |
|
Simon Walton
|
17c12fde9c
|
Fix for HandshakeRequest logic
|
2018-03-06 16:32:04 -08:00 |
|
NissimHadar
|
d72f46ec3e
|
Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork
|
2018-03-06 16:24:53 -08:00 |
|
NissimHadar
|
05e9aa52c9
|
Moved can-cast-shadow checkbox to behaviour section.
|
2018-03-06 16:22:54 -08:00 |
|
Zach Fox
|
04a230c20f
|
Merge pull request #12491 from ElderOrb/FB12523
fix for not re-enabling preview on leaving security-sensitive pages in marketplace
|
2018-03-06 16:19:39 -08:00 |
|
Clément Brisset
|
fdc054c86b
|
Merge pull request #12577 from Atlante45/new-master
RC65 merge back into master
|
2018-03-06 16:17:27 -08:00 |
|
Atlante45
|
edeed95ccc
|
Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master
|
2018-03-06 15:33:12 -08:00 |
|
NissimHadar
|
dbf1be5de3
|
Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork
|
2018-03-06 15:22:40 -08:00 |
|
Gabriel Calero
|
a2327ea0cf
|
Merge branch 'android' into android_bubble_fix
|
2018-03-06 19:03:53 -03:00 |
|
Gabriel Calero
|
069d3e40bc
|
Merge branch 'android' into android_bubble_fix
|
2018-03-06 18:58:49 -03:00 |
|
Stephen Birarda
|
a83b54e10d
|
fix for getSetting QVariant ref in DomainServer
|
2018-03-06 13:55:50 -08:00 |
|
Zach Fox
|
48aa862c16
|
Show Connection instructions in Send Money when 0 connections
|
2018-03-06 13:52:42 -08:00 |
|
Atlante45
|
a23884d0e0
|
Prevent crash during long backup web requests
|
2018-03-06 13:21:02 -08:00 |
|
John Conklin II
|
9294ae0dd2
|
Merge pull request #12567 from elisa-lj11/RC65-update
Added fixed log spam undefined error to RC65
|
2018-03-06 12:40:28 -08:00 |
|
Brad Davis
|
6cc36136bd
|
Fix assert on interaction with stats and avatarinputs during UI setup
|
2018-03-06 12:34:21 -08:00 |
|
Alexander Ivash
|
53e1a0cae5
|
forward 'maybeEnableHmdPreview' if control is not visible
|
2018-03-06 22:25:35 +03:00 |
|
Elisa Lupin-Jimenez
|
15c1f5ba30
|
fixed log spam undefined error
|
2018-03-06 11:01:50 -08:00 |
|
John Conklin II
|
acf1f48d9e
|
Merge pull request #12550 from thoys/fix/grabbableCheckbox
FIX: make the grabbable checkbox function again when dynamic disabled
|
2018-03-05 14:55:38 -08:00 |
|
John Conklin II
|
16bb992d8d
|
Merge pull request #12557 from druiz17/correctly-use-defaults-values
correctly use default values and don't delete userData in entitiesProperties.js
|
2018-03-05 13:15:23 -08:00 |
|
Cristian Luis Duarte
|
0bb56d837d
|
Android - Use a different variable to save the reported dpi by qt in TouchscreenVirtualPadDevice
|
2018-03-05 18:08:06 -03:00 |
|
John Conklin II
|
7bc3848c36
|
Merge pull request #12533 from druiz17/stereo-checkbox
Adding Stereo checkbox in Audio settings
|
2018-03-05 12:45:01 -08:00 |
|
Cristian Luis Duarte
|
c091bc0bb3
|
Fix warnings regarding float to double conversion
|
2018-03-05 17:08:38 -03:00 |
|
Seth Alves
|
7d6927a00d
|
Merge pull request #12555 from druiz17/fix-controllerDispacther-error
fix controllerDispatcher error in logs
|
2018-03-05 12:08:35 -08:00 |
|
Thijs Wenker
|
d7725f1d73
|
make the grabbable checkbox again, respect default true setting
|
2018-03-05 20:54:08 +01:00 |
|
Brad Davis
|
8bfc610cfb
|
Merge remote-tracking branch 'upstream/master' into android
|
2018-03-05 11:48:58 -08:00 |
|
NissimHadar
|
1eb0dde3d2
|
Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork
|
2018-03-05 11:36:39 -08:00 |
|
Dante Ruiz
|
1997cd27bd
|
correctly use default values
|
2018-03-05 11:26:37 -08:00 |
|
Dante Ruiz
|
654770af51
|
fix controller dispatacher error
|
2018-03-05 09:39:26 -08:00 |
|