Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-21 12:46:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
46573 commits 29 branches 28 tags 1.2 GiB
Commit graph

46573 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
samcake
edb456aa8f ANd again 2016-09-06 17:16:54 -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
samcake
9bed047b75 Less warnings 2016-09-06 16:42:01 -07:00
samcake
e2a9751cf5 REmove warnings 2016-09-06 16:35:28 -07:00
samcake
1165c54f67 cleaning up the IndexedContainer in its own file and removing warnings 2016-09-06 16:24:03 -07:00
Anthony J. Thibault
28162915fd Re-styled keyboard, now with working shift key 2016-09-06 15:21:58 -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
samcake
0c45627d94 CLeaning up the code for the RenderableLightEntityItem 2016-09-06 12:39:48 -07:00
Atlante45
eb007b24cd Use invalid port to signal no value passed 2016-09-06 11:59:07 -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
Atlante45
fcf44911a3 Fix Windows warning 2016-09-06 10:18:42 -07:00
Atlante45
a8de6f0a57 Add settings to change local port 2016-09-06 10:18:42 -07:00
Atlante45
713be9fd73 Rename NLs nodeUpdated signal to nodeSocketUpdated 2016-09-06 10:16:00 -07:00
Atlante45
d938e518a0 Start new hole punch when the socket is updated 2016-09-06 10:16:00 -07:00
Seth Alves
37db1cba26 Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-09-06 09:38:44 -07:00
Brad Hefta-Gaub
78cf81954c Merge pull request #8555 from jherico/thread_count 
Stuttering: global thread pool management
 2016-09-06 09:27:02 -07:00
samcake
92a9037b07 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-09-06 09:20:25 -07:00
sam
b81dfefbeb pack all the lights in a single buffer and shade the opaque with a single full screen path 2016-09-03 12:08:53 -07:00
Brad Hefta-Gaub
6259491d69 Merge pull request #8568 from jherico/texture_load_test 
Texture load profiling test
 2016-09-03 10:17:36 -07:00
Brad Hefta-Gaub
418495d2c5 Merge pull request #8546 from samcake/yellow 
Revert the sRGB pixel format by default
 2016-09-03 10:16:16 -07:00
Brad Hefta-Gaub
a51f66e9ff Merge pull request #8553 from zzmp/clean/audio-ring-buffer 
clean and comment AudioRingBuffer
 2016-09-02 20:16:06 -07:00
samcake
4bc8a83c08 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-09-02 17:51:58 -07:00
samcake
d2a15ca82c Trying to migrate to a light array instead of each individual lights 2016-09-02 17:51:35 -07:00
Brad Davis
13a4671705 Texture load profiling test 2016-09-02 17:45:26 -07:00
Anthony J. Thibault
787bb58c1a osx warning fix 2016-09-02 17:22:13 -07:00
Andrew Meadows
0a55afda69 Merge pull request #8554 from elisa-lj11/marketplaces_html 
Include a marketplace status bar and access to "marketplace" of marketplaces
 2016-09-02 17:12:05 -07:00
Anthony J. Thibault
9122a33fff only raise the webEntity virtual keyboard in HMD mode 2016-09-02 16:53:40 -07:00
elisa-lj11
2f07ba87af Renamed isZipped for more clarity on checking for non-fbx files 2016-09-02 16:48:55 -07:00
Anthony J. Thibault
a54c3bf8c0 support for backspace, carriage return, space and period. 2016-09-02 16:23:46 -07:00
Ryan Downe Karpf
a96de7ffc1 Merge pull request #8566 from sethalves/fix-ac-agent-sees-others-redux 
Because hastily pressing merge on Friday afternoon is always a good idea
 2016-09-02 16:23:18 -07:00
Seth Alves
342f7edff3 Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-09-02 16:12:41 -07:00
Seth Alves
b7da72cc46 try again on fix for ACs seeing other avatars 2016-09-02 16:06:51 -07:00
Seth Alves
884af4eb8e Merge pull request #8565 from highfidelity/revert-8563-fix-ac-agent-sees-others 
Revert "fill in linked node data for avatar identity packets, also"
 2016-09-02 16:01:05 -07:00
elisa-lj11
6721cc8dfb fixed return statement formatting 2016-09-02 15:48:47 -07:00
Seth Alves
b6ef6fec73 Revert "fill in linked node data for avatar identity packets, also" 2016-09-02 15:43:25 -07:00
Brad Davis
94210d2e69 Use dynamic count for global thread pool 2016-09-02 15:23:35 -07:00