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

392 commits

Author SHA1 Message Date
Brad Davis
8090bc8e8d Revert "Enabling programmatic access to the IPD scale" 2015-10-06 10:16:42 -07:00
Brad Davis
725ed26ac2 Enabling programmatic access to the IPD scale 2015-10-04 16:55:49 -07:00
Thijs Wenker
8befade007 expose position and orientation of HMD to Javascript. 
- HMD.orientation
- HMD.position
 2015-10-04 15:08:35 +02:00
Brad Hefta-Gaub
00c32fc7cd Merge pull request #5924 from jherico/marge 
Support for accessing IPD in scripts
 2015-09-29 14:24:53 -07:00
Brad Davis
7b1c04512a Adding support for accessing IPD in scripts 2015-09-28 16:24:38 -07:00
Ryan Huffman
1a9cd59339 Fix ClipboardScriptingInterface to call methods on main app thread 2015-09-28 15:05:48 -07:00
Brad Hefta-Gaub
0ba1e8c945 remove renderingInWorldInterface signals 2015-09-18 09:49:57 -07:00
David Rowe
c9d799f5e0 Auto refresh entities list upon display of Entities tab 2015-08-27 13:32:00 -07:00
David Rowe
9d3d104ec3 Add Desktop object to JavaScript with width and height properties 2015-08-25 16:13:36 -07:00
Brad Hefta-Gaub
13a9dc4df2 cleanup controller interface, add getActionNames() and getDeviceNames() 2015-08-24 15:35:55 -07:00
David Rowe
bb2c48e3ed Add size and position properties, methods, and events to WebWindow 2015-08-14 14:42:32 -07:00
Brad Hefta-Gaub
b726769f15 Merge pull request #5402 from highfidelity/plugins 
New plugins architecture
 2015-08-11 11:11:27 -07:00
David Rowe
90637272c5 Add WebWindow setPosition() method 2015-08-07 17:38:41 -07:00
Sam Gondelman
54f64b62eb Merge remote-tracking branch 'upstream/plugins' into sam/input-plugins 2015-08-06 14:45:26 -07:00
Bradley Austin Davis
7e60aee1bf Merge branch 'master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/avatar/Head.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/avatar/MyAvatar.h
	interface/src/avatar/SkeletonModel.cpp
	interface/src/avatar/SkeletonModel.h
	interface/src/devices/3DConnexionClient.cpp
	interface/src/ui/overlays/Overlays.cpp
 2015-08-06 11:03:37 -07:00
Sam Gondelman
113c4ea28b exposing palm velocity and angular velocity to js 2015-08-05 12:17:15 -07:00
SamGondelman
52be44d621 uninitialized value 2015-08-04 14:50:38 -07:00
Zander Otavka
e5b8701215 Add toggle event for address bar. 2015-07-31 11:26:04 -07:00
Zander Otavka
c77a91eb63 Expose address bar toggling to scripts. 2015-07-31 11:26:04 -07:00
Brad Davis
f0d0979ade Fix UI element placement 2015-07-29 09:19:09 -07:00
Bradley Austin Davis
3c6416d6b8 Merge branch 'master' into plugins 2015-07-27 10:09:02 -04:00
David Rowe
3893add148 Fix setting WebWindow's width and height 
Width and height parameters now set the WebWindow's width and height
instead of its minimum size, when not part of a tool window.
 2015-07-24 10:43:24 -07:00
Bradley Austin Davis
a60e669d3d Merge branch 'master' into plugins 2015-07-24 13:38:18 -04:00
David Rowe
c1e1caa709 Add ability to update title of WebWindow after it's created 2015-07-23 21:59:19 -07:00
Bradley Austin Davis
408bb082d7 Merge fixes, OSX compile fixes 2015-07-22 13:24:47 -04:00
SamGondelman
4d3b08b5e3 modified sword.js to work with vive controllers 2015-07-20 14:52:49 -07:00
Anthony J. Thibault
56e7af081e input plugin architecture, fixed sixense 2015-07-15 18:50:44 -07:00
Sam Gondelman
81efd99ae4 merge with hifi/plugins 2015-07-02 10:13:28 -07:00
Bradley Austin Davis
54bbc841e2 Working on mac compilability 2015-07-01 23:03:33 -07:00
Brad Davis
e421141ec5 experimenting with input plugins 2015-06-30 09:52:54 -07:00
Ryan Huffman
4df1bea4ec Merge pull request #5167 from SamGondelman/hmdControls 
hmdControls.js for movement when wearing an HMD
 2015-06-24 14:40:31 -07:00
Brad Davis
3231bbba5a Merge remote-tracking branch 'upstream/master' into overlay 
Conflicts:
	interface/src/Application.cpp
 2015-06-22 09:44:16 -07:00
bwent
c315bcec24 Expose mouseDoublePressEvents to js 2015-06-19 15:52:27 -07:00
Sam Gondelman
aab8161fa4 remove unused function 2015-06-18 18:57:04 -07:00
Brad Davis
48b27acc79 Merge remote-tracking branch 'upstream/master' into overlay 
Conflicts:
	interface/src/Application.cpp
	interface/src/ui/ApplicationOverlay.cpp
 2015-06-18 18:17:59 -07:00
Sam Gondelman
f752534f7c actionEvent signal, captureActions, began work on hmdControls.js 2015-06-18 09:52:36 -07:00
Brad Davis
ae1c9603b9 Merge remote-tracking branch 'upstream/master' into overlay 2015-06-17 15:13:04 -07:00
Sam Gondelman
0157997126 fix findDevice 2015-06-17 14:42:11 -07:00
Sam Gondelman
17322645f2 added mouselook script, reticle and icons need changes 2015-06-17 11:17:38 -07:00
Brad Davis
00d8fe75ab Breaking up overlay into rendering and compositing classes 2015-06-13 17:36:08 -07:00
Sam Gondelman
b8b61e7c62 integrated joysticks with userinputmapper, enabling plug-in-and-play controllers and input mapping with js 2015-06-11 15:51:21 -07:00
Brad Hefta-Gaub
24fda9a733 Merge pull request #5085 from SamGondelman/master 
Exposing Input Key Binding To JavaScript
 2015-06-11 14:41:34 -07:00
David Rowe
01b1e9c4ed Signal domain changes for those handled by ICE as well as not 2015-06-09 12:33:14 -07:00
Sam Gondelman
0769593ca8 added getters/setters for Inputs and InputChannels 2015-06-09 10:20:36 -07:00
Sam Gondelman
984d449bf9 exposed input key bindings to js to enable key remapping 2015-06-04 16:29:58 -07:00
Bradley Austin Davis
fc825f6632 Fixing the loading of local HTML so it works on both OSX and win32 2015-05-13 09:46:24 -07:00
Brad Davis
8c4f802dbf Merge remote-tracking branch 'upstream/master' into web-entity 
Conflicts:
	libraries/entities/src/EntityItemProperties.h
	libraries/entities/src/EntityTypes.h
 2015-05-12 15:56:02 -07:00
ZappoMan
73428ec12d add support to not displace very large clipboards on import 2015-05-11 14:21:58 -07:00
Brad Davis
302aa9db47 Removing access to the gl widget and display managers 2015-05-02 00:49:52 -07:00
Brad Davis
a96f69a673 Switching to a wrapper mechanism for VR menus 2015-04-25 16:20:15 -07: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
Ryan Huffman
547b0e5ee6 Update style of webview to only be set when 'fusion' exists 2015-04-24 13:42:03 -07:00
Brad Davis
1ff8c67576 More work on menus and some code cleanup 2015-04-24 12:54:11 -07:00
Ryan Huffman
df591f9ad7 Set style of webview 2015-04-24 11:49:33 -07:00
Brad Davis
a9d65f168b Working on marketplace dialog 2015-04-23 14:23:11 -07:00
David Rowe
349cc3241d Restore minimized windows to view 2015-04-01 18:59:34 -07:00
David Rowe
49de54de48 Use improved WebWindowClass for friends window 2015-04-01 18:58:59 -07:00
David Rowe
96e888864a Merge branch 'master' into 20422 2015-04-01 14:56:48 -07:00
David Rowe
e519928320 Move friends window to own class 2015-04-01 11:38:32 -07:00
David Rowe
e06f28b7c5 Merge branch 'master' into 20422 
Conflicts:
	examples/users.js
	interface/src/Application.cpp
 2015-03-31 21:01:54 -07:00
ZappoMan
d68143675a first simple pass at using marketplace windows in preferences 2015-03-31 16:24:27 -07:00
Philip Rosedale
5325478940 Merge pull request #4528 from ZappoMan/avatarUI 
Support for Auto-detecting FST type, and adding type hint to FST files when packaged
 2015-03-30 21:31:22 -07:00
Andrew Meadows
2404fb126f Merge pull request #4527 from sethalves/valgrind 
Valgrind told me to do it
 2015-03-30 11:56:17 -07:00
David Rowe
cbf2012bf5 Add menu items that set visibility 
And synchronize visibility settings between Interface and users.js.
 2015-03-29 18:35:56 -07:00
Seth Alves
986bc71e93 quiet compiler 2015-03-28 17:10:26 -07:00
David Rowe
be69c0b58f Add add/remove friends menu item 
This must display the dialog whether or not users.js is running. Both
C++ and JavaScript need to open or restore the same dialog, hence a new
dialog rather than using WebWindow with its JavaScript baggage.
 2015-03-28 13:05:23 -07:00
ZappoMan
baa2f947e5 classifying FSTReader and moving ModelType into that class 2015-03-27 16:30:00 -07:00
David Rowe
90c1da2094 Merge branch 'master' into 20416 
Conflicts:
	examples/notifications.js
 2015-03-27 12:13:29 -07:00
David Rowe
cb6abfb2e6 Display notification if domain connection refused 2015-03-23 12:05:56 -07:00
Ryan Huffman
d097b4409e Add title to non-toolbar WebWindows 2015-03-17 10:40:51 -07:00
Ryan Huffman
1e1c60847b Add WebWindow::getURL 2015-03-17 09:07:01 -07:00
Ryan Huffman
8088b01356 Add WebWindow::raise 2015-03-17 09:06:48 -07:00
Ryan Huffman
46f6c9f888 Add WebWindow::setURL 2015-03-17 09:06:31 -07:00
Ryan Huffman
9d5c0cf4e3 Add layout to WebWindowClass to that it maximizes the webview 2015-03-13 17:25:24 -07:00
Ryan Huffman
1193d86d7b Update webwindow to use datawebview 2015-03-13 16:39:25 -07:00
Ryan Huffman
53b5c7e971 Update WebWindow to raise when being set to visible 2015-03-13 14:11:01 -07:00
Ryan Huffman
dc3453a878 Add Window.raiseMainWindow() 2015-03-13 14:10:46 -07:00
Ryan Huffman
7ef1964a52 Add user agent for WebWindow 2015-03-13 11:52:02 -07:00
Ryan Huffman
93cdb3a293 Add option for non-tool window WebWindows 2015-03-13 11:51:40 -07:00
Ryan Huffman
c3c2a75f48 Handle .svo drop events and emit svoImportRequested 2015-03-11 15:38:15 -07:00
Ryan Huffman
2f885bb7f2 Move WindowScriptingInterface to DependencyManager 2015-03-11 15:34:29 -07:00
Stephen Birarda
cd382eeea5 expose discoverability changes to js 2015-03-09 17:20:09 -07:00
Stephen Birarda
77a60a3d72 remove discoverability setter until API ready 2015-03-09 16:34:00 -07:00
Stephen Birarda
f81ae30918 fix getUsername for AccountManager include in implementation 2015-03-09 16:32:09 -07:00
Stephen Birarda
2f22c0cd96 cleanup username API from GlobalServicesScriptingInterface 2015-03-09 16:28:01 -07:00
Ryan Huffman
03c03a20f9 Update pasteEntities to use vec3 2015-03-05 13:52:30 -08:00
Ryan Huffman
6848025504 Add exporting by entity ID to Application 2015-03-05 13:36:16 -08:00
Ryan Huffman
71768ef275 Return entity IDs on paste 2015-03-05 12:36:45 -08:00
Ryan Huffman
a922619ebc Add Clipboard.exportEntities that takes a list of entity IDs 2015-03-05 12:36:10 -08:00
Stephen Birarda
e43da00537 remove xmpp chat support 2015-03-03 10:13:41 -08:00
Andrew Meadows
7b68916010 Merge pull request #4343 from ZappoMan/hangOnExit 
BUG FIX: Hang on exit
 2015-02-25 17:02:26 -08:00
Leonardo Murillo
006b3ed0ac Merge pull request #4300 from birarda/dependencies 
NOT MERGEABLE - add some externals as cmake external projects
 2015-02-25 13:22:49 -08:00
ZappoMan
a89691fc66 switch GLCanvas back to being owned by Application 2015-02-25 12:11:35 -08:00
Brad Hefta-Gaub
8c26be49d7 Merge pull request #4330 from huffman/edit-off-on-domain-change 
Turn editEntities off on domain change
 2015-02-24 20:11:39 -08:00
Andrew Meadows
1b669af79d Merge pull request #4307 from Atlante45/fix_warnings 
Fix warnings
 2015-02-24 12:19:32 -08:00
Philip Rosedale
d74856e01b add angularVelocity to controller 2015-02-24 11:21:04 -08:00
Ryan Huffman
4641bd0cd9 Add Window.domainChanged signal for scripting 2015-02-24 10:47:37 -08:00
Stephen Birarda
437d5c7bdf repairs to include locations for QXmpp and SDL2 2015-02-23 09:26:35 -08:00
Atlante45
5230b805d2 Fix warnings 2015-02-18 19:24:29 +01:00
Thijs Wenker
062c2cbcee HUD LookAt positions could be NULL now if whenever they're out of range 
HMD.HUDLookAtPosition2D -> HMD.getHUDLookAtPosition2D()
HMD.HUDLookAtPosition3D -> HMD.getHUDLookAtPosition3D()
 2015-02-12 22:55:44 +01:00
Thijs Wenker
0e66305456 changed HMDScriptingInterface MyAvatar to new way of retrieving this object 2015-02-07 13:37:33 +01:00
Thijs Wenker
e3ca1efe6b Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-02-07 00:34:38 +01:00
Stephen Birarda
219e78425b resolve conflicts on merge with upstream master 2015-02-06 09:49:46 -08:00
Andrew Meadows
5ea785f4ad Merge pull request #4232 from thoys/cursor_is_visible_and_oculus_cursor_visibility 
Ability to make cursor invisible again (both OS-cursor and oculus rectile) and js-interface to cursorVisible boolean
 2015-02-06 08:58:14 -08:00
Thijs Wenker
27147fde2a add Write function to the Window.cursurVisible property 2015-02-06 14:45:22 +01:00
Thijs Wenker
9dbcefed2a Fix for making cursor invisible over the glwidget and js-interface to cursorVisible boolean 2015-02-04 23:23:27 +01:00
Seth Alves
bcf0846310 merge from master 2015-02-04 11:30:22 -08:00
Thijs Wenker
38aab9570b Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-02-04 19:55:12 +01:00
Stephen Birarda
11f3161029 resolve conflicts on merge with upstream/master 2015-02-04 10:38:05 -08:00
Brad Hefta-Gaub
de58c4a007 Merge pull request #4217 from Atlante45/master 
Fix for fps bug/field of view
 2015-02-03 19:13:52 -08:00
Seth Alves
8489ee04f3 fix a couple of signed vs unsigned comparisons. 2015-02-03 16:11:04 -08:00
Atlante45
27459ba861 Settings update 2015-02-03 12:27:30 -08:00
Ryan Huffman
ba5a96f541 Add Window.setFocus 2015-02-03 11:44:22 -08:00
Seth Alves
c1ae98fa1a quiet some compiler warnings about signed vs unsigned comparisons 2015-02-02 15:02:29 -08:00
Atlante45
647a935eaa Remove app->getAvatar 2015-01-29 15:16:40 -08:00
Atlante45
4ef87b9919 Merge branch 'master' of https://github.com/highfidelity/hifi into android 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/DatagramProcessor.cpp
	interface/src/Menu.cpp
	interface/src/ui/PreferencesDialog.cpp
	interface/src/ui/Stats.cpp
	libraries/audio-client/src/AudioClient.cpp
	libraries/audio-client/src/AudioClient.h
 2015-01-28 13:13:32 -08:00
Thijs Wenker
46618db697 Merge branch 'master' of https://github.com/worklist/hifi into 20224 
Conflicts:
	interface/src/ui/ApplicationOverlay.h
 2015-01-28 19:35:17 +01:00
David Rowe
7286a9c5fb Merge branch 'master' into 20276 2015-01-27 19:08:40 -08:00
Atlante45
20358a87d6 Moved some headers around 2015-01-27 01:43:01 -08:00
David Rowe
22347dd794 Add AudioDevice.deviceChanged() signal and use to update audio menu 2015-01-22 19:11:55 -08:00
Atlante45
38e7bddc73 Merge branch 'android' of https://github.com/birarda/hifi into android 2015-01-21 15:14:07 -08:00
Stephen Birarda
0eced09f1d intial removal of Audio to audio-client 2015-01-21 11:49:06 -08:00
Atlante45
11ea3e4047 Merge branch 'master' of https://github.com/highfidelity/hifi into pull_out_menu_mess 2015-01-21 11:15:31 -08:00
Thijs Wenker
87b2c362fc style 2015-01-21 17:19:51 +01:00
Thijs Wenker
719f76d42f Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-21 15:09:11 +01:00
Thijs Wenker
9e51bece63 More accurate HMD-cursor on virtual keyboard, thanks Simon and @ctrlaltdavid for the help on this! 2015-01-21 15:07:32 +01:00
Ryan Huffman
0d9dbaccf7 Merge branch 'master' of github.com:highfidelity/hifi into entity-list-updates 2015-01-20 11:44:13 -08:00
Atlante45
6a00dcbf0a More switches to new Settings 2015-01-20 00:30:29 -08:00
Atlante45
c2b7ff1b54 Totally removed Application's setting memember 2015-01-18 19:10:30 -08:00
Atlante45
1f31828e08 Moved last methog out of Menu 
Also did a bit of Header cleanup
 2015-01-18 07:14:52 -08:00
Thijs Wenker
6bad7a6002 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-17 01:35:35 +01:00
Ryan Huffman
ba752040dd Update WebWindow to redefine EventBridge after refresh 2015-01-16 16:24:19 -08:00
Thijs Wenker
5de4f8f249 Merge branch 'master' of https://github.com/worklist/hifi into 20224 
Conflicts:
	examples/libraries/virtualKeyboard.js
 2015-01-15 22:59:05 +01:00
Thijs Wenker
12136e5305 cursor follows look at rotation now 2015-01-15 22:25:59 +01:00
Stephen Birarda
e538669343 resolve conflicts on merge with upstream 2015-01-15 13:12:05 -08:00
Stephen Birarda
79d214619d update lobby for new places API 2015-01-14 18:18:26 -08:00
Thijs Wenker
2611e2f364 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-14 15:40:46 +01:00
Atlante45
f77fab2fe0 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 2015-01-13 20:38:52 -08:00
Thijs Wenker
0f6ad4eba0 HMD.VRMode -> HMD.active , and hooked it to a function which isn't dependent on HMD type, since there will be more HMD's than Oculus supported in the near future. 2015-01-14 00:07:15 +01:00
Thijs Wenker
ca4d493ec9 added HMD.VRMode to HMDScriptingInterface 2015-01-14 00:01:50 +01:00
Atlante45
2a82ff9768 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 
Conflicts:
	assignment-client/src/voxels/VoxelServer.cpp
	interface/src/Application.cpp
	interface/src/Audio.cpp
	interface/src/DatagramProcessor.cpp
	interface/src/Menu.cpp
	interface/src/Util.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/ui/ApplicationOverlay.cpp
	interface/src/ui/PreferencesDialog.cpp
	libraries/networking/src/NodeList.cpp
	libraries/shared/src/DependencyManager.h
 2015-01-13 11:03:14 -08:00
Thijs Wenker
3da5677aaf added HMD interface to toggle magnifier 2015-01-13 00:43:16 +01:00
David Rowe
6c4932f9d0 Coding standard 2015-01-07 11:24:10 -08:00
David Rowe
40274df279 Add downloads information changed event for JavaScript 2015-01-07 11:20:46 -08:00
David Rowe
8b0d859686 Add method to access downloads information in JavaScript 2015-01-06 15:54:07 -08:00
Philip Rosedale
413cbacbc1 Merge pull request #4043 from ZappoMan/voxelEctomy 
more voxel-ectomy cleaning up some remaining references to voxels
 2015-01-06 10:07:38 -08:00
ZappoMan
b940dcfdb3 more voxel-ectomy cleaning up some remaining references to voxels 2015-01-06 09:27:48 -08:00
Stephen Birarda
51bba4884f resolve conflicts on merge with upstream master 2015-01-05 14:40:48 -08:00
ZappoMan
4ea9bbc309 first major pass at voxelEctomy 2014-12-30 18:08:58 -08:00
Atlante45
296c0025de Switched to auto and changed macro 2014-12-18 15:42:38 -08:00