Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-12 08:26:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
52931 commits 76 branches 59 tags 1.2 GiB
Commit graph

52931 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ryan Huffman
bb09dd9414 Merge pull request #9988 from huffman/fix/touch-detection-after-launch 
Fix Oculus Touch + Remote not being detected after initial launch
 2017-03-24 11:37:57 -07:00
Lexx
fa606446a7 remove cache buster 2017-03-24 18:27:38 +00:00
Anthony J. Thibault
54b11bb6ee Hide the scrollbar on the marketplace 2017-03-24 11:22:50 -07:00
Seth Alves
aaa78d108b if a model has too many meshes, give up. 2017-03-24 11:17:24 -07:00
Seth Alves
e1e51614d9 don't hang loop if entity isDead 2017-03-24 11:16:54 -07:00
samcake
13b3809fe3 removing includes if possible 2017-03-24 11:04:52 -07:00
Clément Brisset
5ff7dbb254 Merge pull request #9991 from Atlante45/fix/entity-bad-url 
Show entity bounding box for bad URLs
 2017-03-24 10:56:06 -07:00
ZappoMan
52335e20a2 fix typo 2017-03-24 09:59:55 -07:00
ZappoMan
ddd0645453 fix merge issue 2017-03-24 09:59:11 -07:00
ZappoMan
84836d9331 fix typo that broke gun 2017-03-24 09:58:56 -07:00
samcake
a0488cfb91 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-03-24 09:41:09 -07:00
Brad Hefta-Gaub
1972b140b9 Merge pull request #9976 from mittens/21215 
Worklist #21215 - Removing Duplicate Status Icons for Submeshes
 2017-03-24 08:52:12 -07:00
ZappoMan
bc331af6a0 Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick 2017-03-24 08:46:43 -07:00
Seth Alves
154cd444ad Merge pull request #9993 from sethalves/tablet-ui 
Tablet ui -- merge from upstream
 2017-03-24 07:21:00 -08:00
Seth Alves
902e3d41d6 merge from upstream 2017-03-24 08:20:35 -07:00
Brad Hefta-Gaub
9a38b36f59 Merge pull request #9970 from Triplelexx/21223 
21223 - Quat functions have naming inconsistencies
 2017-03-24 08:12:11 -07:00
Brad Hefta-Gaub
aa1883ba85 Merge pull request #9979 from jherico/crash_fix 
Fix crash in render-perf-test
 2017-03-24 08:10:37 -07:00
Sam Cake
022e91b35d Clean comments and pixel format used 2017-03-24 00:26:14 -07:00
Sam Cake
83abbaa64a Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-03-23 21:55:30 -07:00
samcake
618344fe98 Fixing the bug regarding the numMIps allocated by GLBackend and breaking the HalfRezDepthTexture 2017-03-23 18:10:09 -07:00
Atlante45
4f8d9b190b Show green box when model entity has bad url 2017-03-23 17:56:33 -07:00
Stephen Birarda
a798773425 fix polyvox location for MinSizeRel 2017-03-23 17:31:02 -07:00
Stephen Birarda
85dc63a671 fix multi-line strings in VHACD and faceshift externals 2017-03-23 17:26:32 -07:00
Stephen Birarda
22c7d4032b fix debug config handling of release faceshift lib 2017-03-23 17:13:19 -07:00
Stephen Birarda
6d38b1fe72 handle MinSizeRel configuration in vhacd external 2017-03-23 17:11:30 -07:00
Stephen Birarda
0367f70a39 interpolate CONFIG for polyvox library path 2017-03-23 17:07:51 -07:00
Stephen Birarda
ee521ed369 handle library release path for faceshift MinSizeRel build 2017-03-23 17:06:22 -07:00
Stephen Birarda
5311de1f7b handle MinSizeRel library discovery for bullet external 2017-03-23 17:05:08 -07:00
Stephen Birarda
e100a7bedb point VHACD external to correct library for RelWithDebugInfo 2017-03-23 16:54:21 -07:00
Stephen Birarda
670f51af0b fix reference to RelWithDebugInfo library for polyvox 2017-03-23 16:50:03 -07:00
Stephen Birarda
be34e5a814 fix RelWithDebInfo path for faceshift 2017-03-23 16:46:52 -07:00
Ryan Huffman
56c5f06365 Fix Oculus Touch + Remote not being detected after initial launch 2017-03-23 16:29:08 -07:00
Dante Ruiz
a078121c46 saving work 2017-03-24 00:23:13 +01:00
Stephen Birarda
654ae5032b simplify the RelWithDebInfo check in bullet ext 2017-03-23 16:11:48 -07:00
Stephen Birarda
b023cb71be when building RelWithDebInfo check for correct bullet libs 2017-03-23 16:02:39 -07:00
Brad Hefta-Gaub
20bc32fc89 Merge pull request #9980 from birarda/bug/ac-agent-audio 
make sure the AC agent has an AudioScriptingInterface
 2017-03-23 15:13:24 -07:00
Brad Davis
5a5eb6e168 Still trying to fix build error 2017-03-23 14:09:34 -07:00
Anthony J. Thibault
bab9890fea Added inputMode property to Web3DOverlay. 
This allows user to switch between Touch messages and Mouse messages.
Added a sliderTestMain.js script which demonstrates this behavior.
 2017-03-23 13:54:18 -07:00
Anthony J. Thibault
8915ecd23d compile time option to switch from touch to mouse events for web tablet 2017-03-23 13:54:17 -07:00
Brad Davis
8116de7c14 Force thread linkage 2017-03-23 13:45:13 -07:00
Zach Fox
a231b57472 Merge pull request #9962 from birarda/cmake-with-space 
Fix failing POST_BUILD steps on Windows with spaces in build path
 2017-03-23 11:41:38 -07:00
Atlante45
d4353e1d19 Fix warnings 2017-03-23 11:39:42 -07:00
Seth Alves
bb1c556c91 forgot a file 2017-03-23 11:04:50 -07:00
ZappoMan
246f377a07 Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick 2017-03-23 10:40:37 -07:00
Seth Alves
ba0c9e405a cleanup 2017-03-23 10:38:57 -07:00
Dante Ruiz
ae111ff2e9 Merge branch 'tablet-goto' of github.com:fayeli/hifi into tablet-goto 2017-03-23 18:25:31 +01:00
Seth Alves
f5680def55 Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2 2017-03-23 09:55:41 -07:00
Seth Alves
93992bb427 Merge branch 'model-scripting-2' of github.com:sethalves/hifi into model-scripting-2 2017-03-23 09:55:35 -07:00
Seth Alves
ce9bb439b3 change Model api in anticipation of more than just PolyVox being able to give meshes to javascript 2017-03-23 09:55:30 -07:00
Seth Alves
9a59d4d83e Merge pull request #9982 from sethalves/tablet-ui 
Tablet ui -- merge from upstream
 2017-03-23 08:52:18 -08:00