Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-22 14:13:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
14650 commits 25 branches 0 tags 1.1 GiB
Commit graph

279 commits

Author SHA1 Message Date
Ryan Huffman
2de9848a37 Merge remote-tracking branch 'upstream/master' into 19554-2 2014-04-16 14:42:20 -07:00
Ryan Huffman
4afea2d228 Remove chat window docking 2014-04-16 09:55:12 -07:00
Thijs Wenker
8e6130091d Merge branch 'master' of https://github.com/highfidelity/hifi into 19561 2014-04-16 11:28:46 +02:00
Stojce Slavkovski
1a3e6595c5 Allow users to set the destination of Snapshots 2014-04-15 19:36:02 +02:00
Thijs Wenker
1634e574d7 Merge branch 'master' of https://github.com/highfidelity/hifi into 19561 2014-04-15 00:40:48 +02:00
Thijs Wenker
af47510b05 Initial script editor widget / icons made by MaximillianMerlin ty 2014-04-15 00:30:01 +02:00
Ryan Huffman
aaddecd024 Merge remote-tracking branch 'upstream/master' into 19554 
Conflicts:
	interface/resources/resources.qrc
	interface/ui/chatWindow.ui
 2014-04-14 11:20:49 -07:00
Atlante45
c39434f4e3 Merge branch 'master' of https://github.com/highfidelity/hifi into remove_qrc_from_sources 
Conflicts:
	interface/resources/resources.qrc
 2014-04-11 12:08:17 -07:00
Atlante45
18b364d9d9 Removed QResources from Interface 2014-04-11 11:57:25 -07:00
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
Ryan Huffman
de475ee46c Update behavior of chat window close button 
Use a stylesheet to suppress highlighting of the background when
pressing the button down.  Instead, it will change the image.

Unfortunately I wasn't able to find a way to do this without requiring
an extra image, or by doing it through the icon system.  The different
icon states didn't seem to take effect for button presses, and using
opacity in the stylesheet doesn't work yet for `QPushButton`s.
 2014-04-10 12:19:27 -07: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
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