Commit graph

60981 commits

Author SHA1 Message Date
Olivier Prat
ae8a9e68c8 Added debug tool to view shadow & view frustums 2017-10-25 11:58:16 +02: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
Brad Hefta-Gaub
41b637bc79 Merge pull request #11668 from ZappoMan/cleanupVersions
Cleanup versions
2017-10-24 16:24:01 -07: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
ZappoMan
1128a98e88 implement callEntityClientMethod 2017-10-24 11:15:57 -07:00
Seth Alves
58501bd0b0 Merge pull request #11661 from Delanir/Gizmos
FogBugz 7425 - Billboard orientation and grabber move up tool are now dependent on the Avatar referential.
2017-10-24 10:32:29 -07:00
Daniela
059c5c1806 billboard is now using a general formula to calculate the rotation, where we don't assume y is up. Added dependency on the avatar. 2017-10-24 14:49:17 +01:00
Daniela
30a5b00b6e Merge branch 'master' of https://github.com/highfidelity/hifi into Gizmos 2017-10-24 14:44:06 +01:00
Olivier Prat
a34db5f26d Shadows are now cast by the current zone key light (sun) 2017-10-24 11:09:36 +02:00
Seth Alves
7793506d0f Merge pull request #11640 from jherico/fix/fb8406
Fix for shape size flickering
2017-10-23 17:39:36 -07:00
Zach Fox
1f6d989044 Merge branch 'RC-57' of https://github.com/highfidelity/hifi into mergeRC57IntoMaster_20171023 2017-10-23 17:37:43 -07:00
Dante Ruiz
0242e8e4ba fixed crash and login password 2017-10-23 16:33:49 -07:00
Andrew Meadows
26226fe968 Merge pull request #11654 from SamGondelman/lineEdit
Update Line3DOverlay renderTransform if end changes
2017-10-23 15:36:37 -07:00
Bradley Austin Davis
4f5851f420 Reducing needless render updates 2017-10-23 15:31:25 -07:00
SamGondelman
55ba093f09 update line render transform on end edit 2017-10-23 13:09:40 -07:00
Zach Fox
f90060afab Merge pull request #11651 from zfox23/commerce_ChangeTimerForDemo
Auto-refresh Wallet Home & Purchases on 4s timer
2017-10-23 12:40:08 -07:00
Zach Fox
03b46c5e62 Merge pull request #11652 from cain-kilgore/21508
WL 21508 - Improve upon Skybox Changer (Updated)
2017-10-23 12:22:21 -07:00
Seth Alves
d3a859d207 Merge pull request #11648 from ElderOrb/mouse_pointer_fix
7469 Mouse Pointer Depth is Incorrect in HMD Mode
2017-10-23 11:57:46 -07:00
Zach Fox
30bffdea32 Quick bugfix 2017-10-23 11:45:51 -07:00
Cain Kilgore
b60b58ff35 zFox Changes 2017-10-23 19:40:43 +01:00
Cain Kilgore
3b4185fdb3 WL 21508 - Improve upon Skybox Changer
This involved a second PR, due to optimizing the way the Skyboxes are laid  out. All of the Skyboxes will now appear at once, with the random button being removed. You are able to scroll up and down the list and choose which Skybox you'd like to pick.
2017-10-23 19:30:36 +01:00
Daniela
f15038c54f Re-add isFacingAvatar to true and delete rotation of the grabbermoveup tool. 2017-10-23 19:11:32 +01:00
Daniela
32b5776743 Merge branch 'master' of https://github.com/highfidelity/hifi into Gizmos 2017-10-23 18:51:40 +01:00
Zach Fox
5c8451a626 Auto-refresh Wallet Home & Purchases on 4s timer 2017-10-23 10:36:23 -07:00
Melissa Brown
20787c9c7c Merge pull request #11644 from cain-kilgore/21508
WL 21508 - Improve upon Skybox Changer
2017-10-23 10:30:55 -07:00
Cain Kilgore
b42afdaff0 WL 21508 - Cleanup from Code Review 2017-10-23 16:27:28 +01:00
Brad Hefta-Gaub
ea38b32dea Merge pull request #11646 from ZappoMan/callServerEntityMethod
implement support for Entities.callEntityServerMethod()
2017-10-22 18:56:35 -07:00
ZappoMan
44f8bf00bc move remoteCallerID to Script.remoteCallerID 2017-10-22 17:14:11 -07:00
ZappoMan
a7e21d7e76 add remotelyCallable and remoteCallerID to provide additional security to Entities.callEntityServerMethod() 2017-10-22 14:30:58 -07:00
ZappoMan
fb7f6df694 CR feedback 2017-10-22 11:40:41 -07:00
Ken Cooke
c555d0785b Merge pull request #11647 from vladest/create_audio_cues
Add sound cues to create app
2017-10-22 11:34:21 -07:00