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

1330 commits

Author SHA1 Message Date
David Rowe
57ca34f866 Fix up script injection methods 2016-12-20 07:33:55 -08:00
David Rowe
ef488ec036 Get script injection working in new marketplaces window 2016-12-20 07:33:55 -08:00
David Rowe
4dbbb08c98 Update user instructions 2016-12-20 07:33:55 -08:00
David Rowe
196473f9fa Provide keyboard in marketplaces window 2016-12-20 07:33:55 -08:00
David Rowe
1c6cb9f905 Tidying 2016-12-20 07:33:55 -08:00
David Rowe
9dbcb94a0c Update Clara.io instructions 2016-12-20 07:33:55 -08:00
Anthony J. Thibault
10f9233c90 Fixed js interface after recent Tablet.qml changes 
* TabletButton.inDebugMode defaults to false
* TabletButton now listens to onIsActiveChanged event to flip state of button.
* Fixed help.js and tabletTest.js to compensate for the removal of the TabletButton.color property
 2016-12-19 12:20:56 -08:00
Anthony Thibault
c84a88bd6b Merge pull request #9220 from druiz17/tablet 
fixed home button issues
 2016-12-16 14:28:46 -08:00
Dante Ruiz
61e2fb2366 correct indentation for HomeButton.js 2016-12-16 21:51:01 +00:00
Dante Ruiz
8f36090884 removed tabs and also remove script from host 2016-12-16 21:45:53 +00:00
Dante Ruiz
f7df9a64b2 remmoved tabs 2016-12-16 18:32:05 +00:00
Dante Ruiz
cb4b2473e1 remmoved tabs as whitespace 2016-12-16 18:30:15 +00:00
Dante Ruiz
a0a8ecc158 even more clean up 2016-12-16 17:28:02 +00:00
Dante Ruiz
f2d9f34993 more clean up 2016-12-16 17:25:38 +00:00
Dante Ruiz
889e9e854c clean up 2016-12-16 17:24:53 +00:00
Dante Ruiz
40a79867be removed unnessary comments 2016-12-16 17:24:09 +00:00
Dante Ruiz
571783b90d fixed home buttons issues 2016-12-16 09:19:22 -08:00
Anthony J. Thibault
5441d33a25 Support for the ablity to change button properties from js. 2016-12-15 18:17:14 -08:00
Anthony J. Thibault
0add5274ac Add tabletTest.js to test adding and removing buttons from tablet UI 2016-12-15 16:50:20 -08:00
Anthony J. Thibault
8b99fa90e8 Merge branch 'master' into tablet-ui 2016-12-15 13:28:23 -08:00
Brad Hefta-Gaub
0923a79139 Merge pull request #9187 from PhilipRosedale/rescale 
Rescale yourself or entities using the grip buttons
 2016-12-15 12:32:04 -08:00
Anthony J. Thibault
d2c4417b24 Hook up Help button to the new Tablet interface 2016-12-14 17:05:47 -08:00
Philip Rosedale
14c867fdbd Can't resize if objects in both hands, avatar resize is seek + grips 2016-12-14 13:38:37 -08:00
Zach Fox
c53111781b Fix the bug 2016-12-14 12:17:00 -08:00
Jazmin
b7b4c685e7 Fixed typo 2016-12-13 11:48:06 -08:00
Jazmin
4effdd0394 Update Bubble model in script 2016-12-13 11:46:40 -08:00
Jazmin
0a031e204e Delete old bubble model 2016-12-13 11:46:22 -08:00
Jazmin
efc9f6549b Add new bubble model 2016-12-13 11:45:50 -08:00
Jazmin
d9fbde2f66 Update bubble height 
This height allows my friends to stay in my view comfortably, even when the space bubble is on.  Even though it's significantly lower, I don't think anyone is not going to look down when someone starts to shrink down in front of them.
 2016-12-13 11:43:09 -08:00
Seth Alves
16128f5087 Merge pull request #9191 from druiz17/homeButton 
Home button prototype
 2016-12-12 16:27:06 -08:00
Seth Alves
d97be52542 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2016-12-12 16:24:17 -08:00
samcake
9155f11b3d Merge pull request #9190 from jherico/test_mode 
Add test mode to interface
 2016-12-12 15:37:05 -08:00
Dante Ruiz
cc0e25720e mimimize the git diffs 2016-12-12 23:29:11 +00:00
Philip Rosedale
9370c8af6b Added ability to rescale avatar 2016-12-12 15:26:53 -08:00
Dante Ruiz
6a8465a6ca removed more whitespace 2016-12-12 23:26:06 +00:00
Chris Collins
4ce1bb3abc Merge pull request #9172 from thoys/avatarFinderBeacon 
avatarFinderBeacon.js -- Find other avatars more easily
 2016-12-12 15:25:36 -08:00
Dante Ruiz
92993202a4 removed double variable definition 2016-12-12 23:24:56 +00:00
Dante Ruiz
ccecce77de removed unneeded whitespace 2016-12-12 23:21:14 +00:00
Dante Ruiz
737f11fb7a merge fix 2016-12-12 23:03:38 +00:00
Brad Davis
2a43f5fbef Add test mode to interface 2016-12-12 14:51:11 -08:00
Dante Ruiz
1b7c89c41d home button working 2016-12-12 14:34:42 -08:00
Zach Fox
7030c7b0a6 Space bubble improvements (#9142) 
* The space bubble around a player's avatar is now visualized. When another avatar enters a player's bubble, The bubble visualization will appear, a soft tone will play, and the "Bubble" HUD button will flash.
* The space bubble radius setting has been removed. Space bubble size now scales based on avatar scale.
* Space bubble collision detection is now more accurate and reliable.
* CTRL + N toggles the bubble.
* The "Bubble" HUD button has been moved to the proper location.
 2016-12-12 14:22:54 -08:00
Philip Rosedale
a142c830fa Merge branch 'master' of git://github.com/highfidelity/hifi into rescale 2016-12-12 09:41:34 -08:00
Philip Rosedale
8572950a09 Both grip buttons enable rescale for a held object 2016-12-12 09:39:32 -08:00
Faye Li Si Fi
78c96293a7 Staging cameras, lights, and backdrop 2016-12-09 17:25:18 -08:00
Thijs Wenker
3ec06b1a6e Remove redundant parentheses 2016-12-10 00:21:20 +01:00
Seth Alves
dd3f3957a9 Merge pull request #9164 from fayeli/last-edited-property 
Exposing last edited property of Entity to Javascript
 2016-12-09 13:13:11 -08:00
Thijs Wenker
4d467deb5e Fix if statement to match style rule 4.2.8 2016-12-09 21:26:59 +01:00
Thijs Wenker
3f9aa00fd6 Increased show-radius to 20 meters 2016-12-09 19:39:48 +01:00
Seth Alves
37b179b00b remove commented-out code 2016-12-09 09:55:02 -08:00
Seth Alves
6c99b5e9ca code review 2016-12-09 06:50:10 -08:00
Thijs Wenker
9397108b3b clear -> cleanup typo 2016-12-09 03:14:05 +01:00
Thijs Wenker
3ceac7d071 Fix for "cannot access member `sessionUUID' of deleted QObject" error 2016-12-09 02:44:43 +01:00
Thijs Wenker
28e8bb69ec ignore camera man 2016-12-09 02:29:21 +01:00
Thijs Wenker
387f73b349 reset avatar beacons on domain change 2016-12-09 02:11:05 +01:00
Seth Alves
e06a445959 remove some cruft 2016-12-08 17:00:50 -08:00
Seth Alves
369f61e172 bring over some previous tablet-ui work 2016-12-08 16:54:39 -08:00
Thijs Wenker
dfb4c7cf89 avatarFinderBeacon 2016-12-09 01:41:19 +01:00
Faye Li Si Fi
33142d6a7f mvp progress 2016-12-08 16:01:50 -08:00
Faye Li Si Fi
1644c2eeb4 added unit test 2016-12-08 11:17:38 -08:00
howard-stearns
3ba5e1ed4a new mic toolbar button art 2016-12-06 10:52:40 -08:00
Andrew Meadows
7db8e8f31b Merge pull request #9156 from hyperlogic/out-of-body-revert 
Revert Out of Body experience
 2016-12-06 08:37:20 -08:00
Ryan Downe Karpf
fa50e8eddd Merge pull request #9157 from howard-stearns/mic-icon-swap 
new mic unumute art
 2016-12-05 17:01:59 -08:00
Ryan Huffman
a81e7c2d2c Merge pull request #9148 from Polyrhythm/ryan/client-side-tests 
Client script test runner
 2016-12-05 16:23:17 -08:00
howard-stearns
7621672964 new mic unumute art 2016-12-05 16:00:03 -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
Ryan Jones
094857949d tabs -> spaces, remove raw ptr, remove unnecessary spec diff 2016-12-05 12:57:21 -08:00
Ryan Huffman
996d3f5875 Merge pull request #9135 from druiz17/nearGrab 
Fixed pressing the grip button causes a near grabbed object to drop
 2016-12-05 11:07:15 -08:00
Dante Ruiz
08301d488d clean up 2016-12-05 18:10:54 +00:00
Dante Ruiz
09d5dc382f better solution 2016-12-05 18:08:36 +00:00
Ryan Jones
39e1a3fb44 add client-side test runner 2016-12-04 20:53:06 -08:00
Seth Alves
d2b32c3084 Merge pull request #9057 from druiz17/childParent 
fixed children of parent object not being added back when performing an undo
 2016-12-01 16:59:06 -08:00
Zach Fox
30dade242c GIFs: Quality improvements; duration tweaks; processing notif (#9139) 2016-12-01 14:53:18 -08:00
Dante Ruiz
348c0c95e5 conforming to coding standard and better variable naming 2016-12-01 22:22:17 +00:00
Seth Alves
24e54f25bf Merge pull request #9108 from PhilipRosedale/drifting 
Grab.js weaker at a distance
 2016-12-01 12:59:28 -08:00
Philip Rosedale
c60b0c7ef5 Fix indents 2016-12-01 12:54:38 -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
Dante Ruiz
a35f28725b fixed child not commit back when performing undo 2016-12-01 10:54:26 -08:00
Dante Ruiz
3c1d434449 fixed typo 2016-12-01 10:54:26 -08:00
Dante Ruiz
0c9cd5803a added descendant checking 2016-12-01 10:54:26 -08:00
Dante Ruiz
cb0e01bfa4 fixed child of parent not being added when performing an undo 2016-12-01 10:54:26 -08:00
Dante Ruiz
1b24d373d2 fixed near grab issue 2016-12-01 10:18:34 -08:00
Dante Ruiz
dc7bb5b083 grip button fix 2016-12-01 10:17:54 -08:00
Chris Collins
19b5e7cd86 Merge pull request #9054 from howard-stearns/third-person-lasers 
make hand-controller ui work in third person
 2016-12-01 10:11:12 -08:00
Chris Collins
c0a0a16ff8 Merge pull request #9127 from huffman/fix/hand-controller-grab-release 
Fix 'releaseGrab' not being called when using grip buttons
 2016-12-01 09:58:36 -08:00
Anthony J. Thibault
7f840d3a08 Can use 'xboxLaser' in third person camera 2016-11-30 10:01:11 -08:00
Anthony J. Thibault
78559934a1 Merge branch 'master' into third-person-lasers 2016-11-29 16:38:34 -08:00
Ryan Huffman
aa1e813d72 Fix 'releaseGrab' not being called when using grip buttons 2016-11-29 15:04:14 -08:00
Ryan Jones
01ae2b9452 add errant semicolon 2016-11-29 11:56:11 -08:00
Ryan Jones
251b070db3 add unit test 2016-11-29 11:50:11 -08:00
Ryan Jones
a59df5b04d one last indentation fix 2016-11-28 17:19:43 -08:00
Ryan Jones
3961dbcf55 revert changes to dev utils, apply changes to system utils 2016-11-28 17:18:31 -08:00
Ryan Jones
68e86da023 adjust indentation and implement editorconfig at root of repo 2016-11-28 17:10:59 -08:00
Ryan Jones
4be1922df5 add bind polyfill 2016-11-28 14:47:15 -08:00
Howard Stearns
030f0d7103 Merge pull request #9114 from howard-stearns/bubble-state 
bubble state
 2016-11-28 12:16:39 -08:00
David Kelly
1b26d51292 Merge pull request #9110 from howard-stearns/capture-original-location-in-snapshots 
Capture original location in snapshots
 2016-11-28 08:55:47 -08:00
howard-stearns
8b9efb461e bubble state 2016-11-23 10:22:24 -08:00
howard-stearns
414371d1fc record starting href/domainId, not ending 2016-11-22 16:13:08 -08:00
howard-stearns
2c9046742e allow movement during .gif recording 2016-11-22 16:02:01 -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