Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-29 08:28:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
66946 commits 6 branches 1 tag 1.1 GiB
Commit graph

27629 commits

Author SHA1 Message Date
Oren Hurvitz
91e27db9b0 When importing entities from JSON: fixed a null pointer exception if addEntity() failed on any of the entities 2018-04-17 12:32:28 +03:00
David Rowe
f36a5289c9 Add Entities materialData JSDoc 2018-04-17 14:33:11 +12:00
Seth Alves
515c185887 don't call setPort on hifi urls when port is 0 (unset) 2018-04-16 19:10:16 -07:00
Stephen Birarda
898d61fcf7 delay NL reset on login until new username known 2018-04-16 17:45:05 -07:00
David Rowe
c1ede6ef58 Merge branch 'master' into 21815 
# Conflicts:
#	tools/jsdoc/plugins/hifi.js
 2018-04-17 11:54:56 +12:00
David Rowe
9f83c606e9 Controller API JSDoc 2018-04-17 11:46:40 +12:00
Anthony J. Thibault
c29bf51226 Fix for avatar glitches, head and legs folding into chest. 
As a form of compression, when encoding avatar data we only send joints that have changed significantly from the previous packet.
Also, if a joint has the same value as the avatar's default pose, we don't send the full value, instead we mark it with a single bit.

This particular issue is caused by an interaction between the default value flag and the joint changed culling.

When connecting to a domain for the first time, it's possible that a I-frame or 'full' packet will not be sent for several seconds.
In this case, the AvatarMixer has no previous history for values that have not changed recently.
This causes the AvatarMixer to broadcast incorrect values to other clients.
Keep in mind that the AvatarMixer does not have access to the avatar FBX file, so it cannot make an educated guess for this value and uses zero values instead.
(0, 0, 0) for translation and (0, 0, 0, 1) for rotation.

When a translation value of zero is received for the lower legs it will cause the legs to fold into the avatar's chest.

Also, we've uncovered a bug where sometimes values were not sent to the AvatarMixer even when the value was previously default.
This would also exhibit the same issue where zero translation values would be sent.

I've done three things to help mitigate this issue.

1) On first connect to a new AvatarMixer, the Avatar now sends a 'full' packet.
2) When a joint rotation or translation changes from the default value, we transmit it.  No questions asked.
3) Once a SkeletonModel has finished loading we initialize the avatar's _jointData with the proper
   translations from the default pose.  This will help the case where a client receives a non default value, but has no previous history.

(cherry picked from commit 94efdf76a6454f316985f95d6a221adb24788d66)
 2018-04-16 14:58:33 -07:00
Andrew Meadows
4d3109b849 cleanup some comments 2018-04-16 13:31:36 -07:00
Andrew Meadows
ace32193b4 more correct stat names 2018-04-16 13:31:36 -07:00
Ryan Huffman
e9d2912576 Update variable naming in NodeList from Id to ID 2018-04-16 12:03:58 -07:00
Simon Walton
b2e736da70 Remove commented-out code 2018-04-16 11:57:14 -07:00
Sam Gateau
19aa49832b
Merge pull request #12750 from SamGondelman/androidPrimitives 
Forward pipelines for primitives
 2018-04-16 11:18:56 -07:00
John Conklin II
5705bac87f
Merge pull request #12723 from ctrlaltdavid/21801 
HMD API JSDoc
 2018-04-16 11:12:26 -07:00
Gabriel Calero
e3b94b163c Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-04-16 14:55:16 -03:00
Sam Gateau
3ac4a1db2d
Merge pull request #12850 from SimonWalton-HiFi/early-trace 
Enable Interface tracing from earliest execution point
 2018-04-16 10:24:55 -07:00
Zach Fox
071bf35683 Merge branch 'master' of github.com:highfidelity/hifi into discovery_April2018 2018-04-16 10:11:44 -07:00
John Conklin II
40e34f578a
Merge pull request #12891 from samcake/rc66-backToFXAA 
RC66: Reverting TAA to FXAA in rc66 until we fix the aa on tablet
 2018-04-16 09:57:39 -07:00
Olivier Prat
f9cc4994df Merge branch 'master' of http://github.com/highfidelity/hifi into haze 2018-04-16 14:00:33 +02:00
Olivier Prat
6a089be973 Enabled haze to be vertically inverted (ceiling lower than base) 2018-04-16 12:15:08 +02:00
Oren Hurvitz
5e22202355 Material resources: support relative path for emissiveMap 2018-04-16 13:11:03 +03:00
Olivier Prat
9ad9c070f8 Some small shader optimizations 2018-04-16 08:50:18 +02:00
Anthony J. Thibault
63ee8c0ccb Fix for character walk animations in desktop mode. 
(cherry picked from commit f19b1d9890)
 2018-04-15 19:51:55 -07:00
Anthony J. Thibault
f4096c3931 Disable elbow pole vectors, solve from joint limit centers. 
(cherry picked from commit 69f462baeb)
 2018-04-15 19:51:26 -07:00
Seth Alves
7f285c5f90
Merge pull request #12571 from Atlante45/fix/es-concurrent-traversal 
Fix unprotected tree traversals
 2018-04-14 14:33:25 -07:00
Seth Alves
22fd4a7116 fix bug that caused tractor action to go crazy if only one of the two entities it connected were known to interface 2018-04-14 12:27:58 -07:00
Simon Walton
b469cdfda2 More shaders to deferred compile scheme 2018-04-13 17:52:33 -07:00
samcake
8e7b9dfa2b Reverting TAA to FXAA in rc66 until we fix the aa on tablet 2018-04-13 17:30:30 -07:00
Simon Walton
1ab31d9116 Defer some shader compilation to a batch job - WIP 2018-04-13 15:38:48 -07:00
Anthony Thibault
f2c38a77a6
Merge pull request #12877 from hyperlogic/bug-fix/avatar-recording-mtu-overflow 
Fix for avatar recording playback on avatars with many joints
 2018-04-13 14:26:32 -07:00
Seth Alves
426d18ed2a code review 2018-04-13 13:20:06 -07:00
John Conklin II
008c7be369
Merge pull request #12787 from druiz17/fix-offscreen-windows 
hide desktop windows when switching into HMD mode
 2018-04-13 12:17:15 -07:00
Seth Alves
0e081a3944 code review 2018-04-13 10:42:22 -07:00
Olivier Prat
8ef25301cb Fixed some shader program link errors 2018-04-13 17:14:19 +02:00
Olivier Prat
190e9313c7 Sorted out the mix between eye space and world space vectors in translucent object shading 2018-04-13 15:38:55 +02:00
Seth Alves
a56f3f4a10 code review 2018-04-12 19:06:12 -07:00
John Conklin II
98f6899c3d
Merge pull request #12839 from SamGondelman/matMigrate 
Migrate materials from userData to materialData
 2018-04-12 18:24:33 -07:00
John Conklin II
ec10fcb7b7
Merge pull request #12868 from SamGondelman/missingAlpha 
Fix for missing alpha on server restart
 2018-04-12 16:42:34 -07:00
John Conklin II
5322195eee
Merge pull request #12867 from ctrlaltdavid/21836-a 
Fix location.protocol value for serverless domains
 2018-04-12 16:28:31 -07:00
John Conklin II
3d90f93cf1
Merge pull request #12812 from SamGondelman/compression 
Support ETC2/EAC compressed textures
 2018-04-12 16:04:08 -07:00
John Conklin II
67a8e6c82e
Merge pull request #12824 from SamGondelman/matFix 
Fix non-client-only material entities applied to avatar by session ID not being removed on domain switch
 2018-04-12 15:30:11 -07:00
John Conklin II
9123c05eb3
Merge pull request #12859 from samcake/one 
Fix a bug when switching shadow on/off in front of mirror
 2018-04-12 15:25:05 -07:00
Anthony J. Thibault
da319b9af6 Changed version constants into a enum class, to fix macosx warnings. 2018-04-12 15:09:01 -07:00
Gabriel Calero
bd4a7ce4fa Hide jump button while moving. Fix jump button right alignment in pixel 2018-04-12 19:02:03 -03:00
John Conklin II
40ae2913eb
Merge pull request #12847 from SamGondelman/clientMat 
Fix client-only materials on non-avatars
 2018-04-12 14:53:34 -07:00
Gabriel Calero
aaaa17be7b Merge branch 'android_goto_splash' of https://github.com/gcalero/hifi into android_goto_splash 2018-04-12 18:00:05 -03:00
Gabriel Calero
476e1cf7ae Adjust UI with pixel perfect precision. Support devices with on-screen bars. 2018-04-12 17:59:38 -03:00
John Conklin II
1834325970
Merge pull request #12788 from sethalves/fix-immediate-last-edited-by 
set lastEditedBy in local tree whenever a script adds or edits an entity
 2018-04-12 13:02:05 -07:00
John Conklin II
e47dca77ec
Merge pull request #12773 from AndrewMeadows/expire-simulation-ownership 
entity-server will expire stale simulation ownership
 2018-04-12 12:04:52 -07:00
Sam Gateau
77a27b2be7
Merge pull request #12835 from NissimHadar/speedUp1 
ktxInitialDataRequestFinished call to qcDebug(networking) - only in DEBUG
 2018-04-12 11:48:09 -07:00
Anthony J. Thibault
568af7a072 Fix for avatar recording playback on avatars with many joints 
Before this fix, playback of avatar recording frames could overflow the maximum UDP packet size (MTU).
This is playback of a recording was causing all the rotations and translations to be transmitted,
even if the translations were not any different then the avatar default pose.

This explicitly records the rotationIsDefaultPose and translationIsDefaultPose in the recording stream.
This does not break backwards compatibility.
However, it does require new recordings for avatars with large numbers of bones.
 2018-04-12 11:24:26 -07:00
Sam Gateau
20ae247185
Merge pull request #12784 from Zvork/zeye 
Potential bug correction when constructing eye position from Z-buffer depths in shaders
 2018-04-12 11:10:09 -07:00
Simon Walton
a584d67acd Tweaks for clang error and gcc warning 2018-04-12 10:44:41 -07:00
John Conklin II
ef133806be
Merge pull request #12813 from ctrlaltdavid/21826 
Fix Controller.getActions(), .getHardware(), and .getStandard()
 2018-04-12 10:42:25 -07:00
Cristian Luis Duarte
b031c1c070 Merge remote-tracking branch 'gcgithub/android_goto_splash' into android_goto_splash 2018-04-12 14:32:07 -03:00
Simon Walton
5c141aa5e9 Add --disableWatchdog command-line option 
Watchdog still runs but doesn't abort on timeout.
Also fixes for previous tracing improvements.
 2018-04-12 09:28:28 -07:00
Olivier Prat
2adac241d0 Fixed incorrect fragment to eye dir computation in haze 2018-04-12 15:11:10 +02:00
Simon Walton
888fca2127 Qualify getName in task template to satisfy gcc 2018-04-11 18:31:09 -07:00
Simon Walton
adcf991125 Improvements to profiling data capture 
Use code-provided task names for profile blocks; record QML URLs for
loadInternal.
 2018-04-11 17:36:32 -07:00
John Conklin II
5c26166bd6
Merge pull request #12841 from SamGondelman/simAssert 
Fix asserts on domain switch
 2018-04-11 16:02:45 -07:00
David Rowe
c2f0f7ef5f Doc review 2018-04-12 10:54:35 +12:00
Gabriel Calero
865e3a05f1 Move jump button to the right. Adjust position of buttons 2018-04-11 19:33:43 -03:00
David Rowe
7a9e3388fa Merge branch 'master' into 21801 2018-04-12 09:48:51 +12:00
SamGondelman
3270409b7b possible fix for missing alpha on server restart 2018-04-11 14:06:30 -07:00
Cristian Luis Duarte
d993e4938e Merge remote-tracking branch 'hifi/master' into android_goto_splash 2018-04-11 18:03:16 -03:00
David Rowe
b82f2510f2 Fix location.protocol value for serverless domains 2018-04-12 08:55:47 +12:00
John Conklin II
7a905ed420
Merge pull request #12777 from ctrlaltdavid/21813 
Fix Window API position and size reporting
 2018-04-11 13:48:21 -07:00
SamGondelman
e0b2c076ef cleanup and fix forward procedural rendering 2018-04-11 13:03:57 -07:00
Gabriel Calero
578012b662 Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-04-11 16:30:53 -03:00
John Conklin II
88a151481d
Merge pull request #12763 from sethalves/ess-can-edit-localX 
allow ESS to make relative-to-parent edits when entity is not in ESS's octree
 2018-04-11 12:08:35 -07:00
John Conklin II
19bf793910
Merge pull request #12761 from ctrlaltdavid/21821 
Add Controller.Actions.Sprint as synonym of Controller.Actions.SPRINT
 2018-04-11 12:07:32 -07:00
Andrew Meadows
a0f3e3a031 add simulation ownership expiry 2018-04-11 09:40:32 -07:00
Sam Gateau
167db14bdb restoring the sampler desc layout to fix ktx cache and fixing the bug shadow when turning global shadow on off 2018-04-11 00:00:11 -07:00
David Rowe
e37655ecdc Update location.hostname JSDoc per serverless domains 2018-04-11 16:35:49 +12:00
SamGondelman
d841eeb6e9 Merge remote-tracking branch 'upstream/master' into androidPrimitives 2018-04-10 16:52:08 -07:00
Zach Fox
b9d0360ea2 Finally fix the grey security pic bug! 2018-04-10 16:00:53 -07:00
SamGondelman
0c069574c5 forward pipelines for primitives 2018-04-10 15:56:08 -07:00
Zach Fox
a9b9a1cb10 Commerce: Gifts 2018-04-10 15:54:19 -07:00
Seth Alves
f81836c830 support specification of named landing-points in serverless-domain json files 2018-04-10 14:25:59 -07:00
Simon Walton
9b6306601a Merge Clement's PR12700 diffs for early trace start 2018-04-10 13:13:46 -07:00
SamGondelman
bba47ba2b4 materials on client only entities 2018-04-10 11:35:24 -07:00
Sam Gondelman
d781cf43ee
Merge pull request #12775 from Cristo86/android_jump 
Android Control - jump and view sensitivity
 2018-04-09 17:32:57 -07:00
SamGondelman
8f65813924 fix asserts on domain switch 2018-04-09 17:10:49 -07:00
Cristian Luis Duarte
1242446c52 Cleanup controller code 2018-04-09 19:57:55 -03:00
Clément Brisset
c62a701a2d
Merge pull request #12838 from highfidelity/RC66 
RC66 merge back to master
 2018-04-09 13:17:12 -07:00
SamGondelman
9b07880aab migrate materials from userData to materialData 2018-04-09 12:49:03 -07:00
John Conklin II
d281d7b2cb
Merge pull request #12819 from Atlante45/fix/location-hostname 
Fix location.hostname
 2018-04-09 09:42:41 -07:00
Gabriel Calero
b30cb25a3f Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-04-09 12:20:35 -03:00
NissimHadar
f610d6b201 Merge branch 'master' of github.com:highfidelity/hifi into speedUp1 2018-04-07 20:36:57 -07:00
NissimHadar
10ce785ad7 If not in DEBUG then do not call qcDebug (in NetworkTexture::ktxInitialDataRequestFinished) 2018-04-07 09:17:08 -07:00
SamGondelman
6ffdae0500 disable etc2/eac compression on 4.1 2018-04-06 15:38:29 -07:00
SamGondelman
5503c7909a fix materials not disappearing on deletion in certain cases 2018-04-06 15:18:21 -07:00
Cristian Luis Duarte
f556c8d3a7 Merge remote-tracking branch 'hifi/master' into android_jump 2018-04-06 18:02:30 -03:00
John Conklin II
02422ba538
Merge pull request #12820 from birarda/bug/store-serverless-with-tilde 
RC66 - move file ~ expansion from AddressManager to DomainHandler
 2018-04-06 13:31:01 -07:00
Clement
dea5382991 Fix location.hostname 2018-04-06 13:19:07 -07:00
John Conklin II
fe5e797a24
Merge pull request #12816 from SamGondelman/web66 
RC66: Possible fix for QML texture leak
 2018-04-06 13:08:50 -07:00
Cristian Luis Duarte
bd6f0fd59e Make view/rotation control independent of touchUpdate events rate 2018-04-06 16:17:28 -03:00
Stephen Birarda
1ff7939735 move file ~ expansion from AddressManager to DomainHandler 2018-04-06 11:05:17 -07:00
Stephen Birarda
1d76dea9f6
Merge pull request #12818 from highfidelity/RC66 
Merge back RC66 to master
 2018-04-06 10:43:01 -07:00
John Conklin II
c8d109854b
Merge pull request #12800 from huffman/fix/entity-lock 
Remove lock file recovery in entity server
 2018-04-06 10:04:34 -07:00
SamGondelman
d38dadaf58 possible fix for qml texture leak 2018-04-06 09:34:00 -07:00