Philip Rosedale
37e1c00828
Merge pull request #2002 from ZappoMan/lowerLODnoFPSdrop
...
Automatically Adjust LOD
2014-02-16 18:14:24 -08:00
ZappoMan
d6b71f19a8
fix voxel texture to work better with larger TREE_SCALE
2014-02-12 18:00:09 -08:00
Andrzej Kapolka
b6d77ec637
Switched from loading FBX and FST simultaneously to loading FST first, then
...
using its filename and texdir properties (as Faceshift does) to locate the
corresponding model. Also fixed a bug with the fallback models (they were
invisible after second failure).
2014-02-11 14:20:52 -08:00
Andrzej Kapolka
2071da2c8a
Provide a means to specify a fallback for when we fail to load a model. Also
...
added missing associated resources for default model. Closes #1960 .
2014-02-10 18:50:36 -08:00
Stephen Birarda
230caf5b27
add the default body and head to the resources directory
2014-02-10 10:26:28 -08:00
Andrzej Kapolka
4f4c4c68d9
Streaming cleanup, streaming script strings as repeated values.
2014-02-04 18:31:18 -08:00
Andrzej Kapolka
4deb9936ba
Don't add the specular alpha in the model fragment shaders.
2014-01-27 17:44:13 -08:00
stojce
40ea552981
filename format changes
...
- new wav file
- changed filename format
2014-01-27 20:35:06 +01:00
stojce
74801da07f
#19491 - Implement in-app snapshots
2014-01-27 18:07:03 +01:00
stojce
0c2e55a53b
Merging with master
...
- resolve conflicts on GeometryCache
2014-01-24 07:31:22 +01:00
Andrzej Kapolka
ff4795d9a5
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-01-22 15:59:02 -08:00
stojce
becbd4cb1c
Merge branch 'master' of https://github.com/worklist/hifi into 19483
2014-01-23 00:54:05 +01:00
Stephen Birarda
d2e02c15d8
repair the UpdateDialog so it is a QDialog with no child QWidget
2014-01-22 14:17:56 -08:00
Andrzej Kapolka
aabff3f141
Adjust the fog density; getting different results on Linux vs. OS X.
2014-01-22 14:17:02 -08:00
Andrzej Kapolka
0a3d6ae5e0
More work on metavoxel editing (grid, etc.)
2014-01-21 19:31:56 -08:00
stojce
19c4b2b2ec
Merge branch 'master' of https://github.com/worklist/hifi into 19483
2014-01-21 22:51:32 +01:00
Andrzej Kapolka
5e908134ea
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-01-21 11:05:00 -08:00
Andrzej Kapolka
bf9fc65de4
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-01-20 17:40:16 -08:00
Leonardo Murillo
82ecc9cc36
Merge branch 'master' of github.com:/worklist/hifi
2014-01-17 13:06:59 -06:00
stojce
36d21e812d
Merge branch 'master' of https://github.com/worklist/hifi into 19483
2014-01-17 19:46:02 +01:00
Andrzej Kapolka
e7a3beed78
Removed a couple more resources.
2014-01-16 15:17:38 -08:00
Andrzej Kapolka
1b891cb326
Removed unused resources.
2014-01-16 15:16:19 -08:00
stojce
50ad5a4ec8
alternate css background settings for selected items in QTreeView
2014-01-15 23:38:34 +01:00
stojce
8e2879e5ff
Layout fixes
2014-01-15 23:14:45 +01:00
Leonardo Murillo
40492a1713
Removing text from .ui
2014-01-14 22:16:06 -06:00
Leonardo Murillo
b20334de1d
Dont need qss
2014-01-14 22:13:49 -06:00
Leonardo Murillo
f9bb98680d
Using Qt Designer .ui file instead of manually coding dialog
2014-01-14 21:57:28 -06:00
Andrzej Kapolka
c163b513d2
Working on allowing visitors to modify, as well as read, data.
2014-01-13 18:09:28 -08:00
stojce
06ecf03180
Layout fix (notes from Grayson)
2014-01-13 23:04:19 +01:00
stojce
577ff766ee
fix size of grid items
2014-01-12 00:53:49 +01:00
stojce
048359e3a4
more layout fixes
2014-01-12 00:44:50 +01:00
stojce
3afacfce4f
Info label layout
2014-01-12 00:40:29 +01:00
stojce
0c4bee8d12
save and restore dialog settings
2014-01-12 00:33:46 +01:00
stojce
623def0964
File filter
...
Display extensions
2014-01-11 21:03:49 +01:00
stojce
227326e3b7
Import button opacity
2014-01-11 14:40:22 +01:00
stojce
80561b6861
removed size hint from sag icons
2014-01-10 23:47:18 +01:00
stojce
d5e07a5c75
Add import configuration
...
remove unused icons
remove redundant QLabels
2014-01-10 23:26:58 +01:00
Leonardo Murillo
ede32cfadc
Checkpoint
2014-01-10 14:08:10 -06:00
Leonardo Murillo
eb52ded4ad
Styling + others
2014-01-09 20:34:02 -06:00
stojce
5b678cb24d
Layout fix
2014-01-09 18:15:39 +01:00
Leonardo Murillo
efb173e1d4
Preliminary update dialog work
2014-01-08 21:20:43 -06:00
stojce
cc543f4313
Added custom icons (QFileIconProvider)
2014-01-07 00:41:11 +01:00
Leonardo Murillo
ba79b1b329
Using BUILD_VERSION to setApplicationVersion
2014-01-06 09:18:10 -06:00
stojce
8855a32526
removed unused widgets
2014-01-06 11:15:15 +01:00
Stojce Slavkovski
2b92194d35
sytle changes on log dialog
2013-12-29 23:45:24 +01:00
Stojce Slavkovski
ee1eb25dfa
replace LogDisplay with File logger
...
- added abstract logger interface
2013-12-22 18:56:53 +01:00
Stojce Slavkovski
3d44ab9939
Dialog layout
2013-12-22 15:06:40 +01:00
Stojce Slavkovski
4c1226ffd9
Merge branch 'master' of https://github.com/worklist/hifi into 19461
2013-12-18 08:00:55 +01:00
Andrzej Kapolka
ff2b77d311
Back to a more modest depth.
2013-12-17 17:16:09 -08:00
Andrzej Kapolka
e6a41b2003
Proof of concept sphere thing for metavoxels.
2013-12-17 16:56:52 -08:00