Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 11:40:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
46888 commits 25 branches 0 tags 1.1 GiB
Commit graph

19295 commits

Author SHA1 Message Date
Howard Stearns
32db63e177 Merge pull request #8737 from highfidelity/domain-check 
Domain check
 2016-10-05 08:47:27 -07:00
Brad Hefta-Gaub
415b492c8c Merge pull request #8715 from jherico/offscreen_fences2 
Support external GL textures with proper fencing
 2016-10-05 05:13:06 -07:00
Chris Collins
1087885380 Merge pull request #8721 from kencooke/audio-fixes2 
Fix audio support on Windows7
 2016-10-04 10:14:37 -07:00
Brad Hefta-Gaub
9554befb68 Merge pull request #8714 from Atlante45/ack2 
Fix potential race condition on static memory
 2016-10-04 10:05:53 -07:00
Ken Cooke
8491254664 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-fixes2 2016-10-03 18:13:43 -07:00
Brad Davis
8c5028158f Fix crash on destroying web entities and overlays 2016-10-03 18:02:21 -07:00
Ken Cooke
46526a309d Increase audio input buffering on Windows 7 2016-10-03 17:46:09 -07:00
Brad Davis
ca3572f991 Support external GL textures with proper fencing 2016-10-03 17:09:10 -07:00
Chris Collins
ca1a7135eb Merge pull request #8706 from kencooke/audio-fixes 
Improve support for audio when input rate != output rate
 2016-10-03 16:46:56 -07:00
Ryan Huffman
0b2def6013 Fix style error 2016-10-03 15:23:39 -07:00
Ryan Huffman
e213a47814 Fix incorrect return values in getProcessorInfo 2016-10-03 15:19:03 -07:00
Ryan Huffman
dafb5c5bab Add processor information to launch user activity event 2016-10-03 15:11:56 -07:00
Atlante45
573d5898cc Make static control packets class members 2016-10-03 13:46:55 -07:00
howard-stearns
4fcddfdf2b Merge branch 'davidkelly-dk/triggerMenuInScriptPlus' into domain-check 2016-10-03 13:02:32 -07:00
howard-stearns
0809484e33 Merge branch 'dk/triggerMenuInScriptPlus' of https://github.com/davidkelly/hifi into davidkelly-dk/triggerMenuInScriptPlus 2016-10-03 13:01:51 -07:00
samcake
afcb5b8557 Merge branch 'master' of https://github.com/highfidelity/hifi into color 2016-10-03 10:17:46 -07:00
samcake
0df69b8e15 Protecting the usage of the defaultSkyboxTexture in case its creation has failed to avoid crash on the first usage, removing an uncorrect assert in GL45BackendTexture that would trigger in debug 2016-10-03 10:06:58 -07:00
Ken Cooke
9590d2eef9 Fix support for audio when input rate != output rate 2016-10-03 09:08:32 -07:00
Brad Hefta-Gaub
3612ed95c3 Merge pull request #8703 from hyperlogic/bug-fix/qml-surface-get-root-item-crash 
Fix for crash bug in web entities
 2016-10-02 20:31:35 -07:00
Brad Hefta-Gaub
c7551a2207 Merge pull request #8700 from ZappoMan/fetchTextureMapCrashFix 
fix crash when bouncing to eschatology and eschatology-dev
 2016-10-01 21:34:20 -07:00
Brad Hefta-Gaub
51e67df39a Merge pull request #8669 from jherico/oglplus_b_gone 
Remove oglplus usage in Offscreen QML rendering
 2016-10-01 21:20:51 -07:00
Brad Hefta-Gaub
7ef8e53d03 Merge pull request #8701 from ZappoMan/getShapeKeyCrashFix 
add guards to getShapeKey
 2016-10-01 20:23:50 -07:00
Brad Hefta-Gaub
7fe16442fa make calculateTextureInfo thread safe 2016-10-01 15:47:17 -07:00
Anthony Thibault
a79485f8c2 Fix for crash bug in web entities 
Guard against nullptrs in RenderableWebEntitItem and WebEntityAPIHelper.
These pointers can go null if the webEntity is deleted on the main thread.
Also, the backing offscreen qml surface can be destroyed if the webEntity has not been rendered for 30 seconds
due to frustum culling.
 2016-10-01 13:43:49 -07:00
Brad Hefta-Gaub
04f6547940 add guards to getShapeKey 2016-10-01 12:15:03 -07:00
Brad Davis
933388bc61 Remove oglplus usage from offscreen UI 2016-10-01 11:39:46 -07:00
Brad Davis
265996156c Remove unused header and typedef 2016-10-01 11:39:45 -07:00
Brad Hefta-Gaub
769a29332c Merge pull request #8695 from jherico/texture_transfer_crash 
Fix crash in initializing texture transfer thread
 2016-10-01 11:31:37 -07:00
Brad Hefta-Gaub
55d5e80220 Merge pull request #8699 from jherico/gl_context_bug 
Don't use GL functions before making the context current
 2016-10-01 11:30:50 -07:00
Brad Hefta-Gaub
2cba3db2b6 fix crash when bouncing to escotology, which may or may not be related 2016-10-01 11:08:52 -07:00
Brad Davis
0f06d0e4cc Don't use GL functions before making the context current 2016-10-01 10:40:36 -07:00
howard-stearns
c806f6cad2 better shutdown check for timer firings 2016-09-30 16:05:39 -07:00
Brad Davis
42e28fa010 Fix crash in initializing texture transfer thread 2016-09-30 15:48:10 -07:00
Clément Brisset
02991bffab Merge pull request #8687 from zzmp/feat/injector-loopback 
loopback local injectors on server echo
 2016-09-30 11:21:10 -07:00
Clément Brisset
becee3bba3 Merge pull request #8685 from thoys/ac-fixes 
Assignment Client fixes
 2016-09-30 11:05:58 -07:00
Chris Collins
322a6e7f2d Merge pull request #8686 from kencooke/unbuffered-audio-output 
Even lower audio latency
 2016-09-30 10:53:29 -07:00
David Kelly
621e3fc000 Expose triggerOption to scripts, plus _physicsEnabled 
Now any menu item can be triggered.  Plus you can do a
Window.isPhysicsEnabled to detect when we are done loading assets and
such.  Whee!
 2016-09-30 09:06:17 -07:00
Thijs Wenker
4f7fdfc345 eliminated else, this might look cleaner 2016-09-30 03:31:35 +02:00
Zach Pomerantz
768354e49f loopback local injectors on server echo 2016-09-29 15:25:17 -07:00
Thijs Wenker
5025b4a5ed NodeList set the sessionUUID before emitting the connectedToDomain signal 2016-09-29 22:15:53 +02:00
Thijs Wenker
7e3073e163 fix spelling bugs 2016-09-29 22:13:27 +02:00
Thijs Wenker
3d14a32d17 fix controller::ScriptingInterface not found warning in AC 2016-09-29 22:11:12 +02:00
Ken Cooke
858297241b Even lower audio latency 2016-09-29 12:48:21 -07:00
Brad Hefta-Gaub
38eccd32a8 add developer menu support to enable/disable dynamic texture management 2016-09-29 10:18:54 -07:00
Brad Davis
f73cd1d65e Merge branch 'RC-21' back into master 
Conflicts:
	libraries/gpu-gl/src/gpu/gl45/GL45BackendTexture.cpp
 2016-09-28 09:58:13 -07:00
Brad Davis
31fb395c27 Add support for disabling incremental texture transfers 
Conflicts:
	libraries/gpu-gl/src/gpu/gl45/GL45BackendTexture.cpp
 2016-09-28 09:56:50 -07:00
Brad Davis
7361b9a166 Add support for disabling incremental texture transfers 2016-09-28 09:23:15 -07:00
Brad Hefta-Gaub
b5de603921 runtime disabling of sparse textures on less than 4 core systems 2016-09-27 10:32:56 -07:00
Seth Alves
90adb5f67e fix an AC script's ability to delete entities 2016-09-26 17:14:45 -07:00
Zach Pomerantz
84ba3223bb Merge pull request #8650 from zzmp/fix/reload-qml-with-js 
reload qml with scripts
 2016-09-26 11:00:13 -07:00