RebeccaStankus
736115b12d
fixed QLabel include
2018-02-09 09:30:25 -08:00
Dante Ruiz
2ae976d256
Merge pull request #10 from sethalves/laser-bug
...
allow overlay children to follow avatar from one domain to another
2018-02-08 17:20:18 -08:00
Seth Alves
5e16623c81
allow overlay children to follow avatar from one domain to another
2018-02-08 17:17:04 -08:00
Bradley Austin Davis
023ee35b2e
Merge remote-tracking branch 'upstream/master' into threaded_qml
2018-02-08 17:16:36 -08:00
Dante Ruiz
071a746342
Merge branch 'master' of github.com:highfidelity/hifi into fix-lasers-going-to-origin
2018-02-08 17:13:58 -08:00
Dante Ruiz
0dac851def
fixing case when grabbed target is destroyed
2018-02-08 17:08:51 -08:00
David Back
f137fadc98
fix uint warnings
2018-02-08 16:56:13 -08:00
David Back
f929fa3bcb
filename space fix
2018-02-08 14:50:30 -08:00
Brad Hefta-Gaub
a6c8172990
Merge pull request #12370 from jherico/fix/deadlock_shaders
...
Prevent deadlock crashes when building shaders at startup
2018-02-08 14:44:46 -08:00
Brad Hefta-Gaub
5aeadf04cf
Merge pull request #12371 from highfidelity/stable
...
Merge stable back into master
2018-02-08 14:39:37 -08:00
David Back
6a23eea6ee
adjust shininess value
2018-02-08 14:15:47 -08:00
RebeccaStankus
14839bc5f4
Some improvements to the log window
...
-Renamed button "Clear Filters" to "All Messages"
-Changed search result matching text to a more visible color
-Made Date/Time text more visible
-Added count of current messages in window
-Set window to show all messages with no filtering upon first opening
2018-02-08 11:26:02 -08:00
divya
97abdb63db
Merge pull request #12364 from jherico/fix/display_plugin_crash
...
Don't trigger a backtrace exception on quitting while in HMD
2018-02-08 11:18:19 -08:00
John Conklin II
d0cfdfb4ca
Merge pull request #12368 from jherico/fix/offscreen_deadlock
...
Fix for deadlock triggering while loading QML engine
2018-02-08 10:37:46 -08:00
Zach Fox
a92e614aff
Bugfix.
2018-02-08 10:35:34 -08:00
Bradley Austin Davis
8748e98b5e
Prevent deadlock crashes when building shaders at startup
2018-02-08 10:23:25 -08:00
Zach Fox
744f679b4e
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_inspectionCertRedesign_v2
2018-02-08 09:51:35 -08:00
John Conklin II
933e1f4735
Merge pull request #12360 from sethalves/fix-accountname-and-goto
...
undo part of #12312
2018-02-08 09:17:24 -08:00
Dante Ruiz
a0ec0f10b4
Merge branch 'master' of github.com:highfidelity/hifi into fix-lasers-going-to-origin
2018-02-08 09:11:50 -08:00
David Back
880ef17c75
Merge branch 'master' of https://github.com/highfidelity/hifi into polymaterials
2018-02-07 18:11:15 -08:00
David Back
784b265a86
better texture option parsing
2018-02-07 18:11:00 -08:00
Andrew Meadows
64ec4dac7a
remove broken DEV_BUILD context
2018-02-07 16:49:42 -08:00
Andrew Meadows
b3452f274e
use glm::nan() for platform-agnostic code
2018-02-07 16:49:22 -08:00
Andrew Meadows
f0bb4d3da7
fix API bitrot and remove extra whitespace
2018-02-07 16:48:43 -08:00
Andrew Meadows
572edab79f
remove dupe const
2018-02-07 16:48:31 -08:00
Bradley Austin Davis
77741c2851
Fix for deadlock triggering while loading QML engine
2018-02-07 16:43:15 -08:00
Seth Alves
31c2b8fea9
oops
2018-02-07 16:31:38 -08:00
Seth Alves
b6ac348428
get children of animated entity joints to follow along, again
2018-02-07 16:30:07 -08:00
Zach Fox
f5e2e4f3d8
Comment change
2018-02-07 15:44:21 -08:00
Bradley Austin Davis
2c514b5d1b
Don't trigger a backtrace exception on quitting while in HMD
2018-02-07 15:28:04 -08:00
Zach Fox
7f0915f6ab
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_inspectionCertRedesign_v2
2018-02-07 15:14:33 -08:00
Zach Fox
e01e88d4ae
This works, but is it correct?
2018-02-07 15:13:22 -08:00
John Conklin II
40851b097f
Merge pull request #12324 from ElderOrb/FB11844
...
Fix the issue with not re-enabling preview after it was auto-disabled by wallet/marketplace
2018-02-07 14:31:20 -08:00
Seth Alves
fdbfeab3ea
Merge branch 'master' of github.com:highfidelity/hifi into fix-accountname-and-goto
2018-02-07 14:22:26 -08:00
Seth Alves
8d35bcb3e5
Merge pull request #12347 from AndrewMeadows/quickfix-tractor
...
remove initial glitch in Tractor (grab) action
2018-02-07 14:22:12 -08:00
Seth Alves
84ed23f547
Merge pull request #12292 from ElderOrb/FB11855
...
FB11855 - Change bubble icon on tablet
2018-02-07 14:03:16 -08:00
John Conklin II
632390e6b0
Merge pull request #12353 from highfidelity/RC63.2
...
HOTFIX 63.3
2018-02-07 13:57:50 -08:00
Zach Fox
2270dcd79d
Merge pull request #12316 from zfox23/commerce_inspectionCertRedesign
...
Commerce: Inspection Certificate Redesign
2018-02-07 13:52:20 -08:00
Zach Fox
7c492ef1cd
Merge pull request #12358 from highfidelity/revert-12316-commerce_inspectionCertRedesign
...
Revert "Commerce: Inspection Certificate Redesign"
2018-02-07 13:51:20 -08:00
Seth Alves
84f4453990
undo part of #12312
2018-02-07 13:32:30 -08:00
Zach Fox
3c34d13ec6
Revert "Commerce: Inspection Certificate Redesign"
2018-02-07 13:22:09 -08:00
Liv Erickson
be4a009e11
make it so only the icon on collapse headers collapses headers
2018-02-07 13:18:32 -08:00
Bradley Austin Davis
fcb59a4ee6
Fixing android
2018-02-07 11:06:30 -08:00
Andrew Meadows
d056e606c1
Merge pull request #31 from sethalves/test-12347
...
fix near-grab
2018-02-07 10:49:49 -08:00
Seth Alves
3e516cd2dd
Merge branch 'quickfix-tractor' of github.com:AndrewMeadows/hifi into test-12347
2018-02-07 10:48:19 -08:00
Andrew Meadows
57aef54237
pull master into AndrewMeadows/quickfix-tractor
2018-02-07 10:46:15 -08:00
Seth Alves
3e913cfcfe
AvatarActionHold has positional and rotational targets
2018-02-07 10:45:13 -08:00
Dante Ruiz
a03cfb835d
Merge branch 'master' of github.com:highfidelity/hifi into fix-camera-update
2018-02-07 10:39:23 -08:00
Zach Fox
a40244b5d2
Merge pull request #12316 from zfox23/commerce_inspectionCertRedesign
...
Commerce: Inspection Certificate Redesign
2018-02-07 10:19:30 -08:00
Liv Erickson
62de08f324
fix issue with top icon changing
2018-02-07 10:16:27 -08:00
