Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-01 20:33:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
46837 commits 73 branches 59 tags 1.2 GiB
Commit graph

46837 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
332c2127b4 Merge branch 'master' of github.com:highfidelity/hifi into grab-point-adjustments 2016-09-07 09:53:26 -07:00
Anthony J. Thibault
dc0d0c2d5c Merge branch 'master' into feature/tablet-ui-foundation 2016-09-07 09:49:55 -07:00
Brad Hefta-Gaub
3824c1e196 Merge pull request #8469 from kencooke/low-latency-audio 
Low-latency audio
 2016-09-07 09:49:09 -07:00
Seth Alves
5303488f52 Merge branch 'master' of github.com:highfidelity/hifi into grab-point-adjustments 2016-09-07 09:40:51 -07:00
David Rowe
db30e36b3b Implement expand/collapse action to show/hide table columns 2016-09-07 19:11:53 +12:00
David Rowe
b372f82f78 Ensure that the expand/collapse icon is always visible 2016-09-07 17:09:56 +12:00
Ken Cooke
9457d49103 Merge branch 'master' of https://github.com/highfidelity/hifi into low-latency-audio 2016-09-06 20:56:20 -07:00
David Rowe
dba3efd857 Add expand/collapse extra info toggle icon to entities table header 2016-09-07 15:04:27 +12:00
Leonardo Murillo
54af969bbf Merge pull request #8405 from SamGondelman/qt5.6 
Update to Qt 5.6.1
 2016-09-06 19:30:16 -06:00
Anthony J. Thibault
774509ba9e Changed punctuation button to &123 2016-09-06 17:41:56 -07:00
Brad Davis
9d057233c6 Fixing rebase 2016-09-06 17:40:48 -07:00
Marko Kudjerski
da5f7912b5 fixed Info.plist setup for Components.app 2016-09-06 17:40:47 -07:00
SamGondelman
62edaf0ec9 commit for marko to look at later 2016-09-06 17:40:46 -07:00
Marko Kudjerski
930afad49c comment fix 2016-09-06 17:40:45 -07:00
Marko Kudjerski
b8da976123 added Info.plist to Components.app so that macdeployqt from Qt 5.6 doesn't throw a segfault 2016-09-06 17:40:45 -07:00
SamGondelman
544606bccc cmake fix 2016-09-06 17:40:44 -07:00
SamGondelman
74e5814a48 try to fix rpath issue 2016-09-06 17:40:43 -07:00
SamGondelman
7e0ad52cd5 updated build instructions to use official qt release instead of homebrew 2016-09-06 17:38:48 -07:00
SamGondelman
8a4d48ca8d set browserProfile now that Qt bug is fixed 2016-09-06 17:38:47 -07:00
SamGondelman
99176588cc remove old webwindowclass that relied on qwebkit 2016-09-06 17:36:59 -07:00
SamGondelman
7f2476f0f8 put pack macdeployqt call, but still removed qtwebprocess 2016-09-06 17:36:58 -07:00
SamGondelman
038aba20e4 disable dropshadows if unsupported (OSX and AMD cards) 2016-09-06 17:36:57 -07:00
SamGondelman
c993a6b818 try removing windows hack 2016-09-06 17:36:56 -07:00
SamGondelman
2db02fdde1 remove QtWebProcess hack on OSX 2016-09-06 17:36:56 -07:00
SamGondelman
88d0aa3737 removed showButtonDown, which didn't exist 2016-09-06 17:36:55 -07:00
SamGondelman
716647037e removed unused code 2016-09-06 17:36:54 -07:00
SamGondelman
9903e464d8 fix error in FileDialog.qml 2016-09-06 17:36:53 -07:00
SamGondelman
b048637c26 fix signal issue and qabstract::socket issue 2016-09-06 17:36:52 -07:00
SamGondelman
98cb3cc366 updated build instructions 2016-09-06 17:36:52 -07:00
SamGondelman
9d447d4dcc enabled qnetworkrequest redirects everywhere I could find them 2016-09-06 17:35:06 -07:00
Brad Davis
20deae3242 Working on Qt 5.6 compatibility 2016-09-06 17:35:04 -07:00
Ken Cooke
284bbfdf06 Remove extraneous code 2016-09-06 17:09:59 -07:00
Atlante45
e7ebcc0467 Fix toolBar.js relative path 2016-09-06 17:08:23 -07:00
Anthony J. Thibault
73315e3390 Punctuation mode now works 2016-09-06 17:07:41 -07:00
Ken Cooke
b47000eab2 Added ARM NEON optimized audio sample rate conversion 2016-09-06 16:53:06 -07:00
Seth Alves
616b094111 experimenting with position of grab sphere 2016-09-06 16:16:09 -07:00
David Rowe
156866f835 Fix "has script" entities list icon 2016-09-07 11:12:04 +12:00
David Rowe
83593087b6 Resize table headers after filter value changed 2016-09-07 11:08:06 +12:00
Seth Alves
34e4b4ae19 move haptic-pulse for when grab-point enters a grabbable entity to the right section of code 2016-09-06 15:37:37 -07:00
Anthony J. Thibault
28162915fd Re-styled keyboard, now with working shift key 2016-09-06 15:21:58 -07:00
Seth Alves
215fd4ddfd fix grab-point sphere for right hand 2016-09-06 15:15:46 -07:00
David Rowe
f83599f855 Merge branch 'master' into 21040 2016-09-07 10:08:51 +12:00
Seth Alves
43c98b3f1e attempt to avoid a very-still far-grab leaving something non-dynamic in bullet upon release. adjust position of grab-point sphere 2016-09-06 14:42:53 -07:00
Chris Collins
9e7cd92a96 Merge pull request #8533 from sethalves/arrow-actions 
Joints for Controllers + Arrow action
 2016-09-06 13:46:33 -07:00
Anthony J. Thibault
71520a661a WIP checkpoint of keyboard shift key support 2016-09-06 13:39:07 -07:00
Atlante45
eb007b24cd Use invalid port to signal no value passed 2016-09-06 11:59:07 -07:00
Chris Collins
46bb467e1a Merge pull request #8558 from highfidelity/RC-20 
Beta Release 19 - Includes up to Developer Release 5335
 2016-09-06 11:01:27 -07:00
Atlante45
12eb65c0c4 Make setSocketLocalPort invokable 2016-09-06 10:18:42 -07:00
Atlante45
9f07511fd8 Move setter to LimitedNodeList 2016-09-06 10:18:42 -07:00
Atlante45
bba5e46533 Don't reset the NodeList 2016-09-06 10:18:42 -07:00