Commit graph

60909 commits

Author SHA1 Message Date
David Back
08a6eb4dd3 reset tablet contextual mode back to false when toggling tablet show/hide 2017-10-24 15:50:09 -07:00
David Back
80dc98b2c2 remove prints 2017-10-23 14:23:45 -07:00
David Back
b5f1793863 add a tablet contextual mode flag to HMDScriptingInterface used to keep tablet in place 2017-10-23 14:21:18 -07: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
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
vladest
cf7b050680 Sound cues for GoTo interface 2017-10-21 20:47:56 +02: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
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
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
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
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
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
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
Nissim
0f519da76e Additional protection for mode. 2017-10-19 17:16:36 -07:00
Nissim
d01ecb71df Fixed gcc warning. 2017-10-19 14:41:02 -07:00
Andrew Meadows
c79bf3bc04 cleanup WANT_DETAILED_PROFILING 2017-10-19 14:31:50 -07:00
Nissim
e314ee432e Fixed gcc warning. 2017-10-19 14:20:47 -07:00
druiz17
f2ad61934b fix toolbar from completely dispearing 2017-10-19 14:02:21 -07:00
Stephen Birarda
23563cca47 Merge pull request #11592 from birarda/bug/ignore-dds-in-fbx
ignore unbakeable textures in FBXBaker
2017-10-19 15:51:41 -05:00
Nissim
9af87d46f2 Removed optimize pragma. 2017-10-19 13:51:33 -07:00
Nissim
61fc45c6bf Merge branch 'master' into hazeZone 2017-10-19 13:39:18 -07:00
Nissim
edd256c600 Fixed crash on invalid HazeMode. 2017-10-19 13:36:32 -07:00
Ryan Huffman
894e91ea23 Merge pull request #10702 from CraftsmanMG/master
Fingerpaint  PR
2017-10-19 13:13:59 -07:00
Zach Fox
24512e0cf1 Merge pull request #11631 from zfox23/commerce_OctoberFixes2
2017-10-18: Commerce frontend updates
2017-10-19 12:11:52 -07:00
Daniela
832e30ad1c Edited Packet headers. 2017-10-19 19:53:47 +01:00
Zach Fox
aa48215933 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_OctoberFixes2 2017-10-19 10:54:31 -07:00
Seth Alves
a467f30993 Merge pull request #11624 from highfidelity/AlanZimmerman-patch-1
Change tablet model's screen
2017-10-19 09:40:30 -07:00
Brad Hefta-Gaub
f951a23356 Merge pull request #11627 from druiz17/reload-script
fixed toolbar disapearing after reloading default scripts
2017-10-19 09:32:36 -07:00
Brad Hefta-Gaub
e2ccfb84f9 Merge pull request #11626 from Delanir/BubbleScaleMaster
7429 IPD Secondary Task List: bubble.js Scale
2017-10-19 09:31:15 -07:00
Seth Alves
89ce9e6367 Merge pull request #11614 from sethalves/fix-others-adjusting-hats
handle camera-relative controller joints for other avatars
2017-10-19 08:10:04 -07:00
Melissa Brown
1a3821e984 Merge pull request #11591 from ctrlaltdavid/21568
Add some Quat and Uuid JavaScript helper properties
2017-10-18 22:07:06 -07:00
Seth Alves
28d0da51b9 Merge pull request #11628 from luiscuenca/case8269
8269  controllerDispatcher is creating log spam with web entities
2017-10-18 18:11:13 -07:00
Zach Fox
dc1b3aef8f Don't show purchases tutorial if user clicks what is rez 2017-10-18 16:25:06 -07:00