Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 14:33:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
77588 commits 71 branches 56 tags 1.2 GiB
Commit graph

77588 commits

This branch
This branch
All branches
Author SHA1 Message Date
NissimHadar
facf8a9305
Merge pull request #15287 from NissimHadar/21893-enableTheUrlCommandLineParameterOnAndroid 
Case 21893: Remove disabling of --url for Android.
 2019-04-03 07:50:31 -07:00
NissimHadar
813d467f49 Ready. 2019-04-03 07:43:07 -07:00
Andrew Meadows
1860e61a30 more correct collision group during grabs 2019-04-03 07:42:56 -07:00
NissimHadar
863fce6321 Change version number. 2019-04-03 07:42:00 -07:00
NissimHadar
a856d10798 Improved error message. 2019-04-03 07:39:59 -07:00
Olivier Prat
6b876e6a27 Fixed warnings on Mac & Ubuntu 2019-04-03 12:05:29 +02:00
Olivier Prat
a79e7a2587 Fixed warning 2019-04-03 11:18:15 +02:00
Roxanne Skelly
80683a7b7a Crashpad fix 2nd try 2019-04-02 17:35:09 -07:00
Roxanne Skelly
ac97a82bad Address a CR comment. 2019-04-02 17:25:00 -07:00
Roxanne Skelly
959b8bfbed Merge branch 'master' of https://github.com/highfidelity/hifi into Case20410 2019-04-02 16:48:32 -07:00
Roxanne Skelly
b841125b19 Case 19858 - crashpad_handler is duplicated outside of the Interface/Sandbox applications on MacOS 2019-04-02 16:42:09 -07:00
danteruiz
ff3e5bbc61 make sure to delete avatar when thier is no reason 2019-04-02 16:20:10 -07:00
raveenajain
fcc7e9af30 minor syntax fix 2019-04-03 00:09:36 +01:00
Anthony Thibault
dd2f8ff2d6
Merge pull request #15309 from hyperlogic/bug-fix/case22010 
Case 22010: Bump protocol number to fix joint order mismatch
 2019-04-02 16:06:11 -07:00
raveenajain
7e5375d40a Merge branch 'master' of https://github.com/highfidelity/hifi into gltf_skinning 2019-04-02 23:38:19 +01:00
David Back
93fc8e2e18 fix continual translation when moving 2019-04-02 15:11:32 -07:00
Ryan Huffman
6a16a37339
Merge pull request #15286 from huffman/fix/oven-query-param-in-model-url 
Case 20928: Fix some URLs with query params not working with model baker
 2019-04-02 15:03:59 -07:00
Ryan Huffman
ea2e62c1ca
Merge pull request #15293 from huffman/fix/damping-on-new-dynamic-entities 
Case 20826: Add damping to new dynamic entities in Create
 2019-04-02 14:28:35 -07:00
Anthony J. Thibault
782b8f5da6 Case 22010: Bump protocol number to fix joint order mismatch 
The joint order change was introduced in PR #15178, to fix an FBX Serializer bug.
 2019-04-02 13:26:50 -07:00
Roxanne Skelly
cf9fe00fd6 Merge branch 'master' of https://github.com/highfidelity/hifi into Case20410 2019-04-02 13:21:52 -07:00
Roxanne Skelly
2d71ec1c75 Case20410 Automatic Content Archives doesn't restore correctly with old Tutorial content set 
The tutorial content set had a content set Id of Null, which caused a failure
to parse the content set.
 2019-04-02 13:19:06 -07:00
raveenajain
1435245279 root cluster 2019-04-02 21:18:16 +01:00
NissimHadar
0ace57b396 Tested on Mac. 2019-04-02 13:04:14 -07:00
David Back
8de75604cf
Merge pull request #15270 from dback2/avatarExporterWarningFixes 
Case 20964, 21758: Avatar Exporter v0.4.1 - bone rule fixes
 2019-04-02 12:20:39 -07:00
NissimHadar
3060835029 Merge branch '22021-specificThresholdsPerGPUVendor-v3.2.0' of github.com:NissimHadar/hifi into 22021-specificThresholdsPerGPUVendor-v3.2.0 2019-04-02 12:04:36 -07:00
NissimHadar
0e0714c398 Can detect GPU and set combo default. 2019-04-02 11:57:55 -07:00
raveenajain
8439019c4e update use of vectors 2019-04-02 19:56:17 +01:00
Shannon Romano
c5c643f90e
Merge pull request #15304 from kitely/fix-invoke-adddelete-wearable 
case 22001: Fixed calls to addingWearable() and deletingWearable()
 2019-04-02 09:09:57 -07:00
NissimHadar
efd9a8935e Clean-up. 2019-04-02 08:59:05 -07:00
Sam Gondelman
414a39bd8a
Merge branch 'master' into particleShapes 2019-04-01 22:20:13 -07:00
Shannon Romano
cf7eeb7355
Merge pull request #15285 from danteruiz/avatar-fading 
Case 21415: Avatars stay behind after they disconnect
 2019-04-01 18:04:42 -07:00
danteruiz
8115ef6d36 addressing more requested changes 2019-04-01 16:46:15 -07:00
Shannon Romano
c865969b5f
Merge pull request #15306 from highfidelity/wayne-chen-patch-1 
Case 22014: Audio Mic Bar not muting/unmuting correctly
 2019-04-01 16:26:20 -07:00
danteruiz
fcb838a71f addressing review requests 2019-04-01 15:43:04 -07:00
Shannon Romano
1bfa0397f0
Merge pull request #15048 from wayne-chen/newAudioMuteStates 
Case 21899: New Audio Mute States
 2019-04-01 15:27:03 -07:00
r3tk0n
4fb7bbabe1 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-04-01 14:52:21 -07:00
Wayne Chen
8df34e5d59
fixing on clicked for audio mic bar 2019-04-01 14:50:16 -07:00
Wayne Chen
a9802570d7
Merge pull request #15305 from wayne-chen/repositionPeopleAppAudioQml 
Case 22003: Reuse Blank Space from Volume Slider
 2019-04-01 14:23:27 -07:00
Shannon Romano
04eac57950
Merge pull request #15300 from jherico/fix/web_camera_master 
Case 21993: Globally disallow use of the camera or microphone by hosted web content
 2019-04-01 14:05:22 -07:00
raveenajain
ce6f2b7bcc Merge branch 'master' of https://github.com/highfidelity/hifi into gltf_skinning 2019-04-01 21:48:55 +01:00
raveenajain
2920fdc966 variables, cluster size 2019-04-01 21:09:14 +01:00
Wayne Chen
abe5748e60
Merge branch 'master' into newAudioMuteStates 2019-04-01 12:24:46 -07:00
Wayne Chen
afdf95c894
remove unused slotted function 2019-04-01 12:20:55 -07:00
Wayne Chen
eba1f271ef
Merge pull request #15253 from wayne-chen/fixPTTMacAudio-master 
Case 21892: Mac Audio Push To Talk fix
 2019-04-01 12:19:10 -07:00
Wayne Chen
0a8d195f6f adding top padding for my name card 2019-04-01 11:32:52 -07:00
Wayne Chen
0d83e622ff Revert "Attempt to add acceleration curve." (#23) 
This reverts commit 9ea476ea89.
 2019-04-01 13:47:49 -04:00
Oren Hurvitz
0b822b2cbc Fixed calls to addingWearable() and deletingWearable(). 
The calls used a parameter type of QUuid instead of EntityItemID. This resulted in the following warnings in the log:

[04/01 18:16:11.012] [WARNING] [default] [53296] QMetaObject::invokeMethod: No such method EntityScriptingInterface::addingWearable(QUuid)
[04/01 18:16:11.012] [WARNING] [default] [53296] Candidates are:
[04/01 18:16:11.012] [WARNING] [default] [53296]     addingWearable(EntityItemID)
 2019-04-01 18:26:00 +03:00
Olivier Prat
e2bc80b46f Fixed for debug 2019-04-01 15:07:29 +02:00
Olivier Prat
4e39a063f7 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2019-04-01 11:08:41 +02:00
Brad Davis
7d4e59bfe3 Force packet version change 2019-03-31 16:44:23 -07:00