Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 07:53:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
49810 commits 71 branches 56 tags 1.2 GiB
Commit graph

49810 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
0fc1abc068 remember previous parentID in the script and try to put it back when releasing 2017-01-10 13:00:49 -08:00
druiz17
96d7a568f0 Merge pull request #9344 from sethalves/tablet-ui-grab-no-patch 
Tablet ui grab no patch
 2017-01-10 09:42:03 -08:00
Seth Alves
bff9e9be38 put back code that replaces previous parentID on release 2017-01-10 09:22:36 -08:00
Seth Alves
eb4a2b0af5 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-grab-no-patch 2017-01-10 09:13:34 -08:00
druiz17
28c8d527df Merge pull request #9340 from fayeli/tablet-hide-yellow 
Ability to disable yellow highlight around Web Overlays
 2017-01-10 09:11:51 -08:00
Seth Alves
4a29cce584 adjust when USER_COLLISION_GROUP_MY_AVATAR is auto-disabled 2017-01-10 06:17:40 -08:00
Seth Alves
35577f49d0 change the test for when MY_AVATAR collisions are short-circuited 2017-01-09 17:00:39 -08:00
Seth Alves
ad45bbf5ba set DIRTY_COLLISION_GROUP flag when parentID changes 2017-01-09 16:45:54 -08:00
Seth Alves
45a26d599f if something is a child of the local avatar, never let it collide with MY_AVATAR 2017-01-09 16:40:28 -08:00
Seth Alves
01ff3f14b6 re-evaluate an entities in-bullet status when parentID changes 2017-01-09 15:28:05 -08:00
Seth Alves
61f0c56a36 remove code that remembers previous state in userData 2017-01-09 14:20:03 -08:00
Faye Li Si Fi
32eda3a49c redo 2017-01-09 14:02:14 -08:00
Faye Li Si Fi
c39eb6294e undo 2017-01-09 14:01:59 -08:00
Faye Li Si Fi
5323e7f34d set showKeyboardHighlight to false when initialising tablet 2017-01-09 13:36:58 -08:00
Faye Li Si Fi
93e4f9126f disable drawing highlight if "showKeyboardFocusHighlight" flag is false 2017-01-09 11:01:15 -08:00
Anthony J. Thibault
6794ed7cc4 Merge remote-tracking branch 'upstream/master' into tablet-ui 2017-01-09 10:37:46 -08:00
Faye Li Si Fi
2fa17ea6a7 fix missing parenthesis 2017-01-09 10:23:31 -08:00
Seth Alves
fa803aebe9 use /~/ style to reference includes 2017-01-09 10:21:07 -08:00
Chris Collins
30d5f70e11 Merge pull request #9278 from jherico/cpu_opt_scene 
More low level optimizations
 2017-01-09 10:10:40 -08:00
Seth Alves
25318156dc Merge branch 'tablet-ui-grab-no-patch' of github.com:sethalves/hifi into tablet-ui-grab-no-patch 2017-01-09 10:10:32 -08:00
Faye Li Si Fi
d0d89e216d Add showKeyboardFocusHighlight in constructor 2017-01-09 09:54:41 -08:00
Seth Alves
a2b21c51f8 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-grab-no-patch 2017-01-09 09:54:35 -08:00
Seth Alves
635dc0411c Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-grab-no-patch 2017-01-09 09:47:07 -08:00
Seth Alves
a9194e1bdb Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-grab-no-patch 2017-01-08 11:41:32 -08:00
Brad Hefta-Gaub
a1ee76d250 Merge pull request #9332 from cozza13/21123 
Change default scripts to include clara
 2017-01-08 09:15:41 -08:00
Chris Collins
215659c695 Enabled the ability to have other marketplaces. 
Enabled the ability to have other marketplaces.
 2017-01-07 08:17:13 -08:00
Brad Hefta-Gaub
1a7b5ab520 Merge pull request #9326 from jherico/oculus_budget_stats 
Adding tracking of Oculus renders, submits, and frames that are over budget
 2017-01-06 18:18:16 -08:00
Howard Stearns
b432ffa78d Merge pull request #9323 from zfox23/FixPalSpaceBubbleInteraction 
Fix the PAL & Space Bubble interaction
 2017-01-06 16:47:43 -08:00
Seth Alves
4fa4c73f0d Merge pull request #9329 from druiz17/tabletPosition 
Tablet positioning works for all input devices
 2017-01-06 16:43:59 -08:00
Dante Ruiz
7205215baa coding standard fix 2017-01-07 00:38:39 +00:00
Dante Ruiz
07079ad78d fixed bug 2017-01-07 00:22:55 +00:00
Dante Ruiz
4ef5c76a65 fixed issues 3.0 2017-01-07 00:08:53 +00:00
Dante Ruiz
55e7b46790 fixed issues 2.0 2017-01-07 00:07:38 +00:00
Dante Ruiz
cec2692c77 fixed issues 2017-01-07 00:06:42 +00:00
Dante Ruiz
32938861cd indentation fix 2017-01-07 00:03:04 +00:00
Dante Ruiz
31e57a0dcd update branch 2017-01-06 15:35:32 -08:00
Dante Ruiz
19c6a672d9 re-did tablet position 2017-01-06 15:35:32 -08:00
Seth Alves
20a84e7288 Merge pull request #9322 from sethalves/tablet-ui-reenable-web-lasers 
Tablet ui reenable web lasers
 2017-01-06 15:23:16 -08:00
Seth Alves
ad6175857d Merge pull request #9328 from hyperlogic/tablet-ui 
Allow Hifi.SoundEffect to be used in all qml
 2017-01-06 15:21:08 -08:00
Zach Fox
afa6d54ac4 Actually fix the behavior... 2017-01-06 14:20:25 -08:00
Anthony J. Thibault
0860c50a49 Allow Hifi.SoundEffect to be used in all qml 
Including webEntities, webOverlays and the system tablet.
We might want to add this to enable spatial sound effects for the web keyboard.
 2017-01-06 14:01:13 -08:00
Zach Fox
dec41f67cc Fix bugs and generally fix behavior 2017-01-06 13:58:23 -08:00
Seth Alves
d32866c8cd Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-reenable-web-lasers 2017-01-06 13:32:47 -08:00
Seth Alves
69082b7c34 Merge pull request #9327 from sethalves/tablet-ui-merge 
update tablet-ui
 2017-01-06 13:32:20 -08:00
Seth Alves
668bc35227 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-merge 2017-01-06 13:31:13 -08:00
Howard Stearns
36c99a604b Merge pull request #9319 from howard-stearns/edit-button-to-select-in-pal 
Edit button to select in pal
 2017-01-06 13:17:29 -08:00
Clément Brisset
48459be13c Merge pull request #9312 from ZappoMan/fixMouseLasers 
fix competition between seek mouse and lasers
 2017-01-06 13:11:01 -08:00
Brad Davis
15b9e750f9 Adding tracking of Oculus renders, submits, and frames that are over budget 2017-01-06 10:51:26 -08:00
Clément Brisset
0a08563b1f Merge pull request #9325 from Atlante45/log-dialog 
Log dialog doesn't float on top
 2017-01-06 10:40:09 -08:00
howard-stearns
2f5f53c8e4 cr 2017-01-06 10:28:09 -08:00