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

248 commits

Author SHA1 Message Date
Stojce Slavkovski
7ffb700564 fixed mention sounds dir for deployment 2014-05-12 20:55:24 +02:00
Andrzej Kapolka
d0537e7ead Specular map support. 2014-05-06 17:32:10 -07:00
Ryan Huffman
f4cb17ba4a Merge remote-tracking branch 'upstream/master' into 19640 2014-05-06 16:18:25 -07:00
Ryan Huffman
911b8cd623 Update welcome screen 2014-05-06 16:17:40 -07:00
Stojce Slavkovski
4d8e1b5bd4 repled audio files 2014-05-02 23:52:12 +02:00
Stojce Slavkovski
d6b7dac649 Merge branch 'master' of https://github.com/worklist/hifi into 19597 2014-05-01 01:41:11 +02:00
Ryan Huffman
edcff0b67f Merge remote-tracking branch 'upstream/master' into RunningScripts 
Conflicts:
	interface/src/Application.cpp
	interface/src/ui/FramelessDialog.cpp
	interface/src/ui/FramelessDialog.h
 2014-04-29 16:28:36 -07:00
Stojce Slavkovski
ca2c8d2fff Merge branch 'master' of https://github.com/worklist/hifi into 19597 2014-04-29 22:31:47 +02:00
Clément Brisset
02d527baae Merge pull request #2740 from stojce/19617 
Code Review for Job #19617
 2014-04-29 11:29:12 -07:00
Stojce Slavkovski
d24b55871f Merge branch 'master' of https://github.com/worklist/hifi into 19597 2014-04-29 19:05:16 +02:00
Stojce Slavkovski
9f070406ed missing 'extra debugging' check icon; fix font 2014-04-29 00:02:24 +02:00
Ryan Huffman
46d4a31f01 Update login images 2014-04-28 13:16:06 -07:00
Ryan Huffman
23397a4b10 Add LoginDialog 2014-04-28 08:55:03 -07:00
Stojce Slavkovski
5c7fb3eca5 Add chat mention notifications 2014-04-26 22:19:33 +02:00
Ryan Huffman
792ab7e17e Update icon for Load Script button 2014-04-25 15:57:10 -07:00
Ryan Huffman
c65d5f08ca Merge remote-tracking branch 'upstream/master' into 19554-2 2014-04-23 10:54:51 -07:00
Ryan Huffman
9bea70ac54 Revert "Add emoticons to chat" 
This reverts commit 3c9b6264a8.
 2014-04-23 10:49:22 -07:00
Thijs Wenker
c016d6557e - few Adjustments in Application class for Script editor 
- Shortkey for script editor (Alt+S)
- highlighter: bold true/false , single line comments
- Run scripts from the editor works
- More icons from Maximillian, Thanks
- Run on the fly checkbox, works if the script is running.
- Load/save features
 2014-04-21 05:25:28 +02:00
Ryan Huffman
3c9b6264a8 Add emoticons to chat 2014-04-17 19:51:25 -07:00
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