Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-22 19:55:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
46464 commits 25 branches 0 tags 1.1 GiB
Commit graph

46464 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Chris Collins
9e7cd92a96 Merge pull request #8533 from sethalves/arrow-actions 
Joints for Controllers + Arrow action
 2016-09-06 13:46:33 -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
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
Brad Davis
13a4671705 Texture load profiling test 2016-09-02 17:45:26 -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
elisa-lj11
2f07ba87af Renamed isZipped for more clarity on checking for non-fbx files 2016-09-02 16:48:55 -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
Brad Hefta-Gaub
6e25c97eef Merge pull request #8564 from jherico/fix_rate_stats 
Updating stats display for threaded rendering
 2016-09-02 15:22:45 -07:00
elisa-lj11
18700d6397 narrowed filters for Clara website check 2016-09-02 15:18:13 -07:00
Seth Alves
c969230d83 Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-09-02 15:11:27 -07:00
Seth Alves
b8b1127d55 merge from upstream 2016-09-02 15:11:21 -07:00
Ryan Downe Karpf
c923d06d97 Merge pull request #8563 from sethalves/fix-ac-agent-sees-others 
fill in linked node data for avatar identity packets, also
 2016-09-02 15:01:30 -07:00
Brad Davis
91bfa7677c Updating stats display for threaded rendering 2016-09-02 14:41:49 -07:00
Seth Alves
f34f0f51ec Merge branch 'master' of github.com:highfidelity/hifi into fix-ac-agent-sees-others 2016-09-02 13:57:10 -07:00
Seth Alves
014190a1bf fill in linked node data for avatar identity packets, also 2016-09-02 13:52:37 -07:00
Brad Hefta-Gaub
861cf468a3 Merge pull request #8547 from imgntn/save_default_scripts_settings 
Remember setting for 'debug defaultScripts.js'
 2016-09-02 13:08:19 -07:00
Brad Hefta-Gaub
0dfd0fdab7 Merge pull request #8562 from jherico/fix_fence_leak 
Fix incorrect fence delete
 2016-09-02 13:07:17 -07:00
Brad Davis
2c8b795c5f Fix incorrect fence delete 2016-09-02 11:26:21 -07:00
Brad Hefta-Gaub
8ec5798b7a Merge pull request #8548 from samcake/blue 
Exposing GPU & Batch running time to Engine gpu jobs
 2016-09-02 09:31:09 -07:00
Brad Hefta-Gaub
667137f951 Merge pull request #8552 from AndrewMeadows/invoke-updateModel 
eliminate log warning about invokeMethod of EntityTreeRenderer::updateModel()
 2016-09-02 09:17:57 -07:00