Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 12:53:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
24418 commits 71 branches 56 tags 1.2 GiB
Commit graph

24418 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Davis
aafecae4b5 Coding standards 2015-04-26 20:10:22 -07:00
Brad Davis
fa31ba0754 Info-view 2015-04-26 10:37:14 -07:00
Brad Davis
d4d469b881 Adding note to change filename 2015-04-25 20:13:59 -07:00
Brad Davis
b77b3e4f3d Merge branch 'ui-refactor' into menu2 2015-04-25 17:00:07 -07:00
Brad Davis
2e61b5a933 Coding standards 2015-04-25 16:59:43 -07:00
Brad Davis
198224c4ec Merge branch 'ui-refactor' into menu2 2015-04-25 16:48:05 -07:00
Brad Davis
0afe8c0e32 Coding standards 2015-04-25 16:46:05 -07:00
Brad Davis
7c16fd05c1 Merge branch 'master' into ui-refactor 2015-04-25 16:35:43 -07:00
Brad Davis
a96f69a673 Switching to a wrapper mechanism for VR menus 2015-04-25 16:20:15 -07:00
Seth Alves
3ce65d297a Merge pull request #4696 from Atlante45/fix_warnings 
Fix a few warnings
 2015-04-25 12:43:47 -07:00
Brad Davis
ee30588fd4 More menu work 2015-04-25 10:41:06 -07:00
Atlante45
ba507cef98 Fix a few warnings 2015-04-25 11:01:02 +02:00
Brad Davis
fbdb9b143e Merge branch 'ui-refactor' into m_and_m 
Conflicts:
	interface/resources/qml/HifiMenu.qml
	interface/resources/qml/MessageDialog.qml
	interface/resources/qml/Root.qml
	interface/resources/qml/TestRoot.qml
	interface/resources/qml/controls/Dialog.qml
	interface/src/Application.cpp
	interface/src/ui/LoginDialog.cpp
	libraries/ui/src/MessageDialog.cpp
	libraries/ui/src/MessageDialog.h
	libraries/ui/src/OffscreenQmlDialog.h
	libraries/ui/src/OffscreenUi.cpp
	libraries/ui/src/OffscreenUi.h
	tests/ui/src/main.cpp
 2015-04-24 18:02:12 -07:00
Brad Davis
9fbd5d79e4 Removing duplicate declaration 2015-04-24 17:46:56 -07:00
Brad Davis
fdf2f8395d Bad lambda type 2015-04-24 17:28:43 -07:00
Brad Davis
eb02bdc67f Dangling function 2015-04-24 16:57:39 -07:00
Brad Davis
dab8761c71 Merge remote-tracking branch 'upstream/master' into ui-refactor 2015-04-24 16:46:48 -07:00
Brad Davis
e7b8efc2d9 Cleaning up unused stuff 2015-04-24 16:44:48 -07:00
Brad Davis
08d60c6a01 Fixing message dialog 2015-04-24 16:19:39 -07:00
Brad Davis
e5df17eb99 Merge pull request #4691 from ZappoMan/defaultAvatars 
fix default avatars on first run
 2015-04-24 16:17:26 -07:00
Brad Hefta-Gaub
dbb1e3c820 Merge pull request #4682 from jherico/offscreen 
Attempting to fix backspace issue in new UI
 2015-04-24 16:10:42 -07:00
Brad Hefta-Gaub
4fccb74855 Merge pull request #4692 from huffman/checkbox-fix 
Checkbox fix
 2015-04-24 16:08:52 -07:00
Brad Hefta-Gaub
1d6001af53 Merge pull request #4694 from Atlante45/zone_use_avatar_pos 
Zones use avatar position not view frustum
 2015-04-24 16:08:19 -07:00
Clément Brisset
23ac8b1c8c Merge pull request #4693 from ctrlaltdavid/faceshift-fps 
Log Faceshift FPS after a reset
 2015-04-24 23:59:37 +02:00
David Rowe
e33f3c9d00 Remove unnecessary #include 2015-04-24 13:42:56 -07:00
Ryan Huffman
547b0e5ee6 Update style of webview to only be set when 'fusion' exists 2015-04-24 13:42:03 -07:00
Ryan Huffman
6087a3e8a9 Revert "Add checkboxes.html" 
This reverts commit 4127ec8019.
 2015-04-24 13:40:02 -07:00
Brad Davis
0a9398808f CR comments 2015-04-24 13:25:30 -07:00
Brad Davis
99a6e1f86c Breaking up offscreen UI work 2015-04-24 13:21:21 -07:00
Atlante45
a4f03f8b1c Zones use avatar position not view frustum 2015-04-24 22:16:21 +02:00
Brad Davis
1ff8c67576 More work on menus and some code cleanup 2015-04-24 12:54:11 -07:00
David Rowe
a141ebbf93 Log Faceshift FPS after a reset 2015-04-24 12:49:41 -07:00
Ryan Huffman
df591f9ad7 Set style of webview 2015-04-24 11:49:33 -07:00
ZappoMan
37928dcd6d fix default avatars on first run 2015-04-24 11:30:18 -07:00
Stephen Birarda
b387c3e93a Merge pull request #4689 from Atlante45/master 
Send generated touchEndEvent if we don't get one from Qt
 2015-04-24 13:07:12 -04:00
Atlante45
53577107de Formatting 2015-04-24 19:06:46 +02:00
Atlante45
fb5a0c8b01 Only send touchUpdateEvent if it is one 
ie. not for touchBeginEvent
 2015-04-24 18:50:45 +02:00
Atlante45
e2b60d35f0 Generate touchEndEvent if last event was more than 50 ms ago 2015-04-24 18:50:03 +02:00
Ryan Huffman
4127ec8019 Add checkboxes.html 2015-04-24 09:42:59 -07:00
Brad Hefta-Gaub
6c830459a6 Merge pull request #4688 from huffman/fix-zone-overlay 
Fix new zone overlays not moving
 2015-04-24 09:09:17 -07:00
Brad Hefta-Gaub
22ff2ba1b8 Merge pull request #4687 from Atlante45/zone_shape_edit_js 
Zone ShapeType/CompoundShapeURL in edit.js
 2015-04-24 09:08:56 -07:00
Ryan Huffman
6a48010c0b Fix new zone overlays not moving 2015-04-24 09:01:12 -07:00
Stephen Birarda
a3edb7b02a Merge pull request #4686 from Atlante45/fix_keylight_color 
Fix keylight color
 2015-04-24 11:35:47 -04:00
Atlante45
82a53c9139 Turn off all sections then turn on selected one 
This fixes the issue of properties present in a couple sections but not
all that are going to only be displayed for the last section the are in
that is being processed.
 2015-04-24 16:53:39 +02:00
Atlante45
32b78f02b4 Group ShapeType and CompoundShapeURL + add it to Zones 2015-04-24 16:52:51 +02:00
Atlante45
a26d9ef353 Fix ShapeType/String conversion 2015-04-24 16:49:18 +02:00
Atlante45
fff8b99d10 Fix keylight color 
Was an integer division producing a float
 2015-04-24 15:31:25 +02:00
Clément Brisset
9c5f384080 Merge pull request #4683 from ctrlaltdavid/dde-revert 
Revert DDE start-up permission change
 2015-04-24 14:34:00 +02:00
Clément Brisset
efc5e5d52b Merge pull request #4684 from ctrlaltdavid/dde-fps 
Log DDE FPS after a reset
 2015-04-24 14:28:26 +02:00
Brad Davis
c0d562ed55 Merge branch 'offscreen' into m_and_m 2015-04-23 23:45:11 -07:00