Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 11:53:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
75662 commits 71 branches 56 tags 1.2 GiB
Commit graph

75662 commits

This branch
This branch
All branches
Author SHA1 Message Date
John Conklin II
d8390ba18f
Merge pull request #14855 from AndrewMeadows/fix-log-crash-on-early-shutdown 
case 21040: fix Interface crash on early shutdown
 2019-02-06 10:57:34 -08:00
Andrew Meadows
c8a0d61fd1 don't flushRepeatedMessages() in LogHandler dtor 2019-02-05 17:00:18 -08:00
Shannon Romano
6555e6e8ef
Merge pull request #14849 from SamGondelman/owningAvatarID79 
Case 21011: Fix getEntityProperties (79)
 2019-02-05 09:20:15 -08:00
Shannon Romano
f82fed98e5
Merge pull request #14848 from AndrewMeadows/trust-the-packet-0.79 
Case 20958: fix crash for incorrect parsing of AvatarEntity data, for 0.79.0
 2019-02-05 09:18:29 -08:00
SamGondelman
17cafe7cce fix getEntityProperties 
(cherry picked from commit 6e61c02d04)
 2019-02-04 10:41:10 -08:00
Andrew Meadows
5f3e3309b8 0.79.0: trust the data in the packet, Luke 2019-02-04 09:47:04 -08:00
Shannon Romano
d2707ee03d
Merge pull request #14841 from danteruiz/asset79 
Case 20972: Fix SendAsset.qml has wrong color
 2019-02-01 15:52:27 -08:00
Shannon Romano
ffd47f3bb7
Merge pull request #14824 from Atlante45/fix/scripts-load-fail-79 
[79.0] Fix reload mechanic for entity server scripts
 2019-02-01 15:51:27 -08:00
Dante Ruiz
ab6048e922 give tablet root color 2019-02-01 10:20:40 -08:00
John Conklin II
3872cc1830
Merge pull request #14829 from thoys/fix/create/zoneShapeVisualizersIgnorePickrayRC79 
[RC79] MS20909: ignore pickRay for zone shape visualizers
 2019-02-01 09:37:42 -08:00
John Conklin II
3a39e1bc02
Merge pull request #14826 from luiscuenca/FixAssert79 
[RC79] Fix assertion when trying to create multisphere shapeInfo with empty data.
 2019-01-31 16:02:59 -08:00
Shannon Romano
8a68a481f7
Merge pull request #14832 from danteruiz/the-spot79 
Case 20941: Goto the spot on first launch (79.0)
 2019-01-31 13:50:40 -08:00
Thijs Wenker
ca4695377f also ignore picking on the material entity 2019-01-31 22:12:35 +01:00
Shannon Romano
5aeaa87bc4
Merge pull request #14815 from SimonWalton-HiFi/avatar-data-packet-overrun-rc79 
79.0: Include the new scale float in min remaining size calculation
 2019-01-31 11:28:34 -08:00
Dante Ruiz
9082a3f4e5 to the spot on first launch 2019-01-31 10:58:20 -08:00
Thijs Wenker
fbdae18245 ignore pickRay for zone shape visualizers 2019-01-31 19:38:20 +01:00
John Conklin II
e1b9d84ec8
Merge pull request #14819 from wayne-chen/oculusLoginFeature 
MS20921: Oculus login button not appearing (RC79)
 2019-01-31 09:18:14 -08:00
luiscuenca
e2f82eb949 Fix assertion on shapeInfo 2019-01-31 09:35:42 -07:00
Clement
b09a939066 Fix reload mechanic for entity server scripts 2019-01-30 17:28:47 -08:00
Wayne Chen
03789e01da adding fix for oculus store argument check 2019-01-30 15:53:21 -08:00
Simon Walton
c7e9f79200 Include the new scale float in min remaining size calculation 2019-01-30 14:48:37 -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
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
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
Simon Walton
e45634d4ea Merge remote-tracking branch 'upstream/master' into pal_username_update 2019-01-29 11:55:39 -08:00
Brad Davis
8411640ab0 Fix erroneous 'CMAKE_TOOLCHAIN_FILE has changed' errors on Jenkins 2019-01-29 11:53:13 -08:00
Ken Cooke
b0f8afa772 CR: don't expose "position" when not set 2019-01-29 11:21:17 -08:00
Ken Cooke
fa08e42da6 Restore legacy attenuation behavior for system sounds and scripts that do not set position. 
JS detects when "position" was not set by the script.
C++ explicitly sets .positionSet=false when not set (for system sounds).
Local rendering uses a direct mix (no attenuation/HRTF) when not set.
 2019-01-29 11:21:02 -08:00
Jeff Clinton
536a76a791
Merge pull request #14787 from wayne-chen/oculusLoginFeature 
MS20874: Only initialize plugin if started through Oculus Store
 2019-01-29 10:57:03 -08:00
Jeff Clinton
654712cfad
Merge pull request #14757 from gcalero/display_name_and_avatar 
Choose avatar and set display name
 2019-01-29 10:45:11 -08:00
Jamil Akram
f4ead69549
Merge pull request #14722 from luiscuenca/multiSphereAvatar04 
Multi-sphere avatar detailed collisions
 2019-01-29 10:10:04 -08:00
Brad Davis
ee79ee8ed9 Fix errors and intermittent failures in Android gradle builds in container 2019-01-29 09:26:55 -08:00
Sam Gondelman
faeb5b36dc
Merge pull request #14764 from SamGondelman/NOverlays12 
Case 20722: Ring Gizmo Entities to replace Circle Overlays
 2019-01-28 18:09:23 -08:00
Simon Walton
d2af7eed3d Don't update PAL namecard with empty strings 2019-01-28 17:44:04 -08:00
luiscuenca
70d0ebfbec Optimization 2019-01-28 18:39:16 -07:00