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

623 commits

Author SHA1 Message Date
Atlante45
dd60683e29 Move steam.js to unpublishedScripts 2016-08-19 17:14:14 -07:00
David Rowe
6a9f221a9e Snapshot image border 2016-08-20 11:36:53 +12:00
David Rowe
3d2afaac77 Size and position snapshot dialog content blocks 2016-08-20 11:19:30 +12:00
Anthony J. Thibault
ff4c194756 eslint fix 2016-08-19 15:31:57 -07:00
James B. Pollack
2b1e629cca some extra checks on settings values 2016-08-19 14:51:15 -07:00
howard-stearns
1e08914f8d simplify 2016-08-19 14:32:15 -07:00
James B. Pollack
3922192cfc update 2016-08-19 14:31:47 -07:00
James B. Pollack
653b1acc4a cleanup 2016-08-19 14:29:14 -07:00
howard-stearns
a3d64dbd9c code cleanup 2016-08-19 14:14:31 -07:00
howard-stearns
b8b345fb43 Merge branch 'master' of https://github.com/highfidelity/hifi into update-discovery-from-master2 2016-08-19 13:04:39 -07:00
elisa-lj11
4c434e875e fixed merge conflicts in Application.cpp 2016-08-19 09:46:22 -07:00
Seth Alves
ff95ef2492 ignoreIK flag on action-grabbable objects works again 2016-08-19 08:59:42 -07:00
Anthony J. Thibault
4db1687746 bug fix for when web-entity is deleted while being scrolled 2016-08-18 18:37:52 -07:00
James B. Pollack
b694b8e541 update turn rate for left stick 2016-08-18 17:24:18 -07:00
James B. Pollack
855561c014 moar 2016-08-18 16:52:32 -07:00
James B. Pollack
a0d4fd4c0e fix bug 2016-08-18 16:51:04 -07:00
James B. Pollack
214a705199 slow 180 rate 2016-08-18 16:50:50 -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
James B. Pollack
3a8de5ab0d fix rotation function 2016-08-18 15:58:12 -07:00
James B. Pollack
bae51bcfd4 remove prints 2016-08-18 15:29:49 -07:00
James B. Pollack
859d3ccadc tweaks 2016-08-18 14:36:52 -07:00
howard-stearns
aab3b83ad9 open login if user tries to share and is not logged in, rather than 
messaging user that they cannot share
 2016-08-18 14:20:53 -07:00
James B. Pollack
2e22bc5e46 new coolin 2016-08-18 14:08:31 -07:00
James B. Pollack
992504e179 adjust coolin 2016-08-18 13:35:51 -07:00
howard-stearns
5e8722ccf5 persist "open feed after" checkbox setting 2016-08-18 12:58:00 -07:00
James B. Pollack
b8213aed7b naming and some logging for teleport stuff 2016-08-18 11:59:58 -07:00
James B. Pollack
37846d9f0c store settings 2016-08-18 11:07:50 -07:00
James B. Pollack
1eaac8605f invert the structure and make it work with oculus 2016-08-18 10:43:37 -07:00
James B. Pollack
09cd0b8f4a debug prints 2 2016-08-18 09:24:01 -07:00
James B. Pollack
7768e65e8b update name 2016-08-18 09:22:43 -07:00
James B. Pollack
9e14191217 recondition 2016-08-18 08:57:37 -07:00
James B. Pollack
cfbc589829 debug prints 2016-08-18 08:43:26 -07:00
James B. Pollack
8ede4ddb66 longform 2016-08-17 17:33:24 -07:00
James B. Pollack
e69c89a93e y 2016-08-17 17:00:17 -07:00
James B. Pollack
fdfcc235b6 as functions 2016-08-17 16:24:59 -07:00
James B. Pollack
514d6ec139 get lsy lsx rsy values 2016-08-17 16:22:44 -07:00
James B. Pollack
fc65d246ee update whens 2016-08-17 16:13:23 -07:00
James B. Pollack
a4a41faf24 demo and only do for vive 2016-08-17 16:12:07 -07:00
James B. Pollack
82a8887275 add whens 2016-08-17 15:50:19 -07:00
James B. Pollack
a7ba4ce1f9 jumping 2016-08-17 15:11:07 -07:00
James B. Pollack
8bc6ca2fa1 demo changes 2016-08-17 15:08:43 -07:00
Anthony J. Thibault
7b248b440a Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-17 13:55:12 -07:00
howard-stearns
8823f48666 new snapshot review behavior 2016-08-17 10:00:20 -07:00
Brad Hefta-Gaub
f66b36ff07 Merge pull request #8441 from imgntn/marketplace_spawn_location 
Better create locations for Entities
 2016-08-17 09:09:00 -07:00
James B. Pollack
0810ad0e7b use square of sides 2016-08-16 18:13:42 -07:00
James B. Pollack
e9c2a1d509 cleanup prints 2016-08-16 18:03:34 -07:00
James B. Pollack
06787029b7 small 2016-08-16 17:58:35 -07:00
Anthony J. Thibault
7de8cc6422 Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-16 16:49:57 -07:00
Seth Alves
7bc1235c54 local velocity and angular velocity in scripts is now handled the way local position and rotation are 2016-08-16 16:47:13 -07:00
Anthony J. Thibault
36d87ddd7c Added EntityItem::wantsHandControllerPointerEvents method 2016-08-16 16:23:45 -07:00
Anthony J. Thibault
a595a72d0a handControllerGrab now calls Entities.sendHoverLeaveEntity() 2016-08-16 15:39:02 -07:00
Anthony J. Thibault
c407818d63 send pointer events from handControllerGrab.js to webEntities 2016-08-16 15:26:14 -07:00
howard-stearns
a8fd92d2bf Hide reticle during snapshot 2016-08-16 12:35:49 -07:00
Seth Alves
c85e8d0580 don't show equip sphere until hand is in position to equip. widen unequip/drop cone 2016-08-16 11:18:12 -07:00
howard-stearns
2b75240771 Merge branch 'master' of https://github.com/highfidelity/hifi into discovery 2016-08-16 11:14:36 -07:00
James B. Pollack
1632f4cb3d better create locations 2016-08-16 10:52:05 -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
Brad Hefta-Gaub
8a28f7cdac Merge pull request #8432 from Atlante45/fix/ignore 
Fix ignore icon stuck in hover state
 2016-08-12 19:28:47 -07:00
Atlante45
b6c26b2f87 Fix ignore icon stuck in hover state 2016-08-12 18:13:26 -07:00
James B. Pollack
cd10b2b62e open asset browser with a button 2016-08-12 15:49:36 -07:00
Atlante45
121890235c New steam invite icon 2016-08-12 15:24:28 -07:00
James B. Pollack
1366dabc3a yay 2016-08-12 14:24:29 -07:00
howard-stearns
afe376a0a2 fix breakage I made to snapshot uploading 2016-08-12 14:08:50 -07:00
howard-stearns
1b62332058 don't show checkboxes on confirmation dialog when there's only one picture 2016-08-12 11:50:11 -07:00
howard-stearns
ae9af88db2 Spacing and better size for HMD pictures. 2016-08-12 11:28:35 -07:00
Atlante45
e4dd4c1a41 Merge branch 'master' of https://github.com/highfidelity/hifi into steam 2016-08-12 10:38:05 -07:00
David Kelly
3408ad6f54 Wording change 2016-08-12 10:23:33 -07:00
David Kelly
e23e9014c6 Merge remote-tracking branch 'upstream/discovery' into dk/gateSnapshotShares 2016-08-12 10:16:27 -07:00
howard-stearns
e3aae0e93f Fix up layout, and adapt to recent changes in file structure 2016-08-11 16:23:01 -07:00
howard-stearns
e6746acf4c Merge branch 'master' of https://github.com/highfidelity/hifi into discovery 2016-08-11 15:40:26 -07:00
Anthony J. Thibault
1ddbd7022a Moved keyboardFocus, mouse/touch event methods from Reticle to Entities 2016-08-11 11:52:04 -07:00
David Kelly
c1edd008a4 PR feedback 2016-08-11 11:47:55 -07:00
David Kelly
47dea0ea2b Hide sharing if not logged in, or in an accessible place 
The grand future will have option to login, and so on...
 2016-08-10 17:09:43 -07:00
Anthony J. Thibault
8dac45c99e Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-10 11:27:21 -07:00
Brad Hefta-Gaub
9874c63b25 Merge pull request #8398 from zzmp/refactor/system-html 
refactor system html to split js/css
 2016-08-10 09:17:52 -07:00
Brad Hefta-Gaub
412052c285 Merge pull request #8380 from highfidelity/fade 
Add fade in loading effect
 2016-08-09 16:50:05 -07:00
howard-stearns
5715fd00f3 proper share dialog 2016-08-09 16:42:41 -07:00
SamGondelman
2360e90d39 simplify valid check for rotation 2016-08-09 15:48:31 -07:00
Howard Stearns
2cdca6211f Merge pull request #8389 from davidkelly/dk/uploadSnapshot 
First cut of a snapshot uploader
 2016-08-09 15:47:04 -07:00
Zach Pomerantz
d5b822ddbe remove missing camera selectors 2016-08-09 15:23:36 -07:00
Zach Pomerantz
6965fb0520 refactor system html to split js/css 2016-08-09 15:23:31 -07:00
SamGondelman
956078bc91 teleport works with xbox controller 2016-08-09 15:17:36 -07:00
David Kelly
d4f376879d PR feedback 2016-08-09 15:05:23 -07:00
SamGondelman
9b27f8bc0f Merge remote-tracking branch 'upstream/master' into loadingFade 2016-08-09 14:55:14 -07:00
David Kelly
0d1df2627d Merge pull request #8356 from howard-stearns/feed-display 
feed display
 2016-08-09 14:52:53 -07:00
Brad Hefta-Gaub
75edb74db4 Merge pull request #8386 from imgntn/edit_1_property_order 
Edit.js - change spatial property order and cleanup
 2016-08-09 12:42:20 -07:00
Atlante45
42c9a695ff Invite friends in HMD 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
SamGondelman
328d3128fa merge from master 2016-08-08 13:30:39 -07:00
Brad Hefta-Gaub
b903c974bc Merge pull request #8371 from imgntn/teleport_cancel 
Cancel mode for teleporting
 2016-08-08 13:04:27 -07:00
James B. Pollack
58ccc9581a cleanup 2016-08-08 12:20:48 -07:00
James B. Pollack
bde46adee8 update description 2016-08-08 11:31:43 -07:00
James B. Pollack
f8c1d8f123 change property order and cleanup 2016-08-08 11:01:03 -07:00
SamGondelman
0ec1da4a0d Merge remote-tracking branch 'upstream/master' into loadingFade 2016-08-08 10:55:20 -07:00
SamGondelman
b23d3cd35a fixed messed up transparency on edit selection of shapes 2016-08-05 18:35:16 -07:00
Seth Alves
090a0a6e9a only use hand-sphere vs equipped-item bounding box when deciding to auto-unequip 2016-08-05 18:01:48 -07:00
Seth Alves
e59c010642 speling 2016-08-05 15:39:20 -07:00
Seth Alves
dc22b579f7 adjust code that auto-unequips items when they are pulled too far from the equipping hand 2016-08-05 15:28:37 -07:00
Anthony J. Thibault
0ba34c5635 Remove input restrictions on grabbable web entities. 
You no longer have to be grabbing a grabbable web entity to interact with it.
 2016-08-05 15:25:54 -07:00
Anthony J. Thibault
1dd276c1a5 Improved support for button rollover and hover 
Send a combination of mouse and touch events to the web browser entity.

* MouseMove events for when the trigger is not depressed.  This will trigger mouse over and hover events within the browser
* Touch Begin, End, Update events when the trigger is squeezed.  This will give us the iPad like scrolling behavior.
 2016-08-05 11:32:50 -07:00