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

32949 commits

Author SHA1 Message Date
Sam Gateau
cb1bf57bd1 Address pr review comments 2019-06-24 16:54:06 -07:00
raveenajain
f68bb957ff clamp and initialize values 2019-06-24 16:42:38 -07:00
Shannon Romano
f5169093e0
Merge pull request #15828 from roxanneskelly/bugz812 
BUGZ-812 - Log system info on domain connect or connect refusal
 2019-06-24 16:05:55 -07:00
Anna
792cef1a91 fixed bad merge 2019-06-24 15:57:09 -07:00
Sam Gateau
b0ebcc745d Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-24 15:36:28 -07:00
Anna
658898c2e0 Merge branch 'master' of github.com:highfidelity/hifi into snapshot-gamma 2019-06-24 15:31:55 -07:00
Roxanne Skelly
c5883a8d67 CR fixes 2019-06-24 14:58:06 -07:00
SamGondelman
c605c2917f trying to fix entity tree renderer performance 2019-06-24 14:32:56 -07:00
Roxanne Skelly
3c0c1413db fix apple build 2019-06-24 14:12:25 -07:00
Brad Davis
aefa43bd11 Prevent duplicates from accumulating in EntityTree::_needsParentFixup 2019-06-24 13:02:28 -07:00
Ken Cooke
541d45012a Move BlendshapePacking_avx2.cpp to shared 2019-06-24 12:54:58 -07:00
Roxanne Skelly
e39ccff873 BUGZ-812 - Log system info on domain connect or connect refusal 2019-06-24 11:59:57 -07:00
Ken Cooke
75aea88f20 CR feedback 2019-06-24 11:51:03 -07:00
raveenajain
f0660ba381 modify shadow config via single bias 2019-06-24 11:03:10 -07:00
Ken Cooke
87e0f5b2bb Runtime dispatch for AVX2 2019-06-23 10:40:15 -07:00
Ken Cooke
8653118b6c Full SIMD implementation of packBlendshapeOffsets() using AVX2. 
6x speedup over the existing (partial SIMD) version.
60x speedup over the original (pure GLM) version.
 2019-06-23 10:32:57 -07:00
Ken Cooke
cceff21cd0 Pull packBlendshapeOffsets() into separate function 2019-06-23 08:57:56 -07:00
Ken Cooke
87c680382f Strip-mining optimization to improve cache utilization. 
For each mesh: init, accumulate, and pack using a recycled offset buffer.
 2019-06-23 08:42:38 -07:00
Ken Cooke
9e309b095d Fix bug that was packing zero offsets that were never used 2019-06-23 08:00:13 -07:00
Anna
8c3ddc049c works on desktop, android mobile, rift and quest 2019-06-21 20:08:09 -07:00
David Rowe
4c8f281383 Typos etc. 2019-06-22 14:16:17 +12:00
Sam Gateau
a278e6c52c REmoving unecessary job introduced dureing development 2019-06-21 17:24:21 -07:00
David Rowe
b2b7a6ae99 Merge branch 'master' into DOC-79 2019-06-22 12:11:22 +12:00
David Rowe
eb227c6b9a Document Entities entity methods 2019-06-22 11:59:07 +12:00
Sam Gateau
e0d0124caa
Merge pull request #15817 from SamGondelman/cube 
BUGZ-734: Possible fix for black shape issue
 2019-06-21 16:13:36 -07:00
Shannon Romano
13615eb9ff
Merge pull request #15818 from sabrina-shanman/crash_scriptengine_thread 
(BUGZ-619) Fix potential crash when ending script on main thread
 2019-06-21 15:08:42 -07:00
MiladNazeri
11a0c671e5
Merge pull request #15795 from zfox23/SUI/fixLasers 
BUGZ-657; BUGZ-713: Add a copy of the most default JS files because lots of system scripts depend on them being in the default scripts location
 2019-06-21 15:01:24 -07:00
Shannon Romano
33c99da71e
Merge pull request #15816 from roxanneskelly/bugz761 
BUGZ-761 Add locks to OctreeEditPacketSender to protect various members
 2019-06-21 14:39:41 -07:00
David Rowe
e3f971a304 Update Entities examples to have a delay after creation before editing 2019-06-22 09:23:07 +12:00
sabrina-shanman
4fafa2135a Fix potential crash when ending script on main thread 2019-06-21 14:20:15 -07:00
Zach Fox
8044b33d65 This also works 2019-06-21 13:44:31 -07:00
Anna
17163a1ce8 undid some VS auto format changes 2019-06-21 13:41:41 -07:00
Zach Fox
022a47d3ec Merge branch 'master' of github.com:highfidelity/hifi into SUI/fixLasers 2019-06-21 13:41:31 -07:00
David Rowe
0bee5edc47 Fix documentation of Material's albedo and emissive property values 2019-06-22 08:41:30 +12:00
Zach Fox
5067fd4cd2 OK this is definitely working 2019-06-21 13:41:11 -07:00
SamGondelman
8409119ad0 possible fix for black shape issue 2019-06-21 12:58:49 -07:00
Anna
70fbe840a5 added getCompositeFBColorSpace back into updateCompositeFramebuffer 2019-06-21 12:00:20 -07:00
Roxanne Skelly
001eae784a Add locks to OctreeEditPacketSender to protect various members 2019-06-21 11:42:27 -07:00
Sam Gateau
35d7211aca Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-21 11:38:33 -07:00
Anna
3d36c5714f added comments and cleaned up 2019-06-21 11:34:10 -07:00
Anna
250d18d7df restructured gamma correction so snapshots look correct 2019-06-21 11:11:44 -07:00
Sam Gateau
a856fdb3ca getting rid of the resolution Scale on the display plugin 2019-06-21 10:36:25 -07:00
Zach Fox
21454f6256 Merge branch 'master' of github.com:highfidelity/hifi into SUI/fixLasers 2019-06-21 09:44:54 -07:00
amer cerkic
67e42148ef Merge branch 'master' of https://github.com/highfidelity/hifi 2019-06-21 09:43:33 -07:00
Sam Gateau
69bb9ac0b6 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-20 22:23:15 -07:00
David Rowe
3c53cb2e90 Add missing grabDelegetToParent property to JSDoc 2019-06-21 15:21:16 +12:00
David Rowe
52860adc1c Add callEntityMethod() and similar examples 2019-06-21 14:27:51 +12:00
Sam Gateau
22cd631a04 Merge And Modifying the Graphics settings and the dev menu 2019-06-20 17:48:36 -07:00
Anthony Thibault
64a77d07e0
Merge pull request #15814 from hyperlogic/bug-fix/twitchy-finger-fix 
Disable handTouch.js to prevent finger twitching
 2019-06-20 17:03:39 -07:00
David Rowe
a858314898 Remainder of Entities signals' JSDoc 2019-06-21 11:25:10 +12:00
Anthony J. Thibault
3a6d8dc383 Disable handTouch.js to prevent finger twitching 
This PR disables handTouch.js.
handTouch.js allows the fingers to animate on the surface of an object.
However, it can sometimes detect collisions with walls or tables when the avatar is standing next to them.
We will more properly fix handTouch.js in a future PR, but for now we will disable the functionality.

Also, a small bug fix was made to the Rig to prevent the idleOverlayAlpha from exceeding the 0.0 to 1.0 range.
This can cause the fingers to bend incorrectly for a moment.

Also, three new items were added to the Developer > Show Animation Stats panel.

* Joint Override Count: displays the current count of joints that are overriden by MyAvatar.setJointRotation() JS API calls.
* Flow: displays if flow is active of disabled.
* Network Graph: displays if the network anim graph, used for teleportation, is enabled or disabled.

https://highfidelity.atlassian.net/browse/BUGZ-154
 2019-06-20 15:52:36 -07:00
Andy Howell
447f0ca55c
Merge pull request #15807 from AndrewMeadows/fix-crash-bugz512-redux 
BUGZ-512: fix MacOS crash in FakeAudioInputStream on domain-change and shutdown
 2019-06-20 15:42:33 -07:00
amer cerkic
30e295d1a0 push to talk causes fun, removing tttt 2019-06-20 15:12:20 -07:00
amer cerkic
1218f7e014 moved audioclient stop to dtor 2019-06-20 15:10:21 -07:00
Andy Howell
4cc6eae478
Merge pull request #15809 from samcake/nut 
BUGZ-776 : Detect AMD gpu on more than one possible token
 2019-06-20 15:08:41 -07:00
Shannon Romano
7645fcfaa1
Merge pull request #15805 from SamGondelman/shared 
BUGZ-777: Clean up SharedObject code
 2019-06-20 14:35:58 -07:00
Sam Gateau
bde50aa21c Detect AMD gpu on more than one possible token... 2019-06-20 14:24:04 -07:00
Zach Fox
d49205be74 Merge branch 'master' of github.com:highfidelity/hifi into SUI/fixLasers 2019-06-20 09:45:49 -07:00
Andrew Meadows
1ea0dba083 use weak_ptr for fade-out-finished lambda 2019-06-20 09:29:48 -07:00
Andrew Meadows
87d7a0a72f recover the Good Parts from first attempt to fix bugz-512 2019-06-20 09:29:48 -07:00
Sam Gateau
a66bd04810
Merge pull request #15803 from SamGondelman/setPipeline 
BUGZ-703: Possible fix for do_setPipeline crash and other Mac fixes
 2019-06-20 09:27:16 -07:00
Andrew Meadows
b23badf374
Merge pull request #15804 from samcake/wall 
DEV-146, BUGZ-747: Add one call in PlatformInfo::getPlatform() returning the complete description of the platform
 2019-06-20 09:07:19 -07:00
dooglifeSF
12b7cb0262 merge dooglifeSF master into branch Merge branch 'master' into idles_talks_locomotion_improvements 2019-06-20 09:01:59 -07:00
David Rowe
0945bdaac7 Remainder of Entities methods' JSDoc 2019-06-20 15:11:01 +12:00
Shannon Romano
77d91fce33
Merge pull request #15802 from annabrewer/unreachable-code 
Small warning fix
 2019-06-19 18:06:34 -07:00
Shannon Romano
80b118560d
Merge pull request #15801 from SimonWalton-HiFi/recording-playback-null-url 
A null recording clip should be considered an error
 2019-06-19 17:58:46 -07:00
Sam Gateau
b5e4a47375 Proper allocation of the resource in forward and starting to remove the ui as we have it 2019-06-19 17:33:26 -07:00
Sam Gateau
b2631e89e9 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-19 17:11:20 -07:00
SamGondelman
50df5e0bc5 small cleanup to shared object etc. 2019-06-19 16:56:45 -07:00
Sam Gateau
8f04eaae1d Merge branch 'master' of github.com:highfidelity/hifi into wall 2019-06-19 16:53:04 -07:00
Sam Gateau
53094ef70c One more pass of clean up on the platform api, returning the complete description in a single call, adding the version of the OS and deprecating legacy PlatformInfo calls 2019-06-19 16:52:33 -07:00
SamGondelman
fb8cc27fef Merge remote-tracking branch 'upstream/master' into shared 2019-06-19 16:52:04 -07:00
SamGondelman
f2e3218ec0 possible fix for do_setPipeline crash and other mac fixes 2019-06-19 16:34:38 -07:00
Shannon Romano
c7a5d35436
Merge pull request #15799 from roxanneskelly/bugz516a 
BUGZ-516 - add OS type to connect message for logging
 2019-06-19 16:08:13 -07:00
Anna
c215831df8 fixed potential unreachable code warnings 2019-06-19 15:41:53 -07:00
Bradley Austin Davis
e848aca193
Merge pull request #15800 from jherico/fix/gl_context_create_2_0 
BUGZ-402: Don't request an OpenGL 2.0 context via the dock widget
 2019-06-19 15:20:50 -07:00
Simon Walton
7701710aa5 Consider a NetworkClipLoader resource with null URL to be failed 2019-06-19 15:02:16 -07:00
Shannon Romano
12357e5ced
Merge pull request #15797 from annabrewer/gamma-correction-correction 
BUGZ-271: Android gamma correction is too high
 2019-06-19 14:39:09 -07:00
Brad Davis
abb71ba604 Don't request an OpenGL 2.0 context via the dock widget 2019-06-19 14:10:53 -07:00
Roxanne Skelly
2ed5e8aefb add OS type to connect message 2019-06-19 13:53:38 -07:00
Anna
00820b9a9b Merge branch 'master' of github.com:highfidelity/hifi into gamma-correction-correction 2019-06-19 13:49:55 -07:00
Zach Fox
8fdfdbaae4 Another attempt, still not working 2019-06-19 13:31:21 -07:00
SamGondelman
ee8cdd6ae6 Merge remote-tracking branch 'origin/master' 2019-06-19 13:09:13 -07:00
Howard Stearns
ff1d828aaa
Merge pull request #15794 from SimonWalton-HiFi/limit-stats-dump-rate 
Limit the stats-dump rate on packet error
 2019-06-19 11:14:48 -07:00
Anna
45ac07de3b fixed pick profiling 2019-06-19 10:54:28 -07:00
Anna
a19efce173 implemented samuel's requested changes 2019-06-19 10:34:55 -07:00
Simon Walton
b95515933f
Merge pull request #15708 from SimonWalton-HiFi/stun-on-iface-change 
Force new IP port on local address change
 2019-06-19 10:12:36 -07:00
dooglifeSF
4be42a4b9b Merge branch 'master' into idles_talks_locomotion_improvements 2019-06-19 09:57:04 -07:00
Sam Gateau
fdf06ea819 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-19 09:41:45 -07:00
Brad Hefta-Gaub
41c0dc0059
Merge pull request #15796 from SamGondelman/mac 
BUGZ-730: Fix deferred rendering on macbook air
 2019-06-19 08:31:30 -07:00
Anna
803fe1e178 added comments 2019-06-18 19:33:31 -07:00
Anna
a1a3eccad9 fixed gamma on rift, removed extraneous code from quest, clarified variable names 2019-06-18 19:23:40 -07:00
Sam Gateau
1ae06f01b0 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-18 17:41:56 -07:00
SamGondelman
3ff81607ab fix deferred rendering on macbook air 2019-06-18 17:17:21 -07:00
Sam Gateau
251faf2171 Trying to clean up the solution... 2019-06-18 17:08:08 -07:00
Anna
301791c07e fixed gamma on quest 2019-06-18 16:56:14 -07:00
Simon Walton
7d80852544 Reduce reporting period to 1 s 2019-06-18 16:06:47 -07:00
Simon Walton
06b00e93ae Limit the stats-dump on packet error 2019-06-18 15:43:14 -07:00
Seth Alves
0a2f37f9a0 Q_OBJECT and template classes don't mix 2019-06-18 15:36:32 -07:00
Anna
0d543b0f3e Merge branch 'gamma-correction-correction' of github.com:annabrewer/hifi into quest-optimization 2019-06-18 15:26:31 -07:00
Anna
4cf8023d0e fixed gamma on windows 2019-06-18 15:19:02 -07:00
David Rowe
72fdbc0aa8 Entity information and manipulation 2019-06-19 10:18:48 +12:00
raveenajain
55ebfc0789 Merge branch 'master' of https://github.com/highfidelity/hifi into nitpick_shadows 2019-06-18 14:08:50 -07:00
Ken Cooke
5c837406ac
Merge pull request #15788 from kencooke/audio-simd-UBSan-warnings 
Fix UBSan warnings due to SIMD intrinsics
 2019-06-18 13:38:57 -07:00
SamGondelman
c129f84e73 Merge remote-tracking branch 'origin/master' 2019-06-18 11:48:38 -07:00
Sam Gateau
f30eb919c7 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-18 11:24:04 -07:00
Anthony Thibault
10dae7e4d9
Merge pull request #15783 from hyperlogic/feature/anim-debug-draw-improvement 
Improvement to Developer > Avatar > Draw Animation
 2019-06-18 10:50:46 -07:00
Ken Cooke
ce7571dcc1 Replace NEXTPOW2() macros with constexpr (supported since VS2015) 2019-06-18 10:29:23 -07:00
raveenajain
44caf67527 init change, bias triggered via script 2019-06-18 10:02:22 -07:00
Ken Cooke
fa4dfffd8e Update reverb SIMD to avoid benign UBSan warnings due to unaligned load/store 2019-06-18 09:53:54 -07:00
dooglifeSF
ae2c381aaa Merge branch 'master' into idles_talks_locomotion_improvements 2019-06-18 09:42:18 -07:00
dooglifeSF
55524ec815 Set debug text lit time to 20 (again) and move 2 break statements out of comment to fix exception in debug 2019-06-18 09:39:06 -07:00
Ken Cooke
11b599f8f9 Update SIMD resampler to avoid benign UBSan warnings due to unaligned load/store 2019-06-18 09:34:55 -07:00
Anna
1d3867d777 works on quest but not desktop 2019-06-17 18:34:26 -07:00
Anna
72da2bc7e5 init commit 2019-06-17 18:12:52 -07:00
Anthony J. Thibault
c75dc29c03 more assert macro trickery 2019-06-17 16:11:19 -07:00
Anthony J. Thibault
e6e40e7b48 added include<assert.h> 2019-06-17 16:09:24 -07:00
Anthony J. Thibault
d57ea8ac4a Fix for signed/unsigned compare warning 2019-06-17 15:42:20 -07:00
Anthony J. Thibault
4b5d5062b1 Improvement to Developer > Avatar > Draw Animation 
This feature was added to help diagnose the root cause of a rarely occurring finger twitching bug.

Also, some asserts were added to AnimClip to also help catch a rarely occurring crash.
 2019-06-17 14:50:19 -07:00
Seth Alves
e7b852ca38 don't try to create collision shape before compound shape resource is finished loading 2019-06-17 13:18:03 -07:00
David Rowe
23785b5406 Regularize links to individual entity types 2019-06-15 14:06:49 +12:00
Sam Gateau
84a43c0e00 Merge branch 'yellow' of github.com:samcake/hifi into yellow 2019-06-14 17:54:50 -07:00
Sam Gateau
e5a772a9b8 Introducing the HUD layer rendering pass into it s own task and file 2019-06-14 17:54:15 -07:00
Simon Walton
cfcea359b2 Handle local address changes for servers 2019-06-14 16:51:59 -07:00
David Rowe
9c752c9964 Fix up descriptions in EntityType table 2019-06-15 11:07:40 +12:00
David Rowe
b16086de74 Revise JSDoc for key Entities methods plus entity properties 2019-06-15 10:44:56 +12:00
Sam Gateau
864daaef1f Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-14 14:31:19 -07:00
Howard Stearns
723b4ac30f
Merge pull request #15771 from roxanneskelly/bugz516 
BUGZ-696 Drop non DS UDP packets when silent domain checkins exceeds 3 seconds
 2019-06-14 14:13:33 -07:00
Roxanne Skelly
1b31b8cff8 CR fixes 2019-06-14 13:23:33 -07:00
Sam Gateau
aff139f495 excluding any intel gpu from deferred on mac for the next few days 2019-06-14 12:49:11 -07:00
Sam Gateau
b84a8ce668 Merge branch 'nut' of github.com:samcake/hifi into nut 2019-06-14 12:45:59 -07:00
Sam Gateau
c30e65350a Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-14 11:29:48 -07:00
Roxanne Skelly
2be828a84c Merge branch 'master' of https://github.com/highfidelity/hifi into bugz516 2019-06-14 11:24:03 -07:00
Brad Davis
6b34b0971f Enable KHR_robustness option 2019-06-14 11:09:28 -07:00
Roxanne Skelly
5b6911efa4 log username with "haven't heard from" messages 
remove rebind on silent domain checkin
 2019-06-14 10:45:18 -07:00
Simon Walton
0804ffe5eb Merge branch 'master' into stun-on-iface-change 
including PR15765, don't rebind.
 2019-06-14 09:32:06 -07:00
Sam Gateau
12f8c7486b getting rescaling to work for forward yop 2019-06-14 00:48:07 -07:00
howard-stearns
b69d850c8e move constant to the comment that will use it 2019-06-13 19:41:12 -07:00
howard-stearns
c2fe688740 Merge branch 'master' of https://github.com/highfidelity/hifi into stop-rebinding 2019-06-13 19:25:14 -07:00
Sam Gateau
4ba34f9a85 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-13 17:42:52 -07:00
Sam Gateau
5288314d02 Drafting ways to rescale in forward 2019-06-13 17:42:32 -07:00
Roxanne Skelly
3d2b1dbf2b When missing domain checkins, drop packets not destined for DS 2019-06-13 17:25:35 -07:00
Roxanne Skelly
91dce827a5 Merge branch 'master' of https://github.com/highfidelity/hifi into bugz516 2019-06-13 17:05:04 -07:00
Shannon Romano
d6859a42d9
Merge pull request #15762 from annabrewer/quest-login-keybrd 
BUGZ-531: Quest tablet login missing keyboard
 2019-06-13 16:44:49 -07:00
Howard Stearns
11d3f0a629 Merge branch 'master' of github.com:highfidelity/hifi into stop-rebinding 2019-06-13 16:38:40 -07:00
Howard Stearns
8f9fa4a878 stop rebinding 2019-06-13 14:59:27 -07:00
Shannon Romano
bc70abfa10
Merge pull request #15764 from AndrewMeadows/rollback-bugz512 
BUGZ-512: rollback fixes for bugz512
 2019-06-13 14:43:56 -07:00
Shannon Romano
b4f708f4ad
Merge pull request #15755 from samcake/nut 
BUGZ-637: Detecting the problematic GPU on MAC not running properly Deferred render method right now
 2019-06-13 14:32:36 -07:00
Andrew Meadows
db3c7b9194 rollback fixes for bugz512 2019-06-13 13:57:18 -07:00
Anna
7099b04911 appeasing jenkins 2019-06-13 12:21:41 -07:00