Commit graph

39314 commits

Author SHA1 Message Date
David Rowe
91e4fb478d Don't display dialog focus or content shadows on OSX
Alpha gradients display as fuchsia on OSX.
2016-02-20 13:12:51 +13:00
David Rowe
54b27f3ac3 Merge branch 'master' into 20805 2016-02-18 23:35:37 +13:00
David Rowe
c07b1f9b1e Tidying 2016-02-18 23:06:26 +13:00
David Rowe
b68837277c Fix default focus 2016-02-18 22:12:43 +13:00
David Rowe
81169c59c8 Fix runtime warnings 2016-02-18 19:52:20 +13:00
David Rowe
4df77cff31 Add scrollbars to running scripts and available scripts tables 2016-02-18 18:10:58 +13:00
Brad Hefta-Gaub
a3766a93ea Merge pull request #7128 from sethalves/fix-energy
minor adjustments to avatar-energy code
2016-02-17 20:04:35 -08:00
Brad Hefta-Gaub
39592a583f Merge pull request #7130 from ericrius1/editFix
fixed edit bug
2016-02-17 20:02:36 -08:00
David Rowe
d32f743f52 Style running scripts and available scripts tables 2016-02-18 16:35:51 +13:00
ericrius1
5f5af9c6a0 fixed edit bug 2016-02-17 17:45:57 -08:00
James B. Pollack
5aa2979a86 Merge pull request #7127 from sethalves/BUGS
fix far-trigger
2016-02-17 16:29:44 -08:00
Anthony Thibault
e863da5a68 Merge pull request #7118 from jherico/hmd_mono
Remove distortion on HMD previews, both mono and stereo
2016-02-17 15:39:48 -08:00
Brad Davis
8289c39a2a Removing flicker from OpenVR mirror 2016-02-17 14:48:24 -08:00
Seth Alves
af1640ac4e adjust avatar-energy code to avoid editing local tree and then not telling the entity-server about it 2016-02-17 14:36:18 -08:00
Seth Alves
64e50c5329 keep search-line from freezing during a far-trigger 2016-02-17 12:35:23 -08:00
Seth Alves
784dc2b538 Merge pull request #7124 from samcake/red
Fixing the disappearing avatars maybe ?
2016-02-17 12:05:04 -08:00
Seth Alves
69caf1df4d fix far-trigger 2016-02-17 12:04:25 -08:00
Brad Hefta-Gaub
38430d8d2c Merge pull request #7112 from howard-stearns/snap-turn-preference
Snap turn preference
2016-02-17 09:19:38 -08:00
Brad Hefta-Gaub
d5c349abec Merge pull request #7114 from samcake/hdr
Adding Ambient lighting to transparent surfaces
2016-02-17 09:08:38 -08:00
Andrew Meadows
07df96b6b3 Merge pull request #7125 from hyperlogic/tony/ik-bugfix
AnimInverseKinematics: fix for extra twist in lowerSpine joints.
2016-02-17 08:56:16 -08:00
David Rowe
b2314d33ba Style and lay out text fields 2016-02-17 20:44:09 +13:00
David Rowe
2a25509f7c Further font fixes 2016-02-17 20:38:01 +13:00
David Rowe
f568b1c67f Fix display of Raleway Bold 2016-02-17 16:19:00 +13:00
David Rowe
61d359a9b5 Style Button controls 2016-02-17 16:12:11 +13:00
David Rowe
1164e3e303 Set up window pane's content width so that can right-align 2016-02-17 15:35:35 +13:00
James B. Pollack
f2445e81e0 Merge pull request #7110 from ericrius1/particlesInEdit2
Particles in edit
2016-02-16 18:33:01 -08:00
Howard Stearns
6d70584b5a Change name and use only when in HMD. 2016-02-16 18:09:56 -08:00
Anthony J. Thibault
2d1304e070 AnimInverseKinematics: use glm::clamp for clarity. 2016-02-16 18:00:45 -08:00
ericrius1
ce2d76d3f3 made export settings a text area 2016-02-16 17:57:09 -08:00
Anthony J. Thibault
b5a72225db AnimInverseKinematics: renamed variable for extra style points 2016-02-16 17:42:51 -08:00
Anthony J. Thibault
df21fffa4a AnimInverseKinematics: fix for extra twist in lowerSpine joints.
* When computing tipPosition, for the next iteration of the CCD,
  use the leverArm before it's projected onto the lowerSpine twist axis.
* fix for acos() that was going outside of valid domain. (-1.0, 1.0)
2016-02-16 17:31:39 -08:00
samcake
640bf81339 Forcing an update from teh avatar manager to the avatar renderItems when beeing updated 2016-02-16 17:19:31 -08:00
Brad Davis
d1583e8cbe Fixing warnings 2016-02-16 17:00:00 -08:00
Brad Davis
d61f4fbb25 PR feedback 2016-02-16 16:44:16 -08:00
ericrius1
c43500f38a added textures field to particle explorer 2016-02-16 15:36:03 -08:00
ericrius1
023fd0607d added alpha start 2016-02-16 15:29:42 -08:00
ericrius1
d9d0e78dc5 button close 2016-02-16 15:21:18 -08:00
Chris Collins
05b9d88f08 Merge pull request #7108 from imgntn/moreprecision
More precision for edit.js
2016-02-16 15:03:10 -08:00
ericrius1
bf21bc2d48 reworked exporting properties 2016-02-16 14:06:02 -08:00
Andrew Meadows
80aee563fc Merge pull request #7119 from sethalves/fix-linux-local-scriptnames
filenames on Linux are case-sensitive
2016-02-16 13:27:14 -08:00
ericrius1
ad43e4ff6d Fixed multiple particle tabs appearing 2016-02-16 12:56:34 -08:00
samcake
a5b72bcbba Merge pull request #7121 from AndrewMeadows/drawstatus-false
init debug octree rendering to be false
2016-02-16 12:15:29 -08:00
Andrew Meadows
fd8073f6b5 init drawstatus to false 2016-02-16 12:11:19 -08:00
ericrius1
46907f446b Listening for page loaded event instead of set timeout === less lag 2016-02-16 11:42:01 -08:00
ericrius1
46679b29f7 particle tab deleted when particle system deleted 2016-02-16 11:11:58 -08:00
Andrew Meadows
f932999b2c Merge pull request #7113 from zzmp/rm/draw-on-hud
Remove drawOnHUD property from 3d overlays
2016-02-16 09:44:05 -08:00
Andrew Meadows
7dbb42c339 Merge pull request #7109 from zzmp/fix/edit-image-color
Remove image color in edit.js
2016-02-16 09:27:06 -08:00
Andrew Meadows
492c026f78 Merge pull request #7102 from zzmp/fix/model-tex-revert
Revert model texs when unset
2016-02-16 09:25:40 -08:00
Chris Collins
ad6b563130 Merge pull request #7116 from samcake/red
Fixing the rendering of the avatar skeleton
2016-02-16 09:22:20 -08:00
Andrew Meadows
3160776d65 Merge pull request #7089 from zzmp/fix/overlay-property-scene-updates
Update the scene on overlay3d updates
2016-02-16 09:21:57 -08:00