Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-14 13:07:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
52210 commits 75 branches 59 tags 1.2 GiB
Commit graph

52210 commits

This branch
This branch
All branches
Author SHA1 Message Date
Vladyslav Stelmakhovskyi
a02807fb26 Merge branch 'menuFix' into menuFix_AssetServer 2017-03-07 21:07:53 +01:00
Seth Alves
694fc58374 restore missing shading pipeline for simple opaque in deferred 2017-03-07 12:07:24 -08:00
Seth Alves
b938579598 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-03-07 11:42:44 -08:00
Chris Collins
bb03e08e16 Merge pull request #9801 from highfidelity/RC-35 
Beta Release 35 - Includes up to Developer Release 6106
 2017-03-07 11:04:21 -08:00
howard-stearns
8a489f36f4 Merge branch 'master' of https://github.com/highfidelity/hifi into fix-ban-remove-from-pal 2017-03-07 10:49:53 -08:00
Anthony J. Thibault
b0ad9a8110 Bug fix for potential crash when getting DebugDraw::instance 2017-03-07 10:03:38 -08:00
Andrew Meadows
1e9623e2f2 Merge pull request #9813 from druiz17/multipule-audio-fix 
removed duplicated audio devices
 2017-03-07 10:00:48 -08:00
Brad Hefta-Gaub
d8b7076a9e Merge pull request #9816 from AndrewMeadows/sphere-means-sphere 
ModelEntityItems that use 'sphere' for shapeType should collide as true spheres
 2017-03-07 09:53:52 -08:00
Seth Alves
df2e73c2f0 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-03-07 09:44:41 -08:00
Howard Stearns
f0fd29abd3 Merge pull request #9815 from davidkelly/dk/3377 
Retain selection in PAL when sorting or reloading
 2017-03-07 09:38:07 -08:00
Seth Alves
f594689fa8 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-03-07 09:24:50 -08:00
Brad Hefta-Gaub
69a8ea99ca Merge pull request #9823 from vladest/qml_js_in_qtcreator 
Adding ability for QML/JS file to be visible in QtCreator. Also chang…
 2017-03-07 09:20:51 -08:00
David Kelly
b760e86226 rest of cr feedback 2017-03-07 10:17:32 -07:00
David Kelly
c6dbfc85f0 cr feedback 2017-03-07 09:54:00 -07:00
Dante Ruiz
10ce732e91 Merge branch 'master' into menuFix 2017-03-07 16:15:54 +00:00
Dante Ruiz
9688cc41af Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix 2017-03-07 16:15:18 +00:00
Atlante45
c52c43e23d Remove weighted offset, special case downward pressure 2017-03-07 06:28:25 -08:00
Vladyslav Stelmakhovskyi
2d2b2094fd Adding ability for QML/JS file to be visible in QtCreator. Also changed files will be installed to destination 2017-03-07 10:11:09 +01:00
Andrew Meadows
8c773483cf Merge pull request #9820 from Atlante45/fix/avatar-lean 
Fix avatar lean
 2017-03-06 22:18:34 -08:00
Brad Hefta-Gaub
b111bcb826 Merge pull request #9818 from ctrlaltdavid/21205 
Remove Developer > Network > Bandwith Details dialog
 2017-03-06 22:02:33 -08:00
Brad Hefta-Gaub
87934ee82d fix bugs in some meshes 2017-03-06 21:50:32 -08:00
David Rowe
fb1ff5be89 Port Developer > Network > Networking to tablet 2017-03-07 17:02:29 +13:00
Atlante45
ff9d6d657c Remove weighted offset, special case downward pressure 2017-03-06 19:41:08 -08:00
David Rowe
51739f2f99 Remove Developer > Network > Bandwith Details dialog 2017-03-07 15:02:26 +13:00
Dante Ruiz
5156564f04 cant call gotohomescreen when tablet is closed 2017-03-07 00:53:36 +00:00
Brad Davis
f9dcfa54aa Add debug/release builds to oculus lib 2017-03-06 16:08:21 -08:00
Andrew Meadows
d749c0c8be use fabsf() rather than fabs() 2017-03-06 15:50:32 -08:00
Andrew Meadows
10b3e7fc67 sphere shapeType for models means 'sphere' 2017-03-06 15:14:51 -08:00
David Kelly
3d39aae35b minor tweak - just in case 2017-03-06 15:52:33 -07:00
David Kelly
f23f882595 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3377 2017-03-06 15:26:21 -07:00
David Kelly
e14a1ad1af minor cleanup 2017-03-06 15:26:03 -07:00
David Kelly
db036d997c first pass 2017-03-06 15:18:35 -07:00
Dante Ruiz
fc65723d68 corrected removing duplicate devices 2017-03-06 22:14:20 +00:00
Zach Fox
5223f872c1 Merge pull request #9753 from zfox23/FB_3234_TakeTwo 
Optimize AvatarMixer with respect to Identity and Avatar Data
 2017-03-06 13:37:29 -08:00
Seth Alves
74323cb1f0 remove debug print 2017-03-06 13:26:09 -08:00
Seth Alves
e076b32f9c don't automatically unhook overlays from hands unless they were grabbable overlays 2017-03-06 13:25:40 -08:00
Andrew Meadows
1b8f6b9835 Merge pull request #9784 from samcake/blue 
Fixing Emissive on overlay for models (opaque and transparent)
 2017-03-06 13:24:00 -08:00
Vladyslav Stelmakhovskyi
0a36ebc5a0 Remove non relevant changes 2017-03-06 22:11:46 +01:00
David Rowe
af4bdd5943 Port Developer > Audio > Buffers to tablet 2017-03-07 09:57:02 +13:00
Brad Hefta-Gaub
f27475613f Merge branch 'master' of https://github.com/highfidelity/hifi into triangleSet 2017-03-06 12:53:59 -08:00
Vladyslav Stelmakhovskyi
6d9e7de6dc Implemented AssetBrowser in Tablet view 2017-03-06 21:45:55 +01:00
samcake
21f36d7212 removing comments and restoring the correct behavior for Pal.js 2017-03-06 12:41:00 -08:00
Seth Alves
4886f1cbfc don't run stylus-on-overlay code unless the overlay is a web3d overlay 2017-03-06 12:38:19 -08:00
Brad Hefta-Gaub
38668b6ce5 Merge pull request #9812 from sethalves/dont-auto-ungrab-overlays 
don't automatically unhook overlays from hands unless they were grabbable overlays
 2017-03-06 12:32:18 -08:00
Thijs Wenker
6ded937b25 Merge pull request #9809 from Menithal/21201 
WL#21201 Snap-together Magnetic blocks
 2017-03-06 21:30:53 +01:00
David Rowe
09ecb12510 Merge branch 'tablet-ui-edit-js' into 21197 
# Conflicts:
#	interface/src/ui/overlays/Web3DOverlay.cpp
 2017-03-07 08:59:40 +13:00
Seth Alves
27066e89a6 Merge branch 'dont-auto-ungrab-overlays' of github.com:sethalves/hifi into tablet-ui-edit-js 2017-03-06 11:46:19 -08:00
Seth Alves
a2d2c41f02 remove debug print 2017-03-06 11:45:49 -08:00
Menithal
01ba44c572 Fixed print 2017-03-06 21:32:27 +02:00
ZappoMan
faba160331 more CR feedback 2017-03-06 11:10:04 -08:00