Philip Rosedale
8ccc0a2081
Merge pull request #2650 from thoys/chatwindow-docking-feature
...
Fixed docking of ChatWindow
2014-04-11 07:21:53 -07:00
Stojce Slavkovski
3af3b29588
removed dependency on QT resource
2014-04-11 00:54:54 +02:00
Thijs Wenker
f0463a5679
Fixed docking of ChatWindow
...
Temporary Pin Icon, replace with a nice looking one please
2014-04-11 00:45:38 +02:00
Stojce Slavkovski
459fed5c7b
Merge branch 'master' of https://github.com/worklist/hifi into 19508
2014-04-10 21:52:37 +02:00
Stephen Birarda
c208af2246
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-04-09 15:10:48 -07:00
stojce
c9605be193
Merge branch 'master' of https://github.com/worklist/hifi into 19508
2014-04-09 21:57:56 +02:00
Stephen Birarda
f969e050cd
add apache license to shader headers
2014-04-09 09:59:05 -07:00
stojce
ce85e67a42
Modify icons in Interface "mirror"
2014-04-09 18:54:59 +02:00
stojce
8dc6ca75a4
Merge branch 'master' of https://github.com/worklist/hifi into 19508
...
Conflicts:
interface/interface_en.ts
interface/resources/resources.qrc
interface/src/Menu.cpp
2014-04-04 21:16:29 +02:00
Atlante45
5acc8313ba
Manual merge
2014-04-02 18:07:55 -07:00
Andrzej Kapolka
563725e781
Use the "correct" shadow strategy: include only ambient term when in shadow.
2014-03-27 13:44:34 -07:00
Andrzej Kapolka
7cc7230745
Adjust the shadow shader to prevent seeing shadows on the opposite sides of
...
objects. Closes #2544 .
2014-03-27 13:18:45 -07:00
stojce
547f33f4d6
Merge branch 'master' of https://github.com/worklist/hifi into 19508
...
Conflicts:
interface/interface_en.ts
2014-03-25 22:15:52 +01:00
Andrzej Kapolka
62884f1f4f
Don't use textures/fancy shaders when rendering shadow map. Closes #2270 .
2014-03-24 13:15:03 -07:00
stojce
aaa5e15035
Merge branch 'master' of https://github.com/worklist/hifi into 19508
...
Conflicts:
assignment-client/src/audio/AudioMixer.cpp
assignment-client/src/audio/AudioMixerClientData.cpp
interface/interface_en.ts
interface/src/Menu.cpp
libraries/audio/src/AudioRingBuffer.cpp
2014-03-21 22:35:57 +01:00
stojce
9077a05f9d
- Layout fix
...
- Model browsers
- merge
2014-03-21 22:34:10 +01:00
Andrzej Kapolka
5b3340ce49
Add Ryan's updated smoothing factors.
2014-03-21 10:38:29 -07:00
stojce
b417851dde
Merge branch 'master' of https://github.com/worklist/hifi into 19508
2014-03-20 12:10:53 +01:00
Andrzej Kapolka
f2cc227331
Ryan's requested change for rotation smoothing.
2014-03-18 10:17:32 -07:00
stojce
913783c0f1
resizing
...
- fixed layout
2014-03-16 22:47:03 +01:00
stojce
ebd7dff4b9
QSpinBox, QDoubleSpinBox styling
2014-03-15 22:07:29 +01:00
stojce
4e2d3c9549
styling QSlider
2014-03-14 23:24:32 +01:00
stojce
939c17d0be
Merge branch 'master' of https://github.com/worklist/hifi into 19508
...
Conflicts:
interface/src/Menu.h
2014-03-13 18:41:58 +01:00
Dimitar Dobrev
727903b216
Changed the chat window to a popup with a custom closing button.
2014-03-13 04:07:33 +02:00
Andrzej Kapolka
853bba27ca
Applied Ryan's tweaks to Visage mapping and config file.
2014-03-10 15:13:24 -07:00
stojce
8decf55e3f
Merge branch 'master' of https://github.com/worklist/hifi into 19508
2014-03-08 13:19:45 +01:00
Stephen Birarda
b705ec560f
cleanup resources directory references by copying beside the executable
2014-03-06 11:46:49 -08:00
Stephen Birarda
c737283935
qrc references should only use a single slash
2014-03-06 10:45:47 -08:00
Stephen Birarda
403f91c988
update resource references to use Qt resource system
2014-03-06 10:41:11 -08:00
Stephen Birarda
cc554c53f1
use Qt Resource System to compile in resources
2014-03-06 10:25:15 -08:00
stojce
6383457e4e
styling
...
bad merge fix
2014-02-26 22:15:12 +01:00
stojce
3ced4c9bef
Merge branch 'master' of https://github.com/worklist/hifi into 19508
2014-02-25 20:58:07 +01:00
stojce
1e2cd0c1a2
UI changes
2014-02-25 20:36:14 +01:00
stojce
2c0e285323
Merge branch 'master' of https://github.com/worklist/hifi into 19508
2014-02-23 13:54:34 +01:00
stojce
ec73edb8d8
restyled preferences dialog
...
- Frameless dialog super class
2014-02-23 13:54:22 +01:00
Stephen Birarda
340248ac43
resolve conflicts on merge with upstream master
2014-02-21 15:16:15 -08:00
Atlante45
9238ef13e6
Changed Import button size
2014-02-20 10:37:31 -08:00
Stephen Birarda
6f84230d9d
resolve conflicts on merge with upstream/master
2014-02-20 10:14:36 -08:00
Atlante45
af3e19e640
Added style and pngs for the buttons
2014-02-19 16:01:14 -08:00
Stephen Birarda
5f130872af
repair usage of INI file for QSettings
2014-02-19 14:09:18 -08:00
Atlante45
a732cbf300
Modified QSS for new UI (QProgressBar)
2014-02-19 12:37:08 -08:00
Atlante45
64031701e1
Added icons for import dialog buttons
2014-02-19 12:33:05 -08:00
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
