Ken Cooke
2156729a75
Tighter version of sample sound
2017-10-26 11:48:40 -07:00
Ken Cooke
4eb8b826c2
Merge pull request #11681 from luiscuenca/case6443
...
6443 Audio Menu Sample Sound won't play while domain is loading
2017-10-26 08:40:30 -07:00
Ken Cooke
30d6185625
Merge pull request #11687 from ctrlaltdavid/21577
...
Fix script reload icon not working in Windows developer builds
2017-10-26 08:35:59 -07:00
Seth Alves
807b4c4ed2
Merge pull request #11686 from NissimHadar/hazeZone
...
Reduced haze background blend range to 27,000 metres.
2017-10-26 08:13:24 -07:00
luiscuenca
b7c375f396
Cleaning
2017-10-25 19:09:37 -07:00
luiscuenca
3d3077978e
Simplyfied and fixed null pointer
2017-10-25 18:47:10 -07:00
Clément Brisset
61a2d80117
Merge pull request #11676 from Atlante45/new-master
...
Merge stable back into master
2017-10-25 18:37:50 -07:00
Seth Alves
0f31631f17
Merge pull request #11677 from druiz17/fix-fargrab
...
Make non-dynamic entities collisionless during far-grab
2017-10-25 17:31:02 -07:00
David Rowe
da33c4fcf2
Fix script reload icon not working in Windows developer builds
2017-10-26 11:41:52 +13:00
Nissim Hadar
2ec62ecc9b
Reduced haze background blend range to 27,000 metres.
2017-10-25 15:12:01 -07:00
Brad Hefta-Gaub
b53f1d5027
Merge pull request #11679 from ZappoMan/fixDPISetting
...
Fix dpi setting in edit.js
2017-10-25 14:14:11 -07:00
luiscuenca
a1c9285c90
Fixed bug on case 6443
2017-10-25 13:13:50 -07:00
Atlante45
ff547f4e4f
Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master
2017-10-25 13:03:46 -07:00
Dante Ruiz
8d07f2a6a3
Merge branch 'master' of github.com:highfidelity/hifi into fix-fargrab
2017-10-25 12:53:14 -07:00
ZappoMan
dcb6530b8a
Merge branch 'master' of https://github.com/highfidelity/hifi into fixDPISetting
2017-10-25 12:39:57 -07:00
Brad Hefta-Gaub
0c9184566e
Merge pull request #11678 from AndrewMeadows/fix-broken-build
...
fix compile errors after merge
2017-10-25 12:39:34 -07:00
Stephen Birarda
a28f2f19e0
Merge pull request #11674 from utkarshgautamnyu/fix/JSBaker
...
Fixed issue with QTextStream in JSBaker
2017-10-25 14:06:43 -05:00
ZappoMan
226b974ce8
DPI is not a decimal
2017-10-25 11:59:29 -07:00
Andrew Meadows
c14bbb76e6
fix compile errors after merge
2017-10-25 11:57:44 -07:00
Dante Ruiz
2ec8f3f625
made non-dynamic entities collisionless during far-grab
2017-10-25 11:29:32 -07:00
Ryan Downe Karpf
4cefd3937b
Merge pull request #11589 from highfidelity/RC-57
...
Beta Release 57 - Includes up to Developer Release 7288
2017-10-25 10:53:24 -07:00
Andrew Meadows
2d0b94817c
Merge pull request #11336 from 1P-Cusack/21389_PR2
...
WL21389 PR2: Representation of collision shapes need updating (details below).
2017-10-25 10:41:21 -07:00
Seth Alves
66e38af1b3
Merge pull request #11671 from ElderOrb/case8553
...
8380 Mouse Disappears when switching between HMD and Desktop Mode while in Create
2017-10-25 10:31:31 -07:00
Seth Alves
815f680475
Merge pull request #11675 from ZappoMan/fixRayPick
...
fix ray pick in cases where origin is inside of outer bounding box
2017-10-25 07:07:36 -07:00
Brad Hefta-Gaub
18a74cea91
Merge pull request #11659 from zfox23/mergeRC57IntoMaster_20171023
...
2017-10-23: Merge RC57 into Master
2017-10-24 21:19:01 -07:00
Brad Hefta-Gaub
bcad2302c4
Merge pull request #11667 from druiz17/crash-keyboard
...
Fix keyboard related crash.
2017-10-24 21:17:49 -07:00
Brad Hefta-Gaub
ef78711b7b
Merge pull request #11663 from AndrewMeadows/shape-sharing
...
fix incorrect collision shape sharing for some ModelEntityItem configurations
2017-10-24 21:04:57 -07:00
Brad Hefta-Gaub
2a865f3a45
Merge pull request #11666 from SamGondelman/mirrorMode
...
Fix backwards HUD in mirror mode
2017-10-24 21:03:29 -07:00
ZappoMan
9b94f33304
fix ray pick in cases where origin is inside of outer bounding box
2017-10-24 20:48:59 -07:00
utkarshgautamnyu
ff0af9f5cc
Fixed issue with QTextStream
2017-10-24 20:14:02 -07:00
Brad Hefta-Gaub
41b637bc79
Merge pull request #11668 from ZappoMan/cleanupVersions
...
Cleanup versions
2017-10-24 16:24:01 -07:00
beholder
39b2c0f83a
fix for FB 8553 & FB 8380
2017-10-25 01:59:56 +03:00
Seth Alves
75f8699bcc
Merge pull request #11665 from NissimHadar/hazeZone
...
Changed blend range from 32,000 m to 30,000m
2017-10-24 15:22:24 -07:00
ZappoMan
aad91edba2
actually remove all those defines
2017-10-24 14:45:33 -07:00
ZappoMan
3ded26b0e9
Merge branch 'master' of https://github.com/highfidelity/hifi into cleanupVersions
2017-10-24 14:44:06 -07:00
Brad Hefta-Gaub
ecf8d35f5f
Merge pull request #11664 from ZappoMan/callEntityClientMethod
...
implement callEntityClientMethod
2017-10-24 14:43:39 -07:00
ZappoMan
275fff4609
more CR feedback
2017-10-24 14:02:47 -07:00
Dante Ruiz
f29937fb88
Merge branch 'master' of github.com:highfidelity/hifi into crash-keyboard
2017-10-24 13:54:21 -07:00
Dante Ruiz
92f765fe52
property set echomode for keyboard for wallet and webviews
2017-10-24 13:53:50 -07:00
ZappoMan
5901d1a311
clean up VERSION_ENTITIES stuff
2017-10-24 13:48:27 -07:00
SamGondelman
046e5ca716
fix backwards HUD in mirror mode
2017-10-24 13:24:09 -07:00
Andrew Meadows
27f4d182d9
fix scale of rendered collision geometry
2017-10-24 13:23:46 -07:00
Andrew Meadows
29efe53f74
repair debug rendering of collision shapes
2017-10-24 13:23:46 -07:00
Andrew Meadows
996b71fa9a
avoid incorrect ShapeManager dupes for compound shapes
2017-10-24 13:23:46 -07:00
Nissim Hadar
f81675e3b4
Changed blend range from 32,000 m to 30,000m
2017-10-24 13:17:09 -07:00
ZappoMan
12c32d5834
bump protocol version
2017-10-24 13:08:48 -07:00
ZappoMan
ed408e09d0
remove some log spam
2017-10-24 11:50:25 -07:00
Sam Gateau
fad0dde550
Merge pull request #11662 from Zvork/zoneshadow
...
BUG FIX : Shadows cast by top zone key light
2017-10-24 11:49:53 -07:00
ZappoMan
a1885926b5
some cleanup
2017-10-24 11:46:42 -07:00
LaShonda Hopper
d1ab1c5e26
[WL21389] Fixes issue with the ShapeData vert buffer offset (details below).
...
When computing the buffer view offset for ShapeData the vertex vector
size should be scaled by a single vec3 size as opposed to 2.
This fix is taken from PR discussion:
https://github.com/1P-Cusack/hifi/pull/10
Proposed by: Andrew Meadows <andrew@highfidelity.io>
Changes Committed:
modified: libraries/render-utils/src/GeometryCache.cpp
2017-10-24 14:16:25 -04:00
