Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 02:30:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
39250 commits 75 branches 59 tags 1.2 GiB
Commit graph

5323 commits

Author SHA1 Message Date
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
Brad Hefta-Gaub
1160ecb335 improvements in HMD UI behavior 2016-02-12 10:51:33 -08:00
samcake
5acfd5ff53 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-12 09:59:48 -08:00
Seth Alves
94bc1764a8 fix auto-updating of adjustments to worn or equipped entities 2016-02-12 06:58:44 -08:00
Seth Alves
ca5525cc3f if an entity already was near-picked, don't do a distance-to-center check on it. 2016-02-12 06:58:14 -08:00
samcake
f12030c1a4 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-11 18:41:02 -08:00
howard-stearns
7c4e31687c simpler/better/more reliable (peek) 2016-02-11 13:27:56 -08:00
Chris Collins
c6bc91f8b2 Merge pull request #7084 from jherico/toolTabs 
Allow closed tabs to delete properly
 2016-02-11 13:20:20 -08:00
howard-stearns
0d8404e7e8 interact more safely with mappings 2016-02-11 13:05:47 -08:00
howard-stearns
93d72833bf Merge branch 'master' of https://github.com/highfidelity/hifi into clear-away-on-buttons 2016-02-11 12:10:53 -08:00
Brad Davis
2ee1f18e06 Allow closed tabs to delete properly 2016-02-11 10:27:24 -08:00
Chris Collins
a4afa03fe5 Merge pull request #7077 from sethalves/clean-up-grab-signaling 
Clean up grab signaling + various fixes
 2016-02-11 10:20:56 -08:00
samcake
31230e81bb Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-11 10:05:58 -08:00
samcake
99e9b3ecdd Merge pull request #7043 from zzmp/fix/render-ui 
Revamp the render engine ui
 2016-02-11 09:57:51 -08:00
Zach Pomerantz
3bace3cdbb Rework the qml for brevity 2016-02-11 08:48:01 -08:00
Zach Pomerantz
9c5881345a Disable the AO gpuTimer pending cpp fix 2016-02-11 08:48:00 -08:00
Zach Pomerantz
dbc59ccc2b Revamp render engine debug JS script 2016-02-11 08:47:59 -08:00