Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 12:57:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
77560 commits 76 branches 59 tags 1.2 GiB
Commit graph

31985 commits

Author SHA1 Message Date
Wayne Chen
b10faa8109
Merge pull request #14738 from r3tk0n/project-freeloco 
Case 21777: Locomotion Project
 2019-04-04 16:18:32 -07:00
Ryan Huffman
b9c81a3899
Merge pull request #15322 from huffman/fix/interactive-window-shutdown-crash 
Case 18299: Fix ScriptEngine not being destroyed on its own thread
 2019-04-04 15:00:50 -07:00
Sam Gateau
bda54c71ea
Merge pull request #15324 from AndrewMeadows/avoid-nan-model-scale 
Case 22054: flat models can introduce nan into geometry
 2019-04-04 14:51:19 -07:00
Sam Gondelman
85bf1da0a1
Merge pull request #15266 from SamGondelman/stencil 
Case 20060: Grab correct stencil masks from display plugins
 2019-04-04 13:36:25 -07:00
Ryan Huffman
cf3a9b1d48 Fix ScriptEngine not being destroyed on its own thread 2019-04-04 13:28:13 -07:00
Sam Gateau
eee5f87dcd
Merge pull request #15264 from Zvork/hdr 
Case 22045: Added support for OpenEXR files (mostly for skyboxes)
 2019-04-04 10:32:11 -07:00
Andrew Meadows
72ac35c6f7 avoid nan in Model::_scale 2019-04-04 08:28:03 -07:00
r3tk0n
17e559f8e8 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-04-03 16:17:00 -07:00
Sam Gateau
5730e92871
Merge pull request #15317 from jherico/fix/21911_alt 
Case 21730:  Restore composite framebuffer to display plugins
 2019-04-03 16:02:47 -07:00
maspring
05cab9a3cc
Merge pull request #15122 from raveenajain/gltf_skinning 
Case 21502: skinned gltf
 2019-04-03 13:45:41 -07:00
Brad Davis
44fc0d21db Revert "Remove _compositeFramebuffer from display plugins" 
This reverts commit cb311408c6.
 2019-04-03 13:43:39 -07:00
r3tk0n
874fb6b6d7 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-04-03 12:42:33 -07:00
r3tk0n
ac2971894b Fix sprint mode scalar. 2019-04-03 11:42:40 -07:00
Shannon Romano
451b2eb391
Merge pull request #15308 from roxanneskelly/Case20410 
Case 20410 - Automatic Content Archives doesn't restore correctly with old Tutorial content set
 2019-04-03 11:07:16 -07:00
Sam Gondelman
1cc2cd3194
Merge pull request #15237 from SamGondelman/particleShapes 
Case 21859: Particle Entity emitter shapes, including model
 2019-04-03 11:03:33 -07:00
Shannon Romano
f2ff5bebc7
Merge pull request #15275 from howard-stearns/ddv-all 
DDV all, including domainUnlimited
 2019-04-03 11:03:16 -07:00
Andrew Meadows
1860e61a30 more correct collision group during grabs 2019-04-03 07:42:56 -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
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
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
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
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
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
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
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
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
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
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
raveenajain
269b910d24 update variables, loops 2019-03-29 18:25:17 -07:00
Shannon Romano
6ccf16dfe5
Merge pull request #15288 from roxanneskelly/Case21726 
Case 21726 - Domain lost recent entity edits upon restart
 2019-03-29 17:06:31 -07:00
Shannon Romano
53c7ade542
Merge pull request #15178 from amantley/fbxJointParentBug 
Fix for FBX Root Being Given Non-Zero Parent
 2019-03-29 17:02:02 -07:00
danteruiz
db17f094da adding entities to fade out list; 2019-03-29 15:23:16 -07:00
Shannon Romano
df97f595f2
Merge pull request #15279 from kitely/allow-emails-with-plus-sign 
case 21982: Allow logging-in with an email that contains a '+' sign
 2019-03-29 13:04:11 -07:00
Sam Gondelman
968dbb825a
Merge pull request #15243 from SamGondelman/proceduralTime 
Case 21876: New procedural uniforms for time, iEntityTime and iLocalCreatedTime
 2019-03-29 11:35:41 -07:00