Commit graph

63838 commits

Author SHA1 Message Date
Brad Hefta-Gaub
d7fe3bcd15
Merge pull request #12224 from ZappoMan/emoteApp
new icon and button layout
2018-01-19 17:43:00 -08:00
Bruce Brown
cbc8698e9a Fix Bitwise operators. 2018-01-19 16:59:47 -08:00
Zach Fox
1dde640a40 -_- 2018-01-19 16:06:01 -08:00
Ken Cooke
e2e4e7f423 Re-implement collision sound pitch shifting 2018-01-19 16:03:59 -08:00
ZappoMan
f6062ebfcc new icon and button layout 2018-01-19 16:00:08 -08:00
Zach Fox
89e403d438 Balance text in send money 2018-01-19 15:39:57 -08:00
Anthony J. Thibault
cd4d9255bd Added defaultPoseFlags to avatar protocol
Change rotationSet to rotationIsDefaultPose for JointData
Also for translation.  Fixed all code to flip boolean value.
Created EntityJointData so that the ModelEntity stuff doesn't need to change.
2018-01-19 15:34:27 -08:00
John Conklin II
455090d2b9
Revert "Display both lasers on tablet and Web surfaces" 2018-01-19 15:15:52 -08:00
John Conklin II
db5bf68431
Merge pull request #12203 from ctrlaltdavid/21703
Display both lasers on tablet and Web surfaces
2018-01-19 15:15:44 -08:00
RebeccaStankus
5db5f24043 Updated UI to fit Toolkit Standards 2018-01-19 14:52:44 -08:00
Ken Cooke
a421ba7649 Add "pitch" parameter to scriptable audio injector options.
Used in playSound() to pitch-shift the audio when injector is created.
2018-01-19 14:50:51 -08:00
Zach Fox
4d408a8df5 Nearby UI 2018-01-19 14:49:28 -08:00
Brad Davis
d53b8b38ac Merge remote-tracking branch 'upstream/master' into android 2018-01-19 14:35:20 -08:00
Brad Davis
686393d62f Load built-in resources earlier 2018-01-19 14:35:04 -08:00
luiscuenca
41f3b792b6 Fix warnings 2018-01-19 14:34:52 -07:00
David Rowe
7898aa2c4b Code review 2018-01-20 10:32:42 +13:00
Bruce Brown
fab13a111c Remove accidental - 2018-01-19 13:10:34 -08:00
Stephen Birarda
018bcc623b
Merge pull request #12213 from birarda/feat/hide-error-decrypting-notification
suppress Interface notification for DS decryption error
2018-01-19 14:10:10 -07:00
David Rowe
24dcc8788c Code review 2018-01-20 10:07:23 +13:00
John Conklin II
c366ed42ab
Merge pull request #12202 from amantley/urlbug
added a property check in renderableModelEntity for the animation url…
2018-01-19 12:52:43 -08:00
David Rowe
94e6a68d41 Code review 2018-01-20 09:50:24 +13:00
Bruce Brown
e3fb9cee00
Delete Midi.cpp 2018-01-19 12:09:07 -08:00
Bruce Brown
fbfa502547
Delete Midi.h 2018-01-19 12:08:37 -08:00
Bruce Brown
39e938ccc7
Removed Tabs & CR/LF 2018-01-19 11:52:09 -08:00
Brad Davis
e2c4af05bd Don't process empty images 2018-01-19 11:42:31 -08:00
Brad Davis
104dbabee9 Infinite loop guard 2018-01-19 11:42:13 -08:00
Zach Fox
9d6e62d6bf
Merge pull request #12163 from ElderOrb/FB11109
FB11109 Preview disabled image swap (Commerce only)
2018-01-19 11:40:05 -08:00
Sam Gateau
9a8246f2b9
Merge pull request #12215 from Zvork/brdf
Normalized diffuse & specular for directional, point and spot lights
2018-01-19 11:08:29 -08:00
Seth Alves
63cd472fca
Merge pull request #12185 from AndrewMeadows/physics-shouldnt-set-dirty-flags
fix race condition whereby physics may incorrectly overwrite script/network property change
2018-01-19 11:06:22 -08:00
Ryan Downe Karpf
f1b18ccc00
Merge pull request #12184 from ctrlaltdavid/21700
Add Window browseChanged signal as replacement for openFileChanged
2018-01-19 10:45:27 -08:00
Ryan Downe Karpf
08b4c6eb40
Merge pull request #12206 from druiz17/fix-reduce-calls-isPointOnDesktopWindow
reduce calls to isPointOnDesktopWindow in controllerModules
2018-01-19 10:44:57 -08:00
Brad Davis
d6f7b23b2d Merge remote-tracking branch 'upstream/master' into android 2018-01-19 10:37:41 -08:00
luiscuenca
27ea74f5bf Fix sortOrder param on tablet buttons 2018-01-19 11:22:37 -07:00
Sam Gateau
ce550b4fa6
Merge pull request #12209 from SamGondelman/textures
Watch for attachment texture loading
2018-01-19 10:08:04 -08:00
MiladNazeri
b08f1ea850
Merge pull request #12212 from Atlante45/fix/linux-cheats-formatting
Fix BUILD_LINUX_CHEATSHEET.md formatting
2018-01-19 09:49:38 -08:00
Zach Fox
8c52f92de8
Merge pull request #12208 from zfox23/fixBubbleButtonFlash
Fix the Space Bubble button flash behavior; Rate limit sound
2018-01-19 09:29:17 -08:00
Olivier Prat
12c48a38f7 Normalized diffuse & specular of directional, point and spot lights such as a light intensity of 1 gives a perpendicular diffuse lighting of the same color as the albedo for dielectric materials. 2018-01-19 13:58:35 +01:00
Bruce Brown
bb09c71bda
Fix crash caused by no midi device present 2018-01-18 21:35:01 -08:00
Bruce Brown
3004ee08e1
Fix lockup when no midi devices present. 2018-01-18 21:18:36 -08:00
David Rowe
fb684909ce Merge branch 'master' into 21703 2018-01-19 17:25:12 +13:00
David Rowe
45bc6b8dab Dominant hand gets the highlight if both start pointing simultaneously 2018-01-19 16:41:23 +13:00
David Rowe
e0e6fc711b Replace Pointers API function setNonHoverItems() with setDoesHover() 2018-01-19 16:05:09 +13:00
Alexander Ivash
67e816756c make gcc happy 2018-01-19 01:51:41 +00:00
Zach Fox
495c4f56e2 Only small tweaks remaining? 2018-01-18 17:51:08 -08:00
Andrew Meadows
75b5635d2f less word salad 2018-01-18 17:43:22 -08:00
Andrew Meadows
3d3bfcf7a3 check dirty flags when harvesting physics results 2018-01-18 17:43:22 -08:00
Zach Fox
6b5389a167 go go go go go 2018-01-18 17:37:26 -08:00
Brad Davis
bdfa1273ba Merge remote-tracking branch 'upstream/master' into android 2018-01-18 17:33:10 -08:00
Atlante45
497e8c1d69 Fix BUILD_LINUX_CHEATSHEET.md formatting 2018-01-18 17:09:51 -08:00
Zach Fox
c6429f4f33 Path towards pixel perfection 2018-01-18 17:05:36 -08:00