Sam Gateau
|
8089d77c78
|
Merge branch 'master' of https://github.com/highfidelity/hifi into workload-bis
|
2018-03-08 19:40:20 -08:00 |
|
Sam Gateau
|
baecdceb73
|
Merge branch 'workload-bis' of github.com:samcake/hifi into workload-bis
|
2018-03-08 19:40:08 -08:00 |
|
John Conklin II
|
cad53a0203
|
Merge pull request #12585 from druiz17/small-tablet-changes
tablet scale and position changes
|
2018-03-08 15:36:06 -08:00 |
|
samcake
|
a0db5c6135
|
Merge with master
|
2018-03-08 15:35:58 -08:00 |
|
NissimHadar
|
6026044526
|
Merge pull request #12558 from NissimHadar/shadowControlsOffZvork
Shadow control for zones, models and shapes
|
2018-03-08 15:04:19 -08:00 |
|
Sam Gateau
|
82f1902368
|
Merge pull request #12604 from samcake/workload
Workload: Cosmetic change to the ui and adding more feature to the ConfigSlider
|
2018-03-08 14:55:01 -08:00 |
|
samcake
|
4dc3685e35
|
Cosmetic change to the ui and adding more feature to the ConfigSlider
|
2018-03-08 14:50:07 -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 |
|
Andrew Meadows
|
0b82e91405
|
Merge pull request #12595 from samcake/workload
Workload: Fixing a bug in RegionState and more ui to debug the Regions of the view
|
2018-03-08 08:29:36 -08:00 |
|
Sam Gateau
|
0170086267
|
Merge branch 'workload' of github.com:samcake/hifi into workload-bis
|
2018-03-07 19:01:56 -08:00 |
|
Sam Gateau
|
ceb38dbc97
|
Merge branch 'workload' of https://github.com/highfidelity/hifi into workload
|
2018-03-07 18:54:21 -08:00 |
|
Sam Gateau
|
62d37b42f3
|
Merge pull request #12594 from samcake/master-workload
Workload: update with upstream master
|
2018-03-07 18:53:38 -08:00 |
|
Sam Gateau
|
46d824c8ba
|
Merge branch 'master' of https://github.com/highfidelity/hifi into workload-bis
|
2018-03-07 18:28:08 -08:00 |
|
Sam Gateau
|
dc122b4ce8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into master-workload
|
2018-03-07 18:14:44 -08:00 |
|
samcake
|
87b159e491
|
merge with upstream, fixed a smal typo bug and clean up the ui
|
2018-03-07 17:30:11 -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 |
|
Sam Gateau
|
a671721e50
|
Merge pull request #12587 from AndrewMeadows/workload-008
workload: add RegionState job
|
2018-03-07 17:02:43 -08:00 |
|
Andrew Meadows
|
77d0c211df
|
fix warnings on windows
|
2018-03-07 15:46:42 -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 |
|
Andrew Meadows
|
0d9b1a7368
|
jobflow: RegionTracker --> RegionState
|
2018-03-07 11:19:47 -08:00 |
|
samcake
|
b26faf55e3
|
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
|
2018-03-07 10:54:02 -08:00 |
|
Dante Ruiz
|
2d448d7208
|
tablet scale and position changes
|
2018-03-07 10:02:35 -08:00 |
|
Andrew Meadows
|
03a5a6f4e0
|
more correct proxy classification for multiple views
|
2018-03-07 08:41:01 -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
|
4a91ac11c9
|
Adding controls of the regions
|
2018-03-06 18:19:02 -08:00 |
|
samcake
|
e2ac5353b1
|
Merge branch 'workload' of https://github.com/highfidelity/hifi into workload
|
2018-03-06 18:03:07 -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 |
|
Sam Gateau
|
7a3e8caa34
|
Merge pull request #12581 from AndrewMeadows/workload-007
workload: fix proxy-region distance math
|
2018-03-06 17:24:30 -08:00 |
|
Andrew Meadows
|
43920b548f
|
fix proxy-region distance math
|
2018-03-06 17:05:49 -08: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 |
|