Ryan Downe Karpf
e080746990
Merge pull request #9481 from huffman/fix/edit-collision-names
...
Update the name of the collision shapes used in edit.js properties
2017-01-23 15:10:01 -08:00
Ryan Huffman
f6d5a59c8a
Fix width of edit.js dropdown to accomodate collision options
2017-01-23 14:18:56 -08:00
Ryan Huffman
d108fabd0b
Update the name of the collision shapes used in edit.js properties
...
Update the names to be consistent with what is shown on the add model
dialog.
2017-01-23 13:56:48 -08:00
Philip Rosedale
45a4ec349e
Merge pull request #9467 from humbletim/21139
...
Code Review for Job #21139 - Do not allow grab or far-grab or click while editing objects
2017-01-23 13:20:57 -08:00
Clément Brisset
19622f86bf
Merge pull request #9475 from Atlante45/fix/injector-options
...
Fix invalid volume values in injector options silencing all injectors
2017-01-23 13:17:55 -08:00
Stephen Birarda
c8d505c482
Merge pull request #9474 from birarda/bug/web-entity-safe-url
...
use fromUserInput to avoid web entity crashes with bad URLs
2017-01-23 12:52:39 -08:00
Stephen Birarda
f02832ca71
output the actual value set in WebEntityItem
2017-01-23 11:50:05 -08:00
Atlante45
3f8b2f9cbb
Fix invalid volume values in injector options
2017-01-23 11:49:07 -08:00
Stephen Birarda
d7651e9838
move value sanitizing to WebEntityItem
2017-01-23 11:45:21 -08:00
Stephen Birarda
99e0c8c0e7
use fromUserInput in web entity URL set to avoid crashable URLs
2017-01-23 11:37:54 -08:00
Zach Pomerantz
9605379265
Merge pull request #9472 from zzmp/cmake/revert-libquazipd
...
Revert "Use supplied libquazip5.so for Debug builds" for WIN32/OSX
2017-01-23 14:31:09 -05:00
Stephen Birarda
8c5c1f32a0
Merge pull request #9471 from birarda/bug/places-paths-anchor
...
fix Places / Paths anchor in domain settings
2017-01-23 10:31:37 -08:00
Zach Pomerantz
daf507fc81
revert "Use supplied libquazip5.so for Debug builds" for WIN32/OSX
2017-01-23 13:02:15 -05:00
Stephen Birarda
ab7ce19211
use html_id for settings anchor if no name
2017-01-23 09:49:46 -08:00
humbletim
d20ac20ff2
move isInEditMode guard to setState
2017-01-23 01:31:11 -05:00
humbletim
15394056eb
* add isInEditMode to utils.js
...
* update grab.js to use the latest Settings edit mode detection approach
* add edit guards to handControllerGrab.js and grab.js
* update edit.js to consistently initialize Setting's edit flag
2017-01-20 22:29:40 -05:00
samcake
afd3c3b504
Merge pull request #9436 from AndrewMeadows/cauterization-cleanup
...
Cleanup of code that decides not to render head when in first-person
2017-01-20 14:49:08 -08:00
Zach Fox
d535d816f4
Merge pull request #9463 from zfox23/PAL_FixScrollingVisibility
...
PAL: Fix card visibility when selecting out-of-table users
2017-01-20 14:01:04 -08:00
Zach Fox
11a57efafb
Fix it!
2017-01-20 13:44:29 -08:00
Ken Cooke
176531e395
Merge pull request #9450 from zzmp/fix/audio-pool-comp
...
fix warnings for signed comp in AudioMixerSlavePool
2017-01-20 12:17:40 -08:00
Zach Fox
9fa80567a6
Merge pull request #9455 from zfox23/PAL_LastEditorBug
...
PAL: Fix "Last Editor" popup bug; Fix log spam
2017-01-20 11:28:41 -08:00
Zach Fox
8f3c4794c6
Comments
2017-01-20 10:24:52 -08:00
Zach Fox
9c9206acc0
Prevent logspam
2017-01-20 10:24:51 -08:00
Zach Fox
c83cd4a94a
Complex checkpoint
2017-01-20 10:24:51 -08:00
Zach Pomerantz
eba96c45d7
fix warnings for signed comp in AudioMixerSlavePool
2017-01-20 12:25:22 -05:00
Ryan Downe Karpf
03851d4188
Merge pull request #9441 from davidkelly/dk/makeUsSomeAnalytics
...
Some initial analytics for PAL usage
2017-01-20 08:30:46 -08:00
David Kelly
5adc2cc593
Couple improvements
...
Only send one message when gain is changed. Eliminated the bool and
now just sending un-personalMute, etc...
2017-01-19 17:22:39 -08:00
Andrew Meadows
10cdea9cd8
cleanup model fade logic
2017-01-19 14:17:50 -08:00
Andrew Meadows
b7c1bfaf58
another attempt to fix model transform
2017-01-19 14:01:40 -08:00
Zach Fox
64ef3d5665
Merge pull request #9426 from zfox23/PAL_AdminLabel
...
PAL: Admin Labels, Updated Letterboxes
2017-01-19 13:48:05 -08:00
Andrew Meadows
d3af420516
fix broken model transforms
2017-01-19 13:07:50 -08:00
Andrew Meadows
1d6f47e3d8
repack to reduce MeshPartPayload footprint 8 bytes
2017-01-19 12:56:08 -08:00
Andrew Meadows
9631864ae2
make soft attachments cauterized for MyAvatar
2017-01-19 12:56:07 -08:00
Andrew Meadows
5a2e337758
fix comments
2017-01-19 12:56:07 -08:00
Andrew Meadows
bfbef91f53
re-enable cauterization of meshes for MyAvatar
2017-01-19 12:56:07 -08:00
Andrew Meadows
1a3fa84985
add newline at EOF
2017-01-19 12:56:07 -08:00
Andrew Meadows
189da81bb1
fix for crash on unloaded model
2017-01-19 12:56:07 -08:00
Andrew Meadows
3dd8fd838b
move cauterization out of Model class
2017-01-19 12:56:07 -08:00
David Kelly
d9fbf832e2
Some initial analytics for PAL usage
2017-01-19 11:35:17 -08:00
Zach Fox
44eaa64a1d
It was writeString() all along!
2017-01-19 11:25:17 -08:00
Zach Fox
534fcd9399
Potential fix
2017-01-19 10:20:36 -08:00
Chris Collins
601223aa98
Merge pull request #9402 from ctrlaltdavid/clara-tidying
...
Remove a line of old code in Clara.io download
2017-01-19 09:15:58 -08:00
Brad Davis
70de00c6bf
Merge pull request #9421 from jherico/more_trace_details
...
Additional trace details for GPU timing, frame data updates
2017-01-19 09:12:34 -08:00
samcake
149e727cf3
Merge pull request #9429 from gcalero/android_forward_shaders
...
Create render forward version of pixel shaders
2017-01-19 00:48:25 -08:00
Clément Brisset
b2e7efa4a8
Merge pull request #9410 from samcake/meta
...
Introducing type Meta to the render items of the scene
2017-01-18 17:50:53 -08:00
samcake
05304c72e0
Merge branch 'master' of https://github.com/highfidelity/hifi into meta
2017-01-18 17:00:20 -08:00
samcake
027bd30cbc
Removing macOS warning
2017-01-18 16:59:50 -08:00
Brad Davis
1ef4ac9a6c
Additional trace details for GPU timing, frame data updates
2017-01-18 16:19:32 -08:00
samcake
e3da6aa9f1
Removing the comment
2017-01-18 15:03:31 -08:00
Zach Fox
0ec01c0dc5
CR feedback
2017-01-18 14:55:53 -08:00
