Stephen Birarda
|
d2e02c15d8
|
repair the UpdateDialog so it is a QDialog with no child QWidget
|
2014-01-22 14:17:56 -08:00 |
|
Leonardo Murillo
|
82ecc9cc36
|
Merge branch 'master' of github.com:/worklist/hifi
|
2014-01-17 13:06:59 -06: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 |
|
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 |
|
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 |
|
Leonardo Murillo
|
efb173e1d4
|
Preliminary update dialog work
|
2014-01-08 21:20:43 -06:00 |
|
Leonardo Murillo
|
ba79b1b329
|
Using BUILD_VERSION to setApplicationVersion
|
2014-01-06 09:18:10 -06: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 |
|
Stojce Slavkovski
|
57b4148867
|
Dialog position / toggle
|
2013-12-17 22:12:24 +01:00 |
|
Stojce Slavkovski
|
18295809ce
|
log dialog style changes
|
2013-12-17 21:44:44 +01:00 |
|
Stojce Slavkovski
|
e788d746d4
|
added dialog for log data
- importing Inconsolata.otf on application level
- style sheet for dialog
- changed menu behaviour for log data
|
2013-12-16 22:43:17 +01:00 |
|
Andrzej Kapolka
|
c003a55c37
|
Diffuse lighting.
|
2013-12-12 16:19:05 -08:00 |
|
Andrzej Kapolka
|
c1aec11b32
|
More work on rendering voxels.
|
2013-12-12 15:14:19 -08:00 |
|
Andrzej Kapolka
|
f6b3a6ceca
|
The other part of the Oculus ambient occlusion fix.
|
2013-11-26 17:53:31 -08:00 |
|
Andrzej Kapolka
|
e406988ed3
|
Partial fix for ambient occlusion with Oculus.
|
2013-11-26 17:18:03 -08:00 |
|
Andrzej Kapolka
|
c5406c47a6
|
Moved Oculus code out of Application, started on using StereoConfig to get
actual values to replace the magic numbers.
|
2013-11-26 11:59:06 -08:00 |
|
Andrzej Kapolka
|
f0e5872b89
|
Lighten the shadows, remove some debug code.
|
2013-11-21 12:29:22 -08:00 |
|
ZappoMan
|
c4a2b3c49b
|
fix thinning in voxels as points by using correct points to calculate width of voxel based on camera position relative to voxel
|
2013-11-03 11:10:00 -08:00 |
|
ZappoMan
|
508b8f4678
|
change in comment to kick off build
|
2013-11-01 16:29:49 -07:00 |
|
ZappoMan
|
b103f9dacf
|
clean up
|
2013-11-01 15:32:17 -07:00 |
|
ZappoMan
|
e62322b805
|
clean up comment
|
2013-11-01 15:28:54 -07:00 |
|
ZappoMan
|
61b6d6a4a4
|
added comment about fixing point selection
|
2013-11-01 15:27:57 -07:00 |
|
ZappoMan
|
cab87c3a97
|
added comment about fixing point selection
|
2013-11-01 15:27:25 -07:00 |
|
ZappoMan
|
b3aac56d29
|
first cut a variable point size point rendering
|
2013-11-01 14:33:06 -07:00 |
|
Andrzej Kapolka
|
12374c2cc4
|
Allow more clusters per mesh.
|
2013-10-31 17:01:00 -07:00 |
|
ZappoMan
|
e9d366fb80
|
Merge pull request #1147 from ey6es/ick
Support for normap maps on loaded models.
|
2013-10-30 12:26:56 -07:00 |
|
Andrzej Kapolka
|
06e050f1c1
|
Normal map support almost there.
|
2013-10-29 22:13:00 -07:00 |
|
stojce
|
a14242632a
|
Rear view zoom level
new zoom icons
save and restore state from settings
display zoomed out rear view when selected
|
2013-10-29 20:51:14 +01:00 |
|
stojce
|
4fe9964e5a
|
reset view
- reset icon
- resetView signal
|
2013-10-28 18:19:31 +01:00 |
|
Andrzej Kapolka
|
62b2388592
|
Temporary fix for Mavericks: the skin shader isn't getting the color, so just
use white. We're not using vertex colors on anything skinned yet, anyway.
|
2013-10-25 14:40:00 -07:00 |
|
Andrzej Kapolka
|
bae4a17605
|
Voxel attachments.
|
2013-10-24 13:59:04 -07:00 |
|
Andrzej Kapolka
|
cf78e21ea4
|
Merge branch 'master' of https://github.com/worklist/hifi into ossome
Conflicts:
interface/src/Application.cpp
|
2013-10-23 10:06:56 -07:00 |
|
stojce
|
2fcb246923
|
close button on rear mirror view
|
2013-10-22 20:42:31 +02:00 |
|
Andrzej Kapolka
|
7ddac20c62
|
Allow more bones. The model I'm testing with has about 60.
|
2013-10-18 19:18:48 -07:00 |
|
Andrzej Kapolka
|
7e174093e4
|
Factoring the FBX model code out to a shared base class.
|
2013-10-18 17:26:03 -07:00 |
|
Andrzej Kapolka
|
a79c0a9244
|
Removed unused shader.
|
2013-10-15 17:14:20 -07:00 |
|
Andrzej Kapolka
|
d06acdd169
|
Per-pixel shading, material tweaks.
|
2013-10-15 11:50:29 -07:00 |
|
Andrzej Kapolka
|
e97cfb8cf8
|
Per-pixel specular for blend faces.
|
2013-10-14 19:59:13 -07:00 |
|
Andrzej Kapolka
|
124966d2e4
|
More progress on skinning.
|
2013-10-14 18:39:19 -07:00 |
|
stojce
|
7ce483b658
|
remove unused resource
|
2013-10-05 13:21:34 +02:00 |
|
stojce
|
61b213804a
|
#19426 - Add a mute control to the interface
- OpenGL overlay icon
- mute control
- icons
|
2013-10-05 13:18:35 +02:00 |
|