Commit graph

39296 commits

Author SHA1 Message Date
ericrius1
81ed89531d whiteboard surface parented to whiteboard 2016-02-23 10:11:13 -08:00
ericrius1
b5ec79fd6d marker only draws when equipped and held down 2016-02-23 09:53:20 -08:00
ericrius1
69dc9ef68f added lifetime 2016-02-23 09:06:35 -08:00
ericrius1
ec36995908 moar whiteboard logging removal 2016-02-19 17:36:02 -08:00
ericrius1
6fe9730897 all three markers 2016-02-19 17:33:54 -08:00
ericrius1
68e289b433 Fixed bug where spawning one marker would destroy the other 2016-02-19 17:32:33 -08:00
ericrius1
756b7e223d need to figure out why only one marker working 2016-02-19 15:56:12 -08:00
ericrius1
9ae1ccee50 passing marker color accross 2016-02-19 14:15:55 -08:00
ericrius1
40176b0424 no gaps 2016-02-19 14:06:55 -08:00
ericrius1
0564cd8145 returning if less than min distance 2016-02-19 12:02:34 -08:00
ericrius1
9a8b76df47 no more zfighting 2016-02-19 11:32:13 -08:00
ericrius1
94bf15f328 need to fix zfighting 2016-02-19 11:21:17 -08:00
ericrius1
b58026bf4b max points 2016-02-19 11:04:17 -08:00
ericrius1
ddce8d5a3a Marker basics working, now just need to tweak 2016-02-19 10:59:05 -08:00
ericrius1
8e9cd3ae2a passing whiteboard in to marker 2016-02-19 10:38:13 -08:00
ericrius1
6765973a4a correct positioning on equip 2016-02-19 09:56:30 -08:00
ericrius1
f4ee9acb9c intersecting 2016-02-19 09:49:22 -08:00
ericrius1
39d4fbf19d refactoring 2016-02-18 15:23:32 -08:00
ericrius1
728e8c763d ray cast 2016-02-17 17:30:01 -08:00
ericrius1
7f23ee04be basic marker entity script 2016-02-17 17:16:43 -08:00
ericrius1
df84a166e4 spawning marker tips- parenting to markers 2016-02-17 15:08:42 -08:00
ericrius1
073661b78d markers in right spot 2016-02-17 14:25:21 -08:00
ericrius1
9e8d123b16 spawning marker and whiteboard correctly 2016-02-17 13:58:04 -08:00
ericrius1
bb2fd0072c collision hull 2016-02-17 13:41:58 -08:00
ericrius1
bfc619497e spawning model 2016-02-17 13:33:19 -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
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
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
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