Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-29 21:02:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
46017 commits 71 branches 56 tags 1.2 GiB
Commit graph

580 commits

Author SHA1 Message Date
Seth Alves
dbe65df90b merge from upstream 2016-08-23 16:42:02 -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
James B. Pollack
fb6fa687e8 in the right place... thanks howard! 2016-08-23 12:07:59 -07:00
James B. Pollack
fcf459645d center after teleport 2016-08-23 12:02:57 -07:00
Brad Hefta-Gaub
21bc06f154 Merge pull request #8335 from hyperlogic/feature/hand-controller-web-entity-integration 
handControllerGrab and web entity input integration
 2016-08-23 09:59:25 -07:00
Seth Alves
6c80a35c4b Merge pull request #8477 from sethalves/fix-grab-ignore-ik-1 
ignoreIK flag on action-grabbable objects works again
 2016-08-22 18:48:39 -07:00
howard-stearns
bc90b0bc43 pr review 2016-08-22 16:09:09 -07:00
howard-stearns
fc906df5f6 separate into three files 2016-08-22 15:04:38 -07:00
howard-stearns
6daf91166f pr comments 2016-08-22 15:03:51 -07:00
Anthony J. Thibault
d015c5cfb5 Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-22 14:13:17 -07:00
howard-stearns
989974738a dead code removal 2016-08-22 12:50:51 -07:00
howard-stearns
80afc6a3b4 pr review comments 2016-08-22 10:59:21 -07:00
David Rowe
80ee864143 Add icon to "Share in Feed" button 2016-08-20 18:17:49 +12:00
Howard Stearns
35829f5f01 Merge pull request #8489 from howard-stearns/merge-from-master-to-discovery3 
Merge from master to discovery3
 2016-08-19 21:36:48 -07:00
Howard Stearns
7428eb2635 Merge branch 'master' of https://github.com/highfidelity/hifi into discovery 2016-08-19 21:34:55 -07:00
Howard Stearns
527fb0941f decrease snapshot review dialog height 2016-08-19 21:28:12 -07:00
David Rowe
8d88726dba Fix spacing above image when single column 2016-08-20 13:57:00 +12:00
David Rowe
a94c24e6df Text and controls 2016-08-20 13:44:47 +12:00
Chris Collins
74cb2d4bcf Merge pull request #8461 from imgntn/demo_movement 
Movement changes for Hand Controllers
 2016-08-19 18:36:40 -07:00
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
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