SamGondelman
|
c217f8d80f
|
remove overlay picks from stats qml
|
2019-02-07 14:25:07 -08:00 |
|
SamGondelman
|
e74ff18bef
|
Merge remote-tracking branch 'upstream/master' into NOverlaysFinal
|
2019-02-07 09:49:27 -08:00 |
|
SamGondelman
|
25ca52d892
|
Merge remote-tracking branch 'upstream/master' into NOverlaysFinal
|
2019-02-07 09:48:13 -08:00 |
|
Sam Gateau
|
632d6e8a73
|
Merge pull request #14863 from danteruiz/android-apps-directories
Case 20877: Support CMake time configuration of QmlFileSelectors
|
2019-02-07 09:30:49 -08:00 |
|
Shannon Romano
|
6fd480e51d
|
Merge pull request #14795 from AndrewMeadows/myAvatar-vs-backfacing-triangles-2
case 17773: reduce likelihood MyAvatar will get stuck in mesh geometry when flying around
|
2019-02-06 15:52:31 -08:00 |
|
Jeff Clinton
|
2c666aed5e
|
Merge pull request #14821 from SamGondelman/owningAvatarID
Case 20932: Fix getEntityProperties
|
2019-02-06 14:43:31 -08:00 |
|
Sam Gateau
|
9ff9117a34
|
Merge pull request #14811 from jherico/feature/quest_frame_player
Case 20884: Quest frame player and Oculus libraries
|
2019-02-06 13:15:39 -08:00 |
|
Shannon Romano
|
6a91b54261
|
Merge pull request #14856 from AndrewMeadows/fix-crash-on-early-shutdown-redux
case 21042: fix interface crash on early shutdown, 0.80.0 redux
|
2019-02-06 11:53:49 -08:00 |
|
Shannon Romano
|
30a6f25b69
|
Merge pull request #14851 from AndrewMeadows/myAvatar-unmovable-until-floor
case 20048: don't allow MyAvatar to move until physics enabled
|
2019-02-06 11:52:42 -08:00 |
|
danteruiz
|
d0fecac0d8
|
+android -> +android_interface
|
2019-02-06 11:37:52 -08:00 |
|
Shannon Romano
|
61459d5756
|
Merge pull request #14775 from roxanneskelly/QmlMarketplace
Qml marketplace
|
2019-02-06 11:20:49 -08:00 |
|
Shannon Romano
|
26927aaec6
|
Merge pull request #14847 from AndrewMeadows/trust-the-packet
Case 20959: fix crash for incorrect parsing of AvatarEntity data
|
2019-02-06 11:15:13 -08:00 |
|
John Conklin II
|
3ee412faf7
|
Merge pull request #14854 from danteruiz/quest-default
Case 21037: Allow the script engine to use FileSeclector when loading scriopts
|
2019-02-06 07:21:03 -08:00 |
|
Andrew Meadows
|
16ef30ced0
|
don't flushRepeatedMessages() in LogHandler dtor
|
2019-02-05 17:14:25 -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 |
|
danteruiz
|
30bd9774b2
|
script engine to load platform specific files
|
2019-02-05 13:11:54 -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 |
|
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 |
|
Andrew Meadows
|
5a4960b300
|
add crash::doAssert() for debug purposes
|
2019-02-05 09:00:48 -08:00 |
|
Roxanne Skelly
|
78aa1783a0
|
Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace
|
2019-02-04 15:04:55 -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 |
|
SamGondelman
|
31cf623252
|
fix keyboard focus
|
2019-02-04 12:44:04 -08:00 |
|
Andrew Meadows
|
1d7265f668
|
trust the data in the packet, Luke
|
2019-02-04 09:45:06 -08:00 |
|
SamGondelman
|
4b406bf41c
|
fix getEntityObject and tablet highlighting (Overlays.findOverlays)
|
2019-02-01 16:23:06 -08:00 |
|
SamGondelman
|
391cca787f
|
fix keyboard textures and text display
|
2019-02-01 15:33:53 -08:00 |
|
SamGondelman
|
b80d2a9b06
|
Merge remote-tracking branch 'upstream/master' into NOverlaysFinal
|
2019-02-01 13:33:04 -08:00 |
|
SamGondelman
|
50bfe84aa7
|
fix keyboard intersection, laser alpha
|
2019-02-01 12:11:00 -08:00 |
|
Dante Ruiz
|
778ddad9ac
|
to the spot on first launch
|
2019-01-31 10:52:48 -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 |
|
SamGondelman
|
6e61c02d04
|
fix getEntityProperties
|
2019-01-30 17:17:39 -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 |
|
Brad Davis
|
67cf08e8ae
|
Quest frame player
|
2019-01-30 16:23:22 -08:00 |
|
Brad Davis
|
b1eb0b0a46
|
GPU tweaks
|
2019-01-30 16:23:21 -08:00 |
|
Brad Davis
|
5d1277e1bb
|
GL helpers cleanup
|
2019-01-30 16:23:21 -08:00 |
|
Brad Davis
|
8a1a55189a
|
CMake cleanup and modernization
|
2019-01-30 16:23:14 -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 |
|
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 |
|
Brad Davis
|
a310eec41e
|
Support relative paths in serialized frames
|
2019-01-30 13:15:23 -08:00 |
|
Brad Davis
|
2f92e10142
|
Support using prefering mobile compressed textures on desktop
|
2019-01-30 13:15:22 -08:00 |
|
SamGondelman
|
93e32f1bd5
|
fix skybox depth testing
|
2019-01-30 12:25:48 -08:00 |
|
SamGondelman
|
57ee9786af
|
fix picks vs. local entities
|
2019-01-30 11:42:05 -08:00 |
|
SamGondelman
|
834e44dd3a
|
make polyline's with faceCamera not depend on normal
|
2019-01-30 11:02:24 -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 |
|
SamGondelman
|
56096708d3
|
one more try
|
2019-01-29 15:26:49 -08:00 |
|