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
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
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
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
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
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
John Conklin II
5c26166bd6
Merge pull request #12841 from SamGondelman/simAssert
...
Fix asserts on domain switch
2018-04-11 16:02:45 -07:00
SamGondelman
3270409b7b
possible fix for missing alpha on server restart
2018-04-11 14:06:30 -07: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
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
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
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
David Rowe
8d25a745f0
Fix Controller.getActions(), .getHardware(), and .getStandard()
2018-04-06 17:21:49 +12:00
SamGondelman
44ea5a2e84
add etc2/eac support
2018-04-05 18:59:22 -07:00
Seth Alves
8de545acdf
add new address accessor for 'public' addresses, use it for snapshot and stream
2018-04-05 13:39:51 -07:00
Seth Alves
148007435e
update comment
2018-04-05 13:01:31 -07:00
Seth Alves
1de878eb9c
fix logic
2018-04-05 12:43:03 -07:00
Seth Alves
81ba875ad2
currentShareableAddress wont return file: urls. copy-current-address menu item uses non-shareable version
2018-04-05 12:39:49 -07:00