Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-04-30 14:12:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
49007 commits 25 branches 0 tags 1.1 GiB
Commit graph

993 commits

Author SHA1 Message Date
Dante Ruiz
31decffb31 clean up 2 2016-12-20 15:59:52 +00:00
Dante Ruiz
7251fa6c18 clean up 2016-12-20 15:54:14 +00:00
Dante Ruiz
74092d8714 removed commented code 2016-12-20 15:46:15 +00:00
Dante Ruiz
fc4b4f85f4 added button to menu 2016-12-20 00:24:45 +00:00
Dante Ruiz
c0e82d3e05 moving buttons to tablet 2016-12-19 13:43:49 -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
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
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
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
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
Thijs Wenker
3ec06b1a6e Remove redundant parentheses 2016-12-10 00:21:20 +01: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