Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 18:16:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
57804 commits 71 branches 56 tags 1.2 GiB
Commit graph

57804 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
9d1fba3a3b Merge pull request #10821 from ctrlaltdavid/21418 
Don't execute body of controllers' plugin update methods if not enabled
 2017-07-25 08:51:17 -07:00
Ryan Huffman
9421e6ebb6 Merge pull request #11029 from cain-kilgore/dominant-hands 
WL 21453 - Add a "Dominant Hand" setting
 2017-07-25 08:01:31 -07:00
Cain Kilgore
f9204a7034 Now it should appear.. 2017-07-25 09:03:47 +01:00
Mike Moody
34594b914d Added and removed different normalizations. 2017-07-24 23:55:44 -07:00
Mike Moody
dc53017dd4 Created script to let Snails eat brussel sprouts. 2017-07-24 23:17:13 -07:00
Andrew Meadows
a21da8613c Merge pull request #11028 from sethalves/script-getmeshes-for-models 
Script getmeshes for models
 2017-07-24 23:01:53 -07:00
Andrew Meadows
942a231a70 Merge pull request #11035 from highfidelity/bug/6740 
Fixed bug: Disconnected domain (no access token present) is unnecessarily hitting /api/v1/user/friends
 2017-07-24 22:43:37 -07:00
Cain Kilgore
2f857a6d1a Forgot a file 2017-07-25 06:05:06 +01:00
Seth Alves
a3f4aeb182 code review 2017-07-24 19:41:30 -07:00
Seth Alves
c4d909927a make atp-client work again 2017-07-24 19:23:39 -07:00
Seth Alves
d1037a49ae Merge branch 'master' of github.com:highfidelity/hifi into script-getmeshes-for-models 2017-07-24 19:23:30 -07:00
Mike Moody
1bf2855e9b Created script for spherical gravity. 2017-07-24 18:47:24 -07:00
Mike Moody
62efb32671 Created script for spherical gravity. 2017-07-24 18:39:09 -07:00
Mike Moody
e900dae708 Created script for spherical gravity. 2017-07-24 18:34:58 -07:00
Cain Kilgore
280a7a7e42 Fixing Styling, added Preference to Tablet, Moved Location to Avatar Tuning 2017-07-25 01:48:55 +01:00
Seth Alves
766c6f48c3 third person camera is alt+G rather than alt+O 2017-07-24 17:43:01 -07:00
utkarshgautamnyu
5771ee27e1 Update DomainGatekeeper.cpp 2017-07-24 17:33:01 -07:00
Zach Fox
c22798a8e6 Offset tablet position to left of screen per feedback 2017-07-24 17:16:07 -07:00
Mike Moody
036a16c0b3 readded line that caused colflict. 2017-07-24 16:51:23 -07:00
Mike Moody
697830b80b Merge branch 'master' of git://github.com/highfidelity/hifi into 21374 2017-07-24 16:50:38 -07:00
Mike Moody
4c78fba2cc Removed line that caused colflict. 2017-07-24 16:50:33 -07:00
Seth Alves
97756e6140 accidently deleted a break 2017-07-24 16:12:03 -07:00
Seth Alves
82a787a753 use alt+h for mirror-mode 2017-07-24 16:04:11 -07:00
Andrew Meadows
8c55476c65 fix motor direction when walking upside down 
also maintain worldUp and remove unnecessary cruft
 2017-07-24 16:00:13 -07:00
Andrew Meadows
4994283247 remove unnecessary state check 2017-07-24 16:00:13 -07:00
Andrew Meadows
f598b1f1f5 fix spelling typo in comment 2017-07-24 16:00:13 -07:00
Andrew Meadows
29be9aee65 move nextAttitude() from AvatarData to MyAvatar 2017-07-24 16:00:13 -07:00
Andrew Meadows
f0871c6878 avoid unnecessary and expensive gets 2017-07-24 16:00:13 -07:00
Seth Alves
e53badf88b use alt+f for 1st person camera and alt+o for 3rd 2017-07-24 15:56:37 -07:00
Cain Kilgore
84609f27e3 Final Change - They're now Radio Boxes. 2017-07-24 23:53:03 +01:00
Seth Alves
afc7eaff8d Merge branch 'bug-camera-mode-mods' of github.com:druiz17/hifi into bug-camera-mode-mods 2017-07-24 15:21:37 -07:00
Chris Collins
8b978beb31 Merge pull request #11022 from 1P-Cusack/21463 
WL21463 - entitySelectionTool: use multiarg findRayIntersection inste…
 2017-07-24 15:13:21 -07:00
Mike Moody
7de164f1ab moved below a check that returns. 2017-07-24 15:06:45 -07:00
utkarshgautamnyu
884bdb3b7e Update DomainGatekeeper.cpp 2017-07-24 14:57:22 -07:00
utkarshgautamnyu
7c62ed6dac made sendRequest depend on hasValidAccessToken being true 2017-07-24 14:46:32 -07:00
Rob Kayson
507368726f added dart scripts 2017-07-24 14:38:22 -07:00
Cain Kilgore
9c152ddc6f Ticking left will keep it on left, not right 2017-07-24 22:30:43 +01:00
Zach Fox
223ed5b59a Hack to mod tablet orientation when clicking context overlay 2017-07-24 14:29:06 -07:00
humbletim
de6975b227 add missing cursor-*.pngs 2017-07-24 17:16:13 -04:00
Seth Alves
23cb7d8bee Merge pull request #11030 from MiladNazeri/editJs-edit 
Fix Parent Joint in edit js WL # 21471 :
 2017-07-24 14:11:48 -07:00
Andrew Meadows
a44b33ab11 Merge pull request #11023 from jherico/audio_deadlock 
Fix for audio deadlock & audio device selection
 2017-07-24 14:03:29 -07:00
Mike Moody
a4585b9400 Merge branch 'master' of git://github.com/highfidelity/hifi into 21374 2017-07-24 13:31:27 -07:00
Cain Kilgore
9ff7891c88 Fixed reference error, Gustavo should build now. 2017-07-24 19:56:02 +01:00
Chris Collins
c90442137c Merge pull request #11032 from Atlante45/stable 
Stable => Master
 2017-07-24 11:42:59 -07:00
Atlante45
d21ca3f1fc Merge branch 'stable' of https://github.com/highfidelity/hifi into stable 2017-07-24 11:41:02 -07:00
Cain Kilgore
64ba159adf Updating Small Reference 2017-07-24 19:12:14 +01:00
Cain Kilgore
fd2264f7c9 removed duplicate 2017-07-24 19:05:49 +01:00
Cain Kilgore
e6fd85f45a Some code cleanup 2017-07-24 19:02:40 +01:00
Cain Kilgore
42742ba1f9 Changed the Return to a String "left/right" instead. 2017-07-24 18:31:16 +01:00
Brad Hefta-Gaub
0ba8d43522 Merge pull request #10994 from vladest/avatar_default_speeds 
Change default mouse speeds for avatar
 2017-07-24 10:13:27 -07:00