Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-16 16:26:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
50128 commits 69 branches 56 tags 1.2 GiB
Commit graph

50128 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
eb25e1c12d Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-19 09:41:49 -08:00
Seth Alves
1a6ae01d9c Merge pull request #9435 from druiz17/tabletNav 
Tablet issues Fixed
 2017-01-19 09:22:18 -08:00
Chris Collins
601223aa98 Merge pull request #9402 from ctrlaltdavid/clara-tidying 
Remove a line of old code in Clara.io download
 2017-01-19 09:15:58 -08:00
Brad Davis
70de00c6bf Merge pull request #9421 from jherico/more_trace_details 
Additional trace details for GPU timing, frame data updates
 2017-01-19 09:12:34 -08:00
Dante Ruiz
342a6c67fb menu checkable button fix 2017-01-19 08:12:49 -08:00
Dante Ruiz
30b57b62da toggle help 2017-01-19 08:12:49 -08:00
samcake
149e727cf3 Merge pull request #9429 from gcalero/android_forward_shaders 
Create render forward version of pixel shaders
 2017-01-19 00:48:25 -08:00
Clément Brisset
b2e7efa4a8 Merge pull request #9410 from samcake/meta 
Introducing type Meta to the render items of the scene
 2017-01-18 17:50:53 -08:00
samcake
05304c72e0 Merge branch 'master' of https://github.com/highfidelity/hifi into meta 2017-01-18 17:00:20 -08:00
Seth Alves
7389475281 Merge pull request #9434 from sethalves/tablet-ui 
Tablet ui
 2017-01-18 17:00:09 -08:00
samcake
027bd30cbc Removing macOS warning 2017-01-18 16:59:50 -08:00
Seth Alves
7c938728e5 don't do constant haptics if stylus touches tablet frame. home button triggers only once per click 2017-01-18 16:56:39 -08:00
Brad Davis
1ef4ac9a6c Additional trace details for GPU timing, frame data updates 2017-01-18 16:19:32 -08:00
Seth Alves
c4d85c91d0 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui 2017-01-18 15:51:54 -08:00
Seth Alves
49d8a644c3 Merge pull request #9432 from hyperlogic/tablet-ui 
Tablet improvements / bug fixes
 2017-01-18 15:49:14 -08:00
Seth Alves
3517daaad2 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-18 15:49:12 -08:00
Anthony J. Thibault
56c897cc2f Process the tablet stylus even when reticle is over 2d HUD overlay. 2017-01-18 15:36:09 -08:00
Anthony J. Thibault
bcd94203e6 Raised min fps of tablet overlay for smoother scrolling 2017-01-18 15:32:39 -08:00
Anthony J. Thibault
fc5c2c8def Fix for glitchy scrolling 2017-01-18 15:32:38 -08:00
Anthony J. Thibault
448e3fda0c fix for JSON parse exception 2017-01-18 15:32:37 -08:00
Anthony J. Thibault
28dac9d802 Lasers now interact with the tablet in edit mode. 2017-01-18 15:32:36 -08:00
samcake
e3da6aa9f1 Removing the comment 2017-01-18 15:03:31 -08:00
Seth Alves
aeb02001ed Merge pull request #9431 from sethalves/tablet-ui 
avoid unthreadsafe use of getJointIndex
 2017-01-18 14:59:02 -08:00
Seth Alves
c6d0c0909e avoid unthreadsafe use of getJointIndex 2017-01-18 14:54:38 -08:00
Gabriel Calero
5602479988 Create render forward version of pixel shaders 2017-01-18 19:18:59 -03:00
David Kelly
3b70fa08a3 Merge pull request #9417 from davidkelly/dk/palLogSpam 
Removing some PAL-related interface log spam
 2017-01-18 13:20:57 -08:00
Seth Alves
4dd0de62fc Merge pull request #9424 from sethalves/tablet-ui 
fix warnings
 2017-01-18 12:50:06 -08:00
Seth Alves
b6188bb73a fix warnings 2017-01-18 12:49:25 -08:00
Seth Alves
02b708feaf Merge pull request #9419 from druiz17/buttonsMissing 
Fixed pal on tablet
 2017-01-18 11:04:10 -08:00
Seth Alves
a1efb7695b Merge pull request #9420 from sethalves/tablet-ui-model-stylus 
Tablet ui model stylus
 2017-01-18 10:51:36 -08:00
Seth Alves
a8038ce64e cleanups 2017-01-18 10:50:02 -08:00
Seth Alves
1f92b57bf2 switch to model stylus 2017-01-18 10:46:18 -08:00
Dante Ruiz
8172329ec3 Fixed pal 2017-01-18 10:33:58 -08:00
Philip Rosedale
d60d183c8c Merge pull request #9403 from humbletim/21118 
Code Review for Job #21118 - Add on/off switch to ambisonic/ambient sound emitter
 2017-01-18 10:29:01 -08:00
Seth Alves
439d6f0fa3 Merge pull request #9418 from druiz17/tabletController 
game controller input with tablet
 2017-01-18 09:31:55 -08:00
Dante Ruiz
0f3ac2831e fix tablet menu selection issue 2017-01-18 17:20:42 +00:00
Dante Ruiz
1c13f538f7 removed debug output 2017-01-18 17:08:13 +00:00
Dante Ruiz
fa3bea52cd fixed bug with menu 2017-01-18 16:45:27 +00:00
Dante Ruiz
baff07b0f9 controller with menus finally work 2017-01-18 07:41:25 -08:00
Dante Ruiz
9a61b6030b tabletFocus update 2017-01-18 07:40:15 -08:00
Dante Ruiz
d3fa7651c9 some what working d-pad 2017-01-18 07:40:15 -08:00
dante ruiz
865a78a8c8 saving work 2017-01-18 07:40:14 -08:00
Seth Alves
715ee0b019 Merge pull request #9416 from sethalves/tablet-ui 
Tablet ui
 2017-01-18 06:41:21 -08:00
Seth Alves
b57803057d Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-18 06:38:44 -08:00
Seth Alves
0abb41ca2d Merge pull request #9413 from hyperlogic/tablet-ui 
clara.io marketplace works on tablet
 2017-01-18 06:37:55 -08:00
Seth Alves
d02ef9fb86 Merge pull request #9415 from hyperlogic/tablet-ui2 
Adjusted tablet spawn position and orientation to be more natural
 2017-01-18 06:36:18 -08:00
Seth Alves
3fe9505f18 Merge pull request #9414 from fayeli/menu-scrolling 
Fix tablet menu scrolling issue
 2017-01-18 06:35:06 -08:00
Brad Hefta-Gaub
5036781b81 Merge pull request #9406 from jherico/atp_core_usage 
Consume fewer cpu cores in AssetServer when interface is running locally
 2017-01-18 06:50:48 -06:00
humbletim
6320d872b4 remove commented code 2017-01-18 02:57:13 -05:00
humbletim
f88b39918f switch to messaging for toggle notifications; cleanup 2017-01-18 02:54:42 -05:00