Sam Gateau
|
893bbe3a37
|
Merge branch 'master' of github.com:highfidelity/hifi into brown
|
2019-02-05 18:02:09 -08:00 |
|
Sam Gateau
|
b1b6533295
|
Restore clear
|
2019-02-05 18:01:41 -08:00 |
|
John Conklin II
|
ae6672533c
|
Merge pull request #14788 from jherico/feature/quest_gpu_timers
Case 20876: Quest: Support gpu timing on systems with disjoint timer extension
|
2019-02-05 14:49:40 -08:00 |
|
John Conklin II
|
ec0bdba7fb
|
Merge pull request #14814 from sethalves/fix-edit-in-releaseGrab
case 20919: Fix edit in release grab
|
2019-02-05 14:48:59 -08:00 |
|
Jeff Clinton
|
35608c35de
|
Merge pull request #14808 from danteruiz/webengine-fileselector
Case 20879: Migrate webEngine referencing QML into +webengine folder
|
2019-02-05 12:57:38 -08:00 |
|
Sam Gateau
|
59d53bd716
|
Merge branch 'master' of github.com:highfidelity/hifi into brown
|
2019-02-05 12:20:39 -08:00 |
|
Brad Hefta-Gaub
|
936837c886
|
Merge pull request #14823 from Atlante45/fix/scripts-load-fail-master
[master] Fix reload mechanic for entity server scripts
|
2019-02-05 09:19:56 -08:00 |
|
Sam Gateau
|
4089f8c5b0
|
Adding Color filter to the tone mapper
|
2019-02-04 23:45:35 -08:00 |
|
Sam Gateau
|
99251bdd6d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
|
2019-02-04 19:16:14 -08:00 |
|
Jamil Akram
|
35c0af0bf3
|
Merge pull request #14818 from wayne-chen/oculusLoginFeature
MS20925: Oculus login button not appearing
|
2019-02-04 17:20:07 -08:00 |
|
John Conklin II
|
46fc19e101
|
Merge pull request #14840 from danteruiz/tablet-root-color
Case 20973: Fix SendAsset.qml has wrong color
|
2019-02-04 14:27:19 -08:00 |
|
Jamil Akram
|
bab411e001
|
Merge pull request #14822 from hyperlogic/bug-fix/anim-tests-work-again
Make Animation Unit Tests Pass Again
|
2019-02-04 12:45:12 -08:00 |
|
Sam Gateau
|
d0a044120a
|
Adding the sub samples control
|
2019-02-03 21:31:19 -08:00 |
|
Sam Gateau
|
b970c31c5c
|
Correct gamma in oculus, yeah!
|
2019-02-01 17:14:13 -08:00 |
|
Dante Ruiz
|
f4118213b1
|
give tablet root color
|
2019-02-01 10:12:04 -08:00 |
|
Sam Gateau
|
8671e7c499
|
Merge branch 'master' of github.com:highfidelity/hifi into brown
|
2019-01-31 17:11:35 -08:00 |
|
Sam Gateau
|
84db9f4729
|
testing the water...
|
2019-01-31 16:18:47 -08:00 |
|
Jeff Clinton
|
1239ca086d
|
Merge pull request #14831 from danteruiz/the-spot
Case 20942: Goto the spot on first launch (80.0/master)
|
2019-01-31 14:15:24 -08:00 |
|
Dante Ruiz
|
778ddad9ac
|
to the spot on first launch
|
2019-01-31 10:52:48 -08:00 |
|
Sam Gateau
|
196748c4f9
|
Merge branch 'master' of github.com:highfidelity/hifi into brown
|
2019-01-30 18:04:39 -08:00 |
|
Clement
|
283dabc622
|
Fix reload mechanic for entity server scripts
|
2019-01-30 17:29:28 -08:00 |
|
Anthony Thibault
|
2c40b120ca
|
Make Animation Tests Pass Again
|
2019-01-30 17:26:52 -08:00 |
|
Howard Stearns
|
75c1bdbf0d
|
Merge pull request #14812 from SimonWalton-HiFi/avatar-data-packet-overrun
80.0/master: Fix small miscalculation in space requirements for serialized avatar-data
|
2019-01-30 17:00:12 -08:00 |
|
Wayne Chen
|
03789e01da
|
adding fix for oculus store argument check
|
2019-01-30 15:53:21 -08:00 |
|
Seth Alves
|
30d9fe705e
|
avoid possible crash
|
2019-01-30 14:56:50 -08:00 |
|
Seth Alves
|
c6f44234f8
|
avoid possible crash
|
2019-01-30 14:56:02 -08:00 |
|
Seth Alves
|
f33e5ba5ae
|
cleanup
|
2019-01-30 14:47:38 -08:00 |
|
Seth Alves
|
3ab2db96b6
|
deactivate grab action when grab is released
|
2019-01-30 14:43:11 -08:00 |
|
Seth Alves
|
0846eb8ec6
|
attempt to allow position edits in releaseGrab entity-method
|
2019-01-30 14:43:11 -08:00 |
|
John Conklin II
|
10bb637753
|
Merge pull request #14810 from SamGondelman/skybox
Case 20833: Fix procedural skybox depth testing
|
2019-01-30 14:16:36 -08:00 |
|
Dante Ruiz
|
93a91cdba2
|
webengine fileselector
|
2019-01-30 13:57:49 -08:00 |
|
Simon Walton
|
08b21109c1
|
Include the new scale float in min remaining size calculation
|
2019-01-30 13:55:12 -08:00 |
|
SamGondelman
|
93e32f1bd5
|
fix skybox depth testing
|
2019-01-30 12:25:48 -08:00 |
|
Ryan Huffman
|
9c8e21ec6b
|
Merge pull request #14806 from thoys/fix/create/mismatchingEntityHostTypeChildren
MS20893 [CreateApp] Ignore children of mismatching entityHostTypes
|
2019-01-30 09:55:39 -08:00 |
|
Sam Gateau
|
b47ecc9890
|
Merge branch 'master' of github.com:highfidelity/hifi into brown
|
2019-01-30 09:17:02 -08:00 |
|
Jeff Clinton
|
3b84580e88
|
Merge pull request #14794 from SamGondelman/colors
Case 20888: Fix color space
|
2019-01-30 09:09:07 -08:00 |
|
Sam Gateau
|
d418fa282a
|
Merge pull request #14801 from SamGondelman/transparent
Case 20867: Fix translucent textures not getting reset
|
2019-01-30 08:54:48 -08:00 |
|
Jeff Clinton
|
0def57f2c8
|
Merge pull request #14805 from danteruiz/fix-qml-rendering
Case 20902: Give SendAsset.qml a background color
|
2019-01-30 08:54:03 -08:00 |
|
Thijs Wenker
|
132d293c3c
|
skip child entities of mismatching entityHostType when copy/delete/duplication of entities
|
2019-01-30 03:15:32 +01:00 |
|
Dante Ruiz
|
ccf02d8b65
|
fix SendAssets.qml
|
2019-01-29 17:16:27 -08:00 |
|
Jamil Akram
|
cc38a96bff
|
Merge pull request #14415 from Atlante45/feat/rc-branch-script
RC branch script
|
2019-01-29 16:32:49 -08:00 |
|
Shannon Romano
|
4c4a2036c7
|
Merge pull request #14791 from SimonWalton-HiFi/pal_username_update
Don't update PAL namecard with empty strings
|
2019-01-29 15:41:31 -08:00 |
|
SamGondelman
|
56096708d3
|
one more try
|
2019-01-29 15:26:49 -08:00 |
|
SamGondelman
|
e41f5617e9
|
fix color space
|
2019-01-29 14:52:57 -08:00 |
|
Antonina Savinova
|
5d49a3f6df
|
Merge pull request #14732 from kencooke/audio-distattn-improvements
Bug fixes and improvements to audio distance attenuation
|
2019-01-29 14:02:29 -08:00 |
|
Shannon Romano
|
ce0334d10b
|
Merge pull request #14793 from jherico/fix/container_build_gradle_failures
79.0/master: Fix errors and intermittent failures in Android gradle builds in containers
|
2019-01-29 13:32:30 -08:00 |
|
Shannon Romano
|
2dbc4ff2a0
|
Merge pull request #14798 from jherico/fix/jenkins_toolchain_error
79.0/master: Fix erroneous 'CMAKE_TOOLCHAIN_FILE has changed' errors on Jenkins
|
2019-01-29 13:32:08 -08:00 |
|
Shannon Romano
|
72d3eb9d33
|
Merge pull request #14797 from kencooke/audio-injector-stereo-distattn-bugfix2
case 20805: RC78.1 to master: Fix the distance attenuation of stereo local injectors
|
2019-01-29 13:12:51 -08:00 |
|
Jeff Clinton
|
08a3e65f66
|
Merge pull request #14789 from danteruiz/recenter-hmd-log-window
Case 20771: Make sure that the script log is in the correct location when switching to and from HMD
|
2019-01-29 13:03:43 -08:00 |
|
SamGondelman
|
5be6a31b6c
|
possible fix for transparency
|
2019-01-29 12:20:46 -08:00 |
|