Zach Fox
1f6d989044
Merge branch 'RC-57' of https://github.com/highfidelity/hifi into mergeRC57IntoMaster_20171023
2017-10-23 17:37:43 -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
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
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
beholder
cadf00fecf
add missing 'eyeToWorld' assignment
2017-10-22 19:27:04 +03:00
vladest
b791dcba7f
Add sound cues to create app
2017-10-22 14:59:53 +02:00
ZappoMan
934c9479af
implement support for Entities.callEntityServerMethod()
2017-10-21 20:27:35 -07:00
Ken Cooke
bd418364e1
Merge pull request #11645 from vladest/goto_sound_cues
...
Sound cues for GoTo interface
2017-10-21 17:37:56 -07:00
Brad Hefta-Gaub
6607be5b58
Merge pull request #11642 from sethalves/fix-action-deadlock
...
fix action (grab) deadlock
2017-10-21 12:27:40 -07:00
vladest
cf7b050680
Sound cues for GoTo interface
2017-10-21 20:47:56 +02:00
Cain Kilgore
bc772a2f9a
WL 21508 - Improve upon Skybox Changer
2017-10-21 19:42:53 +01:00
Bradley Austin Davis
e85494b958
Merge pull request #11643 from SamGondelman/billboard
...
Fix Image3DOverlay isFacingAvatar
2017-10-21 01:09:50 -07:00
SamGondelman
88b8d7bc46
fix image3d overlay isFacingAvatar
2017-10-20 16:56:42 -07:00
Sam Gateau
7754061505
Merge pull request #11634 from highfidelity/hazeZone
...
Fogbugz 8477: Crash on loading older domains that have zones without the haze component.
2017-10-20 16:01:13 -07:00
Seth Alves
2b0285adc2
fix action (grab) deadlock
2017-10-20 15:05:21 -07:00
Brad Hefta-Gaub
87294b8e67
Merge pull request #11638 from ZappoMan/fixWireframe
...
fix the rendering of wireframe for model entities with bad model URLs
2017-10-20 14:29:01 -07:00
Nissim
5d0deaf946
Code review fixes.
2017-10-20 14:27:27 -07:00
Zach Fox
d255b36236
Merge pull request #11639 from zfox23/contextOverlayPositionFix
...
Context Overlay (i) Position Fix
2017-10-20 14:00:45 -07:00
Nissim
00c99d3d02
Corrected wrong else format.
2017-10-20 13:53:53 -07:00
Brad Hefta-Gaub
26ea8bea6a
Merge pull request #11612 from highfidelity/pointers
...
Fix tablet intersection bug and start of Pointer migration work (WIP)
2017-10-20 13:53:52 -07:00
Brad Hefta-Gaub
f6af1d1ecf
Merge pull request #11387 from vladest/tablet_extended_sounds
...
Tablet extended sounds
2017-10-20 13:49:06 -07:00
Brad Hefta-Gaub
d6ad389dab
Merge pull request #11611 from AndrewMeadows/faster-update-renderables
...
Faster renderables update
2017-10-20 13:43:08 -07:00
Nissim
b976dbd224
Merge branch 'master' into hazeZone
2017-10-20 13:33:01 -07:00
Nissim
b0ca1353e4
Implemented Haze mode default.
2017-10-20 13:32:27 -07:00
Zach Fox
61a12a70c0
Merge branch 'RC-57' of https://github.com/highfidelity/hifi into contextOverlayPositionFix
2017-10-20 13:16:31 -07:00
Howard Stearns
c77fbe1a9d
Merge pull request #11637 from zfox23/hackInspectionCert
...
Fix Entity Certificate display upon inspection in RC-57
2017-10-20 13:10:41 -07:00
ZappoMan
27ffb97a07
Merge branch 'master' of https://github.com/highfidelity/hifi into fixWireframe
2017-10-20 12:31:35 -07:00
ZappoMan
ef0ff96a44
fix the rendering of wireframe for model entities with bad model URLs
2017-10-20 11:46:28 -07:00
Zach Fox
c217992866
Order of operations lol
2017-10-20 11:42:03 -07:00
Ryan Huffman
de195dd844
Merge pull request #11585 from huffman/fix/draco-material-ids
...
Fix baking bug with single-part FBX + multiple materials
2017-10-20 11:32:31 -07:00
Zach Fox
ae1b2bd931
'Tis a silly hack
2017-10-20 11:11:23 -07:00
vladest
908d601a43
Code style fixes #1
2017-10-20 20:00:11 +02:00
Seth Alves
9d00606505
Merge pull request #11635 from druiz17/fix-hud-issues
...
actually fix toolbar from completely dispersing
2017-10-20 10:22:34 -07:00
Howard Stearns
352243c01b
Merge pull request #11629 from zfox23/wearItButton
...
REZ IT -> WEAR IT
2017-10-20 09:36:09 -07:00
Seth Alves
f8a01dffb0
Merge pull request #11633 from sethalves/pr-11581-for-rc-57
...
Pr 11581 for rc 57
2017-10-20 09:00:08 -07:00
vladest
fa349a694c
Code style fixes
2017-10-20 15:12:09 +02:00
vladest
ea6c2e1bb5
Merge branch 'master' into tablet_extended_sounds
2017-10-20 14:46:02 +02:00
