Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 18:23:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
39287 commits 75 branches 59 tags 1.2 GiB
Commit graph

5339 commits

Author SHA1 Message Date
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
James B. Pollack
f2445e81e0 Merge pull request #7110 from ericrius1/particlesInEdit2 
Particles in edit
 2016-02-16 18:33:01 -08:00
ericrius1
ce2d76d3f3 made export settings a text area 2016-02-16 17:57:09 -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
ericrius1
ad43e4ff6d Fixed multiple particle tabs appearing 2016-02-16 12:56:34 -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
Zach Pomerantz
8c01d5f82b Remove camera tool's 3d hud overlays 2016-02-15 14:03:57 -08:00
Chris Collins
bf52d30216 Merge pull request #7107 from ericrius1/spraypaintFix 
Fix for spraypaint orientation
 2016-02-15 13:45:12 -08:00
ericrius1
f98941e80f switching between particle entities 2016-02-15 12:52:05 -08:00
ericrius1
85d8fc2944 particle image 2016-02-15 11:56:41 -08:00
Zach Pomerantz
b8e8859761 Remove image color in edit.js 
This removes the warning generated by ImageOverlay.qml
for the unhandled property, color.
 2016-02-15 11:51:11 -08:00
James B. Pollack
72186f916c more precision 2016-02-15 11:35:28 -08:00
ericrius1
80a368933f Fix for spraypaint orientation 2016-02-15 11:13:06 -08:00
ericrius1
3adc88aa70 need to fix icon 2016-02-15 11:11:23 -08:00
ericrius1
e4d4044a2b particleExplorer works in edit tab 2016-02-15 09:41:47 -08:00
samcake
545f276fdf Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-15 09:29:00 -08:00
ericrius1
b92c5555fe Merge branch 'master' into particlesInEdit2 2016-02-15 09:14:37 -08:00
Brad Hefta-Gaub
376c23f1a3 Merge pull request #7100 from imgntn/edit_props 
Hide hyperlink property for web entities
 2016-02-12 18:29:35 -08:00
Brad Davis
b5cba79f0c Merge pull request #7095 from ZappoMan/hmdHacking 
Various bug fixes in related to HMD overlay support
 2016-02-12 17:50:42 -08:00
Brad Hefta-Gaub
48fe638312 Merge pull request #7104 from howard-stearns/update-orbitingSound 
update-orbitingSound.js
 2016-02-12 17:44:47 -08:00
Howard Stearns
9a3972c43f wait for sound to download 2016-02-12 17:42:44 -08:00
Brad Hefta-Gaub
d85a8a4fb9 Merge pull request #7103 from jherico/render-rate 
Don't drop to half the vsync rate when we can't keep up
 2016-02-12 17:11:03 -08:00
Brad Hefta-Gaub
df6437236e some CR feedback 2016-02-12 16:13:12 -08:00
Howard Stearns
25671fbefe Update orbitingSound.js to use a sample file that exists and setOptions function. 2016-02-12 16:01:23 -08:00
Brad Davis
908e153c36 Don't drop to half the vsync rate when we can't keep up 2016-02-12 15:57:27 -08:00
samcake
e3307d91ad Fix the debugging tool to be able to freeze the frustum for scene fetch and culling 2016-02-12 14:59:43 -08:00
James B. Pollack
c469fc6a29 hide hyperlink property for web entities 2016-02-12 14:30:21 -08:00
Chris Collins
3321265ae7 Merge pull request #7086 from howard-stearns/clear-away-on-buttons 
Clear pause/away on controller button press
 2016-02-12 12:56:42 -08:00