Commit graph

32285 commits

Author SHA1 Message Date
amer cerkic
49cecdee6e fixing spacing 2019-04-30 11:52:37 -07:00
amer cerkic
978108b3ba found a more simplified way to stop rendering the mouse unless its the Reticle cursor 2019-04-30 11:34:11 -07:00
Simon Walton
7c405b0714 Don't substitute own avatar; FST URL regex fixes; better error handling 2019-04-29 18:20:54 -07:00
amer cerkic
00a153c730 moving work location 2019-04-29 16:39:34 -07:00
Shannon Romano
69b1b38807
Merge pull request #15471 from danteruiz/mac-window-size
Case 22363: Setting mac window size to 1/2 screen resolution on first Run
2019-04-29 08:38:41 -07:00
Shannon Romano
e6c7bb56f3
Merge pull request #15392 from ctrlaltdavid/M22215
Case 22215: Menu JSDoc update
2019-04-29 08:37:37 -07:00
Simon Walton
a100345416 Ensure banner entity is local entity 2019-04-26 19:21:40 -07:00
Simon Walton
60389017a4 Merge from master, including avatar protocol change
Tony had added HandController version-type.
2019-04-26 18:51:41 -07:00
Simon Walton
1fe8f4332f Fixes to banner; swap out avatar on client; reviewer comments; other WIP 2019-04-26 18:45:48 -07:00
Simon Walton
5ffce7f1a1
Merge pull request #15467 from samcake/sol
case 22353: Mac Game loop performances was borked
2019-04-26 17:19:16 -07:00
danteruiz
d73f685ef2 change mac default window size 2019-04-26 16:56:38 -07:00
David Rowe
407ce745d5 Merge branch 'master' into M22075
# Conflicts:
#	libraries/controllers/src/controllers/Actions.cpp
2019-04-27 10:51:13 +12:00
David Rowe
fbe49bbfd4 Doc review 2019-04-27 10:20:35 +12:00
David Rowe
311826c04d Merge branch 'master' into M22215 2019-04-27 10:03:24 +12:00
Shannon Romano
a00545b48d
Merge pull request #15361 from SaracenOne/falling_push
Case 22121: Allow players to disable automatic falling to flight threshold.
2019-04-26 14:03:52 -07:00
Sam Gateau
d08e2e5ca1 Fixing th emerge conflict 2019-04-26 13:44:49 -07:00
Shannon Romano
324bbadcfc
Merge pull request #15466 from Atlante45/fix/traits-parsing
Case 22255: Add size checks for trait packets parsing
2019-04-26 13:29:50 -07:00
Sam Gateau
c647bbcb16
Merge pull request #15400 from danteruiz/throttle-refresh-rate
Case 22253: Refresh Rate Controller
2019-04-26 12:04:39 -07:00
Shannon Romano
4947f14eb7
Merge pull request #15394 from ctrlaltdavid/M22223
Case 22223: Messages JSDoc update
2019-04-26 10:40:10 -07:00
Anthony Thibault
2c370d9d74
Merge pull request #15460 from hyperlogic/feature/network-opt-faux
Avatar network bandwidth optimization
2019-04-26 10:16:30 -07:00
Anthony Thibault
4761a69a4d
Merge pull request #15438 from luiscuenca/skeletonTrait
Skeleton Trait Implementation
2019-04-26 10:14:47 -07:00
danteruiz
b60e35040e another round of CR 2019-04-26 10:08:06 -07:00
Anthony Thibault
93b03a588f
Merge pull request #15445 from amantley/AnimRandomSwitchSquash
AnimRandomSwitch class for random idle implementation
2019-04-26 10:06:37 -07:00
jennaingersoll
fb1842cbfa
Merge pull request #15455 from ctrlaltdavid/M22330
Case 22330: Regularize JSDoc deprecation notices
2019-04-26 09:48:45 -07:00
Sabrina Shanman
67e511a6ff
Merge pull request #15439 from SamGondelman/textureUsage
Case 22322: Oven handles TextureBakers with same URL but different usage + fix domain baking
2019-04-26 09:40:57 -07:00
Sam Gateau
244bf4b15e
Merge pull request #15468 from raveenajain/gltf_morphTargets
Case 22012: Morph Targets for glTF Avatars
2019-04-26 08:58:11 -07:00
Angus Antley
395a4cc9c4 added final animations and json to the resource 2019-04-25 19:14:31 -07:00
raveenajain
0be36783bf hfm blendshape name 2019-04-26 01:37:26 +01:00
jennaingersoll
24196e2776
Merge pull request #15321 from ctrlaltdavid/M21956
Case 21956: Audio JSDoc
2019-04-25 17:03:58 -07:00
raveenajain
66ad6451f9 morph targets for avatars 2019-04-26 00:40:44 +01:00
Sam Gateau
5d87c4caad REintroduce the gl context make current and done for Macos... 2019-04-25 16:24:00 -07:00
Clement
d36fd6eaa3 Ensure we don't read past the end of packet buffers 2019-04-25 16:22:01 -07:00
danteruiz
9e1671a1bf making requested changes 2019-04-25 16:02:12 -07:00
SamGondelman
6ce6877dfa Merge remote-tracking branch 'upstream/master' into textureUsage 2019-04-25 15:05:27 -07:00
luiscuenca
080f891c9f
Fix scale and refactor debug function 2019-04-25 14:54:40 -07:00
Angus Antley
27ed468946 made changes requested 2019-04-25 14:42:41 -07:00
Angus Antley
76164ecee8 corrected the case where you have a random switch state trigger and a random transition trigger in the same random state machine 2019-04-25 13:57:58 -07:00
Simon Walton
f3efee56c0 Merge remote-tracking branch 'upstream/master' into avatar-verification 2019-04-25 13:40:27 -07:00
Sam Gondelman
ef64de7c04
Merge branch 'master' into openurl 2019-04-25 13:21:27 -07:00
SamGondelman
0e4ea4aff2 fix openDirectory 2019-04-25 13:20:18 -07:00
SamGondelman
a66c515c2a fix url issue and always generateIrradiance 2019-04-25 11:36:29 -07:00
David Rowe
e7eaa7815c Misc. JSDoc fixes 2019-04-25 22:01:03 +12:00
David Rowe
8e69e0b049 Regularize deprecation notices 2019-04-25 20:55:30 +12:00
David Rowe
62cf42732b Fix up deprecated notice 2019-04-25 17:34:49 +12:00
Angus Antley
ea173b8d61 more time for talk ease in and updated json random choice times 2019-04-24 21:29:55 -07:00
Howard Stearns
da1597c5d1
Merge pull request #15327 from Atlante45/fix/warnings
Case 22065: Fix mac warnings
2019-04-24 20:32:29 -07:00
SamGondelman
31b3f0e8f1 possible fix for openUrl exploit 2019-04-24 16:39:31 -07:00
Shannon Romano
70c2b8b8c4
Merge pull request #15443 from Atlante45/fix/asset-server-baking-master
Case 22333: Master: Fix asset server auto-baking
2019-04-24 16:30:14 -07:00
Dante Ruiz
0bdc37859d Refresh Rate Controller 2019-04-24 16:16:08 -07:00
Angus Antley
93b49a86db fixed build error 2019-04-24 15:50:00 -07:00
Angus Antley
45f4cb2018 added animation files and updated ease in function in rig 2019-04-24 14:56:38 -07:00
Shannon Romano
1b67042091
Merge pull request #15428 from raveenajain/gltf_debug
case 22347: glTF move debug code
2019-04-24 10:31:49 -07:00
Sam Gateau
dfce7dcaa6
Merge pull request #15405 from SamGondelman/stencil2
Case 20060: Grab correct stencil masks from display plugins
2019-04-24 09:52:12 -07:00
Shannon Romano
839aa0ebe8
Merge pull request #15446 from amerhifi/questCrashFix
Case 22340 : turning on blit present for quest
2019-04-24 09:24:24 -07:00
Shannon Romano
26e65b7ca6
Merge pull request #15444 from SamGondelman/warning
Case 22262: Comment out QScript type warning
2019-04-24 09:22:58 -07:00
Shannon Romano
0768cd58dc
Merge pull request #15427 from SamGondelman/materialMap
Case 22079: Bake existing materialMap in FST
2019-04-24 09:16:12 -07:00
Angus Antley
5aee2f35f0 updated the ease in function 2019-04-24 08:27:36 -07:00
amantley
7f3101eefb working on the ease in function for the talk idle 2019-04-23 18:13:15 -07:00
SamGondelman
3b746384ca really fix texture baking, and turn off irradiance generation during baking 2019-04-23 16:01:31 -07:00
Clement
86b6341098 Add error reporting + Make temp dir erase safer 2019-04-23 14:54:12 -07:00
Atlante45
329a76d4d6 Fix unix warning 2019-04-23 14:54:12 -07:00
Atlante45
3605b3d560 Patch interface redirect code 2019-04-23 14:54:12 -07:00
SamGondelman
b1f00d6f22 attempt to handle atp redirects from .fbx to .baked.fst 2019-04-23 14:54:10 -07:00
amer cerkic
8a7503ef51 turning on blit present for quest 2019-04-23 11:45:25 -07:00
luiscuenca
b10aca10d4
Fix code standard issues 2019-04-23 09:45:39 -07:00
Shannon Romano
7a9dd49eed
Merge pull request #15411 from Zvork/shadow
Case 22117: Shadows Appear Incorrectly Placed Relative to Avatars
2019-04-23 09:32:53 -07:00
Simon Walton
c03839e49f Fix threaded issues; add verify failed flag to avatar identity packet
Bump packet version
2019-04-23 09:26:17 -07:00
SamGondelman
9deb4e47ad comment out warning 2019-04-23 08:46:54 -07:00
David Rowe
7dde764907 Merge branch 'master' into M21956
# Conflicts:
#	libraries/audio/src/Sound.h
2019-04-23 14:58:23 +12:00
David Rowe
fbc8e1c347 Miscellaneous fixes 2019-04-23 14:49:14 +12:00
David Rowe
6e09c4885f Review updates 2019-04-23 14:35:25 +12:00
SamGondelman
4fc97effda combine snapshotOperator lists per sam's suggestions 2019-04-22 16:22:18 -07:00
Anthony Thibault
d7babe6fbf Added data rates for new hand controller section 2019-04-22 16:16:55 -07:00
Angus Antley
bac5cf9bbb fixed the debug state info updating 2019-04-22 14:35:04 -07:00
Angus Antley
6d9e4188eb added AnimRandomSwitch class and got it integrated with a new avatar-animation.json that includes random idles and random fidgets and random talk 2019-04-22 14:14:17 -07:00
SamGondelman
06fbc8440e Merge remote-tracking branch 'upstream/master' into stencil2 2019-04-22 13:28:30 -07:00
SamGondelman
7245d1a037 handle texturebakers with same url but different usage 2019-04-22 13:24:34 -07:00
luiscuenca
9c90a2b684
more fixes 2019-04-22 13:17:42 -07:00
Olivier Prat
8dabcb76b8 Taking into account comments 2019-04-22 21:30:57 +02:00
luiscuenca
20cac4cd4d
Rotation fix and refactor 2019-04-22 11:38:27 -07:00
Anthony Thibault
0c0b847666 First version of faux joint optimizations
There are still some AJT: TODO sections, mostly about stat tracking for the new Hand Controllers section.

Created a new hand controller section that is optional, when not present hand controllers are assumed to be disabled.
2019-04-22 11:02:13 -07:00
Sabrina Shanman
2a7ef5c5bb
Merge pull request #15426 from sabrina-shanman/bug_oven_texture-scale_master
(case 22282) Fix some baked models not preserving texture scale (master)
2019-04-22 09:52:36 -07:00
Clement
0f2dbd7b6a Fix mac warnings 2019-04-19 20:14:15 -07:00
Sabrina Shanman
16da80b9b6
Merge pull request #15425 from sabrina-shanman/bug_hfm_main-thread
(case 22011) Fix model processing occurring on main thread
2019-04-19 15:40:54 -07:00
SamGondelman
703a4a5700 call leaveEntity when script stops 2019-04-19 15:18:05 -07:00
raveenajain
f2312f77c1 remove unused var 2019-04-19 22:47:47 +01:00
raveenajain
65f4fac993 move debug code 2019-04-19 21:40:57 +01:00
SamGondelman
080cb36170 bake existing materialMap 2019-04-19 13:01:47 -07:00
Shannon Romano
c09e0eca1d
Merge pull request #15416 from SamGondelman/transparent83
Case 22283: Fix transparent textures on baked assets
2019-04-19 12:35:20 -07:00
sabrina-shanman
05a2b11c54 Fix mat4FromVariant 2019-04-19 11:29:28 -07:00
sabrina-shanman
74b4b47a2a Save some bandwidth by not including unity texture transforms in material jsons 2019-04-19 11:29:28 -07:00
sabrina-shanman
9cb5ed888a Remove unnecessary hasTexcoordTransform 2019-04-19 11:29:28 -07:00
sabrina-shanman
7b74561b27 Fix baked models not preserving scale in some cases 2019-04-19 11:29:27 -07:00
SamGondelman
b9934bce70 Merge remote-tracking branch 'upstream/master' into materialMap 2019-04-19 11:27:04 -07:00
Sam Gondelman
38ca699ff5
Merge pull request #15406 from sabrina-shanman/bug_oven_fst-rebake
(case 22271) (RC83) Fix baked models unable to rebake
2019-04-19 10:44:54 -07:00
Shannon Romano
4962bc8c10
Merge pull request #15395 from SamGondelman/oven
Case 22213: Fix materialJSON paths in domain baker
2019-04-19 10:39:42 -07:00
sabrina-shanman
7333b02f34 Fix model processing occurring on main thread 2019-04-19 09:48:30 -07:00
Shannon Romano
d5ab49c64c
Merge pull request #15402 from sabrina-shanman/hfm_bug_model-materials_master
(case 22216) Fix Interface not loading some baked models correctly
2019-04-19 08:53:40 -07:00
Olivier Prat
7d412f9109 Simplified material binding in shadow mode. Added opacity mask to shadow fade. Adjusted default bias. 2019-04-19 11:03:43 +02:00
Sam Gondelman
2604afa454
Merge pull request #15396 from SamGondelman/oven2
Case 22244: Fix oven crash (RC83)
2019-04-18 20:22:36 -07:00