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

592 commits

Author SHA1 Message Date
Brad Davis
2a43f5fbef Add test mode to interface 2016-12-12 14:51:11 -08:00
Seth Alves
369f61e172 bring over some previous tablet-ui work 2016-12-08 16:54:39 -08:00
Anthony J. Thibault
89ae3b3d6e Revert "Merge pull request #8691 from highfidelity/out-of-body-experience" 
This reverts commit efe9571ab8, reversing
changes made to 333e9ec7f4.
 2016-12-05 15:18:03 -08:00
Zach Fox
30dade242c GIFs: Quality improvements; duration tweaks; processing notif (#9139) 2016-12-01 14:53:18 -08:00
Seth Alves
efe9571ab8 Merge pull request #8691 from highfidelity/out-of-body-experience 
Room Scale HMD comfort features.
 2016-12-01 11:09:39 -08:00
howard-stearns
5188de924f allow for SnapshotReview dialog to be up during a change of href for all 
media capture
 2016-11-22 11:09:43 -08:00
Zach Fox
a81289a0d7 Huge progress today. Buggy behavior with multiple snapshots remains 2016-11-18 14:39:29 -08:00
Zach Fox
f726ea546f code cleanup; simultaneous gif and still capture 2016-11-18 14:39:29 -08:00
Zach Fox
704476c197 Initial progressgit add -A! 2016-11-18 14:39:28 -08:00
Ryan Huffman
7e9df928f4 Add jsdoc comments to Menu 2016-11-16 10:49:50 -08:00
Andrew Meadows
6bb3dd6830 Merge hifi/master into hifi/out-of-body-experience 2016-11-14 15:08:04 -08:00
Ryan Huffman
3fcc2d3fa5 Add jsdoc to Clipboard 2016-11-14 13:52:16 -08:00
howard-stearns
4d18a3cc3d expose menu enablement to javascript 2016-11-10 15:01:06 -08:00
Anthony J. Thibault
839b1a3c5e Added some jsdoc comments to the C++ source 2016-11-09 18:09:10 -08:00
Andrew Meadows
38e4ac0ae9 Merge master into out-of-body-experience 2016-10-26 16:59:31 -07:00
Brad Hefta-Gaub
a25d50387e gak 2016-10-24 14:47:10 -07:00
Andrew Meadows
51a9a99381 Merge hifi/master into hifi/out-of-body-experience 2016-10-24 08:13:42 -07:00
Brad Hefta-Gaub
0f8967970a Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers 2016-10-24 08:11:31 -07:00
Brad Hefta-Gaub
a282d83546 more work on extra lasers 2016-10-24 07:46:04 -07:00
Anthony J. Thibault
60f728585a away.js now shows hand controllers in away mode. 
* controllerDisplayManager is now part of default scripts.
* Also tutorial and away.js communicate with controllerDisplayManager via HMD.requestShowHandControllers, HMD.requestHideHandControllers
  and sendLocalMessage.
* removed previous version of controllerDisplayManger from tutorial.
 2016-10-21 10:40:39 -07:00
Brad Hefta-Gaub
8a071f18b3 more work 2016-10-20 11:18:20 -07:00
Andrew Meadows
d54c07ed14 Merge 'master' into 'out-of-body-experience' 2016-10-12 13:35:27 -07:00
Ryan Huffman
216cf2b4bc Update tutorial to work with HMD + Hand Controllers only 2016-10-07 10:30:18 -07:00
Anthony J. Thibault
2fdd5e4368 Build fixes for change in getMyAvatar() from DepenencyManager 
It now returns a smart_ptr, not a raw pointer.
 2016-10-05 17:57:48 -07:00
Anthony J. Thibault
cc7a6ada38 Merge branch 'master' into out-of-body-experience 2016-10-05 17:16:39 -07:00
Clément Brisset
d18394f249 Merge pull request #8596 from huffman/feat/my-avatar-self-id 
Add ability to parent overlays to MyAvatar for use across servers
 2016-10-05 12:03:01 -07:00
David Kelly
621e3fc000 Expose triggerOption to scripts, plus _physicsEnabled 
Now any menu item can be triggered.  Plus you can do a
Window.isPhysicsEnabled to detect when we are done loading assets and
such.  Whee!
 2016-09-30 09:06:17 -07:00
Anthony J. Thibault
98ffea2fb9 Merge branch 'master' into out-of-body-experience 2016-09-22 18:08:23 -07:00
Brad Hefta-Gaub
5d3d4bdbd9 add support for redirection on domain at max capacity 2016-09-21 18:12:38 -07:00
Ryan Huffman
23450e929b Add special avatar id for attaching overlays 2016-09-13 16:33:58 -07:00
Anthony J. Thibault
86351ca21c Teleport bugs 
* made HMD.setPosition thread safe
* changed script to use HMD.position = foo;
 2016-09-09 17:32:02 -07:00
Andrew Meadows
97623f489c expose setting HMD sensorToWorld from JS script 2016-09-09 16:32:57 -07:00
SamGondelman
99176588cc remove old webwindowclass that relied on qwebkit 2016-09-06 17:36:59 -07:00
SamGondelman
716647037e removed unused code 2016-09-06 17:36:54 -07:00
Brad Davis
20deae3242 Working on Qt 5.6 compatibility 2016-09-06 17:35:04 -07:00
Howard Stearns
89b00883dd Merge pull request #8428 from highfidelity/discovery 
Snapshot of Snapshot-Discovery to master
 2016-08-23 14:32:10 -07:00
howard-stearns
d0b58d8f8e move thread safety into Application from caller 2016-08-22 12:49:51 -07:00
howard-stearns
80afc6a3b4 pr review comments 2016-08-22 10:59:21 -07:00
howard-stearns
a3d64dbd9c code cleanup 2016-08-19 14:14:31 -07:00
howard-stearns
f6670a6374 new optional aspect-ratio argument to snapshot chain (javascript through 
c++ display plugin). When non-zero, it pulls out the largest piece from
the center that maintains that ratio.  Snapshot button uses 1.91.
 2016-08-18 16:29:42 -07:00
howard-stearns
4492c4e64e Allow javascript to safely open the correct login window (or answer that 
it is unneded).
 2016-08-18 14:19:36 -07:00
Seth Alves
87dbfa7e47 add -Wsuggest-override to compile flags and deal with fallout 2016-08-18 09:51:41 -07:00
howard-stearns
347b20e506 expose to scripts the ability to show dedicated qml windows such as 
preferences
 2016-08-17 09:54:15 -07:00
howard-stearns
2a099d5577 expose to scripts the ability to open the feed 2016-08-17 09:53:26 -07:00
howard-stearns
2b75240771 Merge branch 'master' of https://github.com/highfidelity/hifi into discovery 2016-08-16 11:14:36 -07:00
Brad Davis
5b09748c00 Merge pull request #8431 from imgntn/assetbutton 
Open Asset Browser with Button from Edit.js Toolbar
 2016-08-13 12:04:21 -07:00
Zander Otavka
62f4e3536b Expose showing asset server to script interface 2016-08-12 15:18:30 -07:00
howard-stearns
e6746acf4c Merge branch 'master' of https://github.com/highfidelity/hifi into discovery 2016-08-11 15:40:26 -07:00
Atlante45
f0ff975248 UI wiring 2016-08-08 15:39:25 -07:00
David Kelly
c8f3a898d2 First cut of a snapshot uploader 
Will need to test end-to-end shortly, etc...
 2016-08-08 15:27:27 -07:00
howard-stearns
fed775ff83 simple snapshot confirmation 2016-08-04 15:52:39 -07:00
David Kelly
1d7cdff2bc Snapshot button plus script 
Minor change to allow snapshots to not notify (though the old way
with CTRL+S still does).  Added button to do it, saves them to disk.

The plan is for us to add UI to share (or not) the snapshot.  That's
why we are not going through the notifications.  Also, the
script makes sure to hide/unhide hud and overlays.  Next we will upload
the pick to AWS via data-web (if you are logged in), and _then_ make
the share UI.
 2016-08-01 18:21:01 -07:00
humbletim
3e0ef7d43a make Assets.getMapping(path) actually return the mapping 2016-07-28 10:13:30 -04:00
Ryan Downe Karpf
91714aaca6 Merge pull request #8258 from AlexanderOtavka/edit-model-ui 
Edit model dialog improvements
 2016-07-22 17:11:52 -07:00
Anthony J. Thibault
837b19ed1b fix for pushing avatar into floor when exiting away mode. 
* Removed MyAvatar.reset() access from JavaScript
* Added HMD.centerUI() to JavaScript, which can be used to reset the 3D UI sphere around the current HMD orientation.
* Added MyAvatar.clearIKJOintLimitHistory() which can be used to reset any remembered IK joint limit history.
* Added MyAvatar.centerBody() which can be used to instantly re-orient the avatar's so that the hips and toes
  are facing the same direction as the current HMD orientation.

away.js now uses the above new API's instead of MyAvatar.reset()
 2016-07-19 14:42:24 -07:00
Zander Otavka
71f62c02fc Add basic implementation of customPrompt 
Still missing the warning and diabling of dynamic checkbox when the
static mesh is selected.
 2016-07-15 17:35:55 -07:00
Brad Davis
ffdaadf13c Make toolbars work even when debugging a script 2016-07-14 17:40:02 -07:00
Stephen Birarda
345478eb36 add removeButton API to ToolbarScriptingInterface 2016-07-13 15:06:31 -07:00
Brad Davis
6336362d40 Fixing decoration inflation 2016-07-12 17:23:13 -07:00
Brad Hefta-Gaub
b8d79ec263 Merge pull request #8179 from SamGondelman/snapshotFix3 
Various snapshot improvements
 2016-07-12 15:28:51 -07:00
SamGondelman
04184ee1fb added snapshot notification in desktop mode 2016-07-05 17:21:57 -07:00
howard-stearns
ff55644fe8 stateful hud toolbar buttons 2016-06-30 16:24:11 -07:00
Sam Gondelman
3c809ef40c Merge pull request #8123 from AlexanderOtavka/first-person-hmd 
Automatically enter first person when in HMD mode
 2016-06-24 15:58:38 -07:00
Zander Otavka
dd023e16fd Tabs -> spaces 2016-06-24 13:16:24 -07:00
Zander Otavka
d45694836f Add signal for display mode change in HMD 2016-06-24 11:57:12 -07:00
howard-stearns
d3735322a5 Whitespace. 2016-06-22 13:03:13 -07:00
Brad Davis
37e9f66639 Additional toolbar work 2016-06-20 15:41:21 -07:00
Bradley Austin Davis
ec615caa80 Support toolbar API 2016-06-17 13:06:42 -07:00
Bradley Austin Davis
6ad1008a56 Allow explicit overlay alpha from scripts 2016-06-15 17:24:32 -07:00
Bradley Austin Davis
bc838ac0b4 Fix vive json 2016-06-15 11:41:28 -07:00
Bradley Austin Davis
0b0977f362 Support keyboard suppresion, control suppresion while in keyboard mode 2016-06-15 10:48:48 -07:00
Bradley Austin Davis
71bf9384ce Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-15 10:45:51 -07:00
Brad Davis
9640727f51 Hand laser rendering support in HMD plugins. 2016-06-13 13:04:11 -07:00
David Rowe
5553c9f87f Code review 2016-06-14 07:46:41 +12:00
David Rowe
58f89c88a2 Remember last directory used for Window.browse() and Window.save() 
Use last directory if not specified in method call. Default to desktop.
 2016-06-11 16:45:17 +12:00
David Rowe
7a8954d851 Merge branch 'master' into clipboard-dimensions 2016-06-02 12:55:23 +12:00
David Rowe
2f3fa80b96 Add Clipboard.getContentsDimensions() JavaScript method 2016-05-26 09:52:22 +12:00
Brad Hefta-Gaub
2eef07e414 cleanup and dead code removal 2016-05-24 15:38:08 -07:00
Brad Hefta-Gaub
12a1857280 check point with protocol refusal working 2016-05-24 15:20:11 -07:00
Brad Hefta-Gaub
1cf8236860 Merge branch 'master' of https://github.com/highfidelity/hifi into protocolVersionCheck 2016-05-24 13:31:36 -07:00
Brad Hefta-Gaub
1d9981e624 first cut at support for verifying all protocol version compatibility 2016-05-24 13:31:19 -07:00
Seth Alves
40e862cf9e quiet gcc 5 warnings 2016-05-21 16:53:01 -07:00
Ryan Huffman
01944f5100 Remove unused DependencyManager include 2016-05-18 15:38:54 -07:00
Ryan Huffman
dd093e3fcd Make AccountManager a DependencyManager singleton 2016-05-18 15:38:54 -07:00
Brad Davis
40316498a4 Enable script debugging 2016-05-09 17:02:40 -07:00
Stephen Birarda
ed1ddc2a8b remove code to update/store wallet balance 2016-05-06 11:54:49 -07:00
Seth Alves
49566c8f26 fix memory leak in AssetMappingModel 2016-04-25 10:07:08 -07:00
Brad Hefta-Gaub
d87d631871 Merge pull request #7708 from zzmp/feat/render-rates 
Add renderRates.js to visualize rates over time
 2016-04-21 15:59:58 -07:00
Zach Pomerantz
2c7cf3ea83 Fix RateScriptingInterface headers 2016-04-20 14:32:25 -07:00
Zach Pomerantz
ad225b3aed Fix RatesScriptingInterface ctor 2016-04-20 13:58:06 -07:00
Zach Pomerantz
1fe12e7029 Mv Rates to RatesScriptingInterface.h 2016-04-20 13:26:23 -07:00
Brad Hefta-Gaub
8f3d48190a switch to QRect instead of vec4 2016-04-16 16:59:47 -07:00
Brad Hefta-Gaub
54777c9cd5 Merge branch 'master' of https://github.com/highfidelity/hifi into improveHMD 2016-04-16 15:19:35 -07:00
Brad Hefta-Gaub
04df84974c handle repositioning of qml windows 2016-04-15 19:50:12 -07:00
Brad Hefta-Gaub
c7f58dc17c first cut at exposing recommend overlay rectangle 2016-04-14 20:47:31 -07:00
Atlante45
4ed8573f74 CR 2016-04-14 17:28:24 -07:00
Atlante45
e45939d18f Make sure ResourceCacheSharedItems deals with strong refs 2016-04-12 13:51:11 -07:00
Atlante45
afdfef1482 Make sure we don't use raw resource ptr 2016-04-12 13:51:11 -07:00
Seth Alves
5fa9f662fc Merge pull request #7542 from birarda/refresh-on-asset-connect 
refresh/close the asset browser dialog on domain switch
 2016-04-01 18:08:59 -07:00
Stephen Birarda
194226103c refresh the Asset Browser when switching domains 2016-04-01 11:13:59 -07:00
Brad Davis
97e96f7b67 PR comments 2016-03-31 13:19:26 -07:00
Stephen Birarda
29cd487f84 fixes for styling and logging from CR 2016-03-15 14:38:08 -07:00
Atlante45
03efde5b3c Change text in case of drag and drop. 2016-03-15 13:53:13 -07:00
Atlante45
4a90ec303c Fix drag&drop 2016-03-15 11:22:42 -07:00
Ryan Huffman
1b81b4f01b Merge branch 'atp' of github.com:birarda/hifi into atp-upload 2016-03-15 10:19:20 -07:00
Ryan Huffman
7947bd7724 Fix message typo enter => entering 2016-03-15 10:11:53 -07:00
Atlante45
98851679c5 Remove unused AssetMappingItem 2016-03-15 09:14:22 -07:00
Stephen Birarda
72c64532f5 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2016-03-15 09:12:49 -07:00
Ryan Huffman
4b6dd4636f Merge branch 'atp' of github.com:birarda/hifi into atp-upload 2016-03-13 21:32:25 -07:00
Ryan Huffman
6c27bd9eb2 Update upload flow and make asset list dynamically sized 2016-03-13 21:04:07 -07:00
Philip Rosedale
7e581cc831 Merge pull request #7325 from hyperlogic/tony/smooth-hands 
Smoother hand motion when using hand controllers
 2016-03-11 15:08:59 -08:00
Stephen Birarda
66e572f226 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2016-03-11 14:44:49 -08:00
Stephen Birarda
e51aedeb35 fix error handling for diff request types 2016-03-11 11:36:52 -08:00
Brad Davis
75c3fd18c9 Expose HMD worn to scripting 2016-03-11 11:00:58 -08:00
Ryan Huffman
631aad80f9 Add Q_DECLARE_METATYPE(AssetMappingModel*) and fix indentation 2016-03-11 09:53:08 -08:00
Anthony J. Thibault
807d31743c Removed Hand, HandData & PalmData 
Instead, we just store two controller::Poses in MyAvatar.
Existing behavior and scripting APIs have been preserved.

The hand controller debug drawing is slightly different, but still works.
 2016-03-10 19:33:31 -08:00
Stephen Birarda
625032f748 fix for add to world after upload name change 2016-03-10 17:10:49 -08:00
Stephen Birarda
979fda7c8b add trimming for upload mapping 2016-03-10 16:57:39 -08:00
Stephen Birarda
96a112290f use mapping for overwrite prompt 2016-03-10 16:56:22 -08:00
Atlante45
35f5ebb938 Don't allow folder overwrite 2016-03-10 16:44:39 -08:00
Ryan Huffman
ad0fb18d81 Add / to beginning of mapping on upload if missing 2016-03-10 16:02:41 -08:00
Ryan Huffman
2d4864ed33 Merge branch 'atp' of github.com:birarda/hifi into atp-more 2016-03-10 15:40:07 -08:00
Atlante45
a6ccfb1685 CR 2016-03-10 15:11:39 -08:00
Atlante45
63571a7c36 Make sure Upload is not clicked several times 2016-03-10 14:59:20 -08:00
Atlante45
548d826a4e Couple bug fixes 2016-03-10 14:59:20 -08:00
Atlante45
7d7a683b18 Add uploadFile method that prompts the user 2016-03-10 14:59:20 -08:00
Ryan Huffman
3e5e2eef17 Add mapping sorting, copying, and isKnownMapping 2016-03-10 08:18:32 -08:00
Brad Davis
28103cf5ef Migrate composition of the overlay and pointer to the present thread 2016-03-07 17:14:41 -08:00
Stephen Birarda
f44cf3903c re-instate verified domain ownership for full automatic networking 
This reverts commit 34408c8144.
 2016-03-01 13:04:37 -08:00
Stephen Birarda
34408c8144 Revert "verified domain ownership for full automatic networking" 2016-02-25 17:02:08 -08:00
Clément Brisset
2e7c7eace5 Merge pull request #7179 from birarda/domain-security 
verified domain ownership for full automatic networking
 2016-02-25 15:24:09 -08:00
Stephen Birarda
6cab831ea0 re-gen the interface keypair while being denied from domain 2016-02-23 14:52:12 -08:00
Brad Hefta-Gaub
9c3abd3eb7 some cleanup and standardization in how headPose is gathered 2016-02-20 11:40:30 -08:00
Brad Hefta-Gaub
7be5811f34 tweak to UI size, clean up screen to overlay 2016-02-19 13:22:37 -08:00
Brad Hefta-Gaub
8b8b99c7e0 HMD mouse checkpoint 2016-02-17 21:19:01 -08:00
Brad Hefta-Gaub
0d873c7732 consolidate all calls to QCursor::pos() and QCursor.setPosition() to use common ControllerScriptingInterface 2016-02-15 16:11:25 -08:00
Brad Hefta-Gaub
df6437236e some CR feedback 2016-02-12 16:13:12 -08:00
Brad Hefta-Gaub
1160ecb335 improvements in HMD UI behavior 2016-02-12 10:51:33 -08:00
Bradley Austin Davis
0a99086617 Moving to QML based dialogs 2016-02-03 14:51:02 -08:00
Bradley Austin Davis
c1d45b0c78 Remove declarative form creation from WindowScriptingInterface 2016-02-03 14:50:59 -08:00
Bradley Austin Davis
f24f2749e1 Make users.js show QML window for edit friends 2016-02-02 15:19:12 -08:00
Ryan Huffman
acf96a401f Fix marketplace imports failing silently if edit.js not running 2016-01-29 15:48:08 -08:00
David Rowe
d7d4961778 Wire up missing GlobalServices.connected() signal 2016-01-21 20:58:14 +13:00
Brad Davis
746c388f7a Cleanup of QML windowing and message boxes 2016-01-15 23:14:49 -08:00
Brad Hefta-Gaub
a70adc8a57 Merge pull request #6823 from jherico/tool_window 
Tool window in QML
 2016-01-14 16:56:27 -08:00
Brad Hefta-Gaub
6b76cf484d fix issues with HMD lookout 2D, and cleanup 2016-01-14 08:48:55 -08:00
Brad Davis
b6272b7824 Migrate tool window to overlay/QML 2016-01-13 15:40:37 -08:00
Brad Hefta-Gaub
0f52b82c21 allow scripted addMenu() to specify grouping 2016-01-08 11:21:37 -08:00
Brad Hefta-Gaub
927fe97359 migrate callers of QMessageBox::warning() to OffscreenUi::warning() 2016-01-05 10:17:16 -08:00
Brad Hefta-Gaub
d98c2d1413 migrate callers of QMessageBox::question() to OffscreenUi::question() 2016-01-05 09:39:39 -08:00