Brad Hefta-Gaub
759fac228c
fix the doppelganger
2016-03-25 11:29:14 -07:00
Andrew Meadows
7064b29a2d
Merge pull request #7473 from jherico/revert_webchannel
...
Revert "Build a better event bridge"
2016-03-25 11:29:06 -07:00
Brad Hefta-Gaub
6c6131c7b3
fix the doppelganger
2016-03-25 11:22:54 -07:00
Zach Pomerantz
864def31ea
Don't refresh NetworkGeometry with cache
2016-03-25 10:56:20 -07:00
Stephen Birarda
d8859def37
fix for AccountManagerAuth::Type register, consts
2016-03-25 10:47:06 -07:00
Brad Hefta-Gaub
984d6ae48f
fix model resizing bug
2016-03-25 10:46:14 -07:00
Stephen Birarda
0043a84234
guard the SendQueue sleep and send a user activity when weird
2016-03-25 10:22:14 -07:00
Zach Pomerantz
5d306a74d5
Merge branch 'master' of github.com:highfidelity/hifi into feat/geocaching
2016-03-25 10:09:37 -07:00
Chris Collins
2a85170a46
Merge pull request #7470 from zzmp/fix/tex-json
...
Accept textures as list or json
2016-03-25 10:05:12 -07:00
Zach Pomerantz
aad40f5de0
Drop network data after processing
2016-03-25 09:58:34 -07:00
Brad Davis
a47614c9b6
Revert "Build a better event bridge"
...
This reverts commit a43fde0803
2016-03-25 09:48:25 -07:00
samcake
093f5d0019
Merge pull request #7460 from hyperlogic/tony/skip-culling-render-config
...
CullTask: added ability to disable culling during rendering.
2016-03-25 09:40:35 -07:00
Anthony J. Thibault
c00a412d3b
Fix misleading comments for _skipCulling case.
2016-03-25 09:10:46 -07:00
Andrew Meadows
6c36d55fea
Merge pull request #7459 from kencooke/master
...
Fix Reverb Zone settings to work correctly with new reverb
2016-03-25 08:17:45 -07:00
samcake
9fb1a9a2a8
Merge and many more counters
2016-03-25 03:02:18 -07:00
Seth Alves
ae6d6f4bb3
added comments, minor cleanups
2016-03-24 21:37:46 -07:00
Seth Alves
c57aa565df
Merge branch 'master' of github.com:highfidelity/hifi into redo-polyvox-locking
2016-03-24 21:37:25 -07:00
Brad Hefta-Gaub
fb09ad51b3
CR feedback
2016-03-24 21:14:07 -07:00
Andrew Meadows
ac5c055a1e
don't verify simulated bit when adding to delete list
2016-03-24 21:12:22 -07:00
Andrew Meadows
d3d724530a
minor optimiztion
2016-03-24 21:12:22 -07:00
Brad Hefta-Gaub
cd5beabf10
Revert "Drop resource data after load"
2016-03-24 20:37:16 -07:00
samcake
3f844d7a82
Merge branch 'master' of https://github.com/highfidelity/hifi into lemon
2016-03-24 20:36:29 -07:00
Seth Alves
e0ab875ca8
Merge branch 'master' of github.com:highfidelity/hifi into redo-polyvox-locking
2016-03-24 19:43:30 -07:00
Zach Pomerantz
413c3b88cf
Accept textures as list or json
2016-03-24 19:40:02 -07:00
Zach Pomerantz
c625d36bd8
Persist material transform/params
2016-03-24 19:28:44 -07:00
Seth Alves
1b88284bf7
more threading cleanups
2016-03-24 19:14:25 -07:00
Zach Pomerantz
eeeb175bb8
Derive NetworkMaterial, avoid copying it
2016-03-24 18:50:44 -07:00
Zach Pomerantz
3402635f99
Lock geometry on blender
2016-03-24 18:50:43 -07:00
Brad Hefta-Gaub
7de8a2267f
one more try
2016-03-24 18:09:14 -07:00
Brad Hefta-Gaub
17a2ed7dd0
Merge pull request #7467 from zzmp/clean/drop-data
...
Drop resource data after load
2016-03-24 17:52:19 -07:00
Brad Davis
0ac70049c7
Merge pull request #7431 from hyperlogic/tony/vive-rendering-work
...
OpenVR rendering & Nsight instrumentation improvements
2016-03-24 17:44:30 -07:00
Brad Hefta-Gaub
d26fe77803
Merge pull request #7454 from jherico/qml_crashes
...
Fix async issues related to JS <-> App <-> QML <-> HTML communication
2016-03-24 17:32:38 -07:00
Seth Alves
f8fe7b5868
add back getMesh call
2016-03-24 17:22:34 -07:00
Brad Hefta-Gaub
06a6a8462f
more cleanup
2016-03-24 16:34:09 -07:00
Brad Hefta-Gaub
2b595fb329
break out thread safe moving average to get around unix build hell
2016-03-24 16:26:28 -07:00
Zach Pomerantz
afc853572a
Drop resource data after load
2016-03-24 15:50:51 -07:00
Zach Pomerantz
8d0e419a5c
Clean image-reader to drop image sooner
2016-03-24 15:50:48 -07:00
Seth Alves
6abed67c05
cleanups
2016-03-24 15:46:30 -07:00
Brad Hefta-Gaub
8691aa6905
fix unix build and CR feedback
2016-03-24 15:45:44 -07:00
Seth Alves
7c910fcf5e
further reworking of polyvox threading
2016-03-24 15:28:19 -07:00
Zach Pomerantz
a34e6773a9
Add messageBox for no gl support
2016-03-24 15:13:38 -07:00
Zach Pomerantz
aa038bac58
Don't cache nested geometries
2016-03-24 14:34:25 -07:00
Brad Hefta-Gaub
6eed8fb429
fix unix build
2016-03-24 13:30:20 -07:00
Anthony J. Thibault
c302c803b0
CullTask: added ability to disable culling during rendering.
...
You can use the following JavaScript to disable culling:
Render.RenderDeferredTask.CullSceneSelection.skipCulling = true
2016-03-24 13:20:29 -07:00
Ken Cooke
c6ca984782
Fix Reverb Zone settings to work correctly with new reverb.
2016-03-24 12:59:52 -07:00
Brad Hefta-Gaub
208b594ef8
make the deadlock watchdog more generous and add some logging so we can see heatbeats on slow machines
2016-03-24 12:37:07 -07:00
Zach Pomerantz
4d47126ae4
Don't mark failed models loaded, emit failure
2016-03-24 12:17:55 -07:00
Zach Pomerantz
3e9e083df5
Update users of NetworkGeometry
2016-03-24 11:35:41 -07:00
Zach Pomerantz
7f05e4453b
Fetch model geometries through cache
2016-03-24 11:35:40 -07:00
Brad Davis
a43fde0803
Build a better event bridge
2016-03-24 11:01:06 -07:00
Clément Brisset
caf2595e13
Merge pull request #7452 from birarda/udt-fixes
...
fix unecessary re-sends at capacity on udt, race in SendQueue timeout check
2016-03-24 11:00:57 -07:00
Ozan
003af03b33
Merge pull request #7400 from Menithal/default-use-pre-post
...
Set UserAnimPreAndPostRotations true by Default
2016-03-24 09:57:03 -07:00
Seth Alves
bd178640f1
Merge branch 'master' of github.com:highfidelity/hifi into redo-polyvox-locking
2016-03-24 09:51:31 -07:00
Zach Pomerantz
fc8b34f8c7
Move tex alpha detection to cv method
2016-03-24 09:48:33 -07:00
Brad Davis
8bbabf186f
Fix async issues related to JS / QML object lifetimes
2016-03-24 09:38:54 -07:00
Philip Rosedale
f8f0e48af9
Merge pull request #7453 from Atlante45/fix/atp-req-limit
...
Make ATP respect request limit
2016-03-24 09:20:30 -07:00
Seth Alves
1aadebb4e7
Merge pull request #7445 from AndrewMeadows/shape-management
...
fix memory leak in ShapeManager
2016-03-24 08:45:49 -07:00
Philip Rosedale
0e2d9d8aaa
Merge pull request #7432 from samcake/orange
...
Fix some Model loading issues with the translucent textures
2016-03-24 08:41:35 -07:00
Andrew Meadows
21c770f37b
Merge pull request #7441 from zzmp/clean/resource-reinsert
...
Restrict Resource reinsertion
2016-03-24 08:41:12 -07:00
Philip Rosedale
61205e0e37
Merge pull request #7450 from ZappoMan/reduceLogSpam
...
reduce log spam
2016-03-24 00:19:09 -07:00
Philip Rosedale
366810a20c
Merge pull request #7447 from ZappoMan/fixNonAnimatedMotorProteins
...
fix animated motor proteins
2016-03-24 00:11:26 -07:00
Seth Alves
462da3aaf3
don't call getMesh from render
2016-03-23 22:46:43 -07:00
Seth Alves
2d7f32a554
redo polyvox locking
2016-03-23 22:03:27 -07:00
Brad Hefta-Gaub
2b0670718f
Merge pull request #7449 from howard-stearns/report-previous-session-data
...
Report previous session data
2016-03-23 20:58:51 -07:00
Atlante45
69c516caaf
Have ATP respect request limit
2016-03-23 19:09:28 -07:00
Stephen Birarda
ef3f5e0221
fix for race in last receiver response
2016-03-23 18:23:30 -07:00
Anthony J. Thibault
de3144cde5
Merge branch 'master' into tony/vive-rendering-work
2016-03-23 18:13:59 -07:00
Stephen Birarda
1b322c8d01
don't oversend because of packet pairs
2016-03-23 18:07:28 -07:00
samcake
add811e404
Merge branch 'master' of https://github.com/highfidelity/hifi into lemon
2016-03-23 17:52:27 -07:00
Brad Hefta-Gaub
62a56ecbfa
fix typos
2016-03-23 17:45:22 -07:00
Stephen Birarda
57da7c2ba7
add handling for short circuit loss in SendQueue
2016-03-23 17:29:46 -07:00
Brad Hefta-Gaub
574642a6e4
Merge pull request #7440 from zzmp/feat/resource-finished
...
Add finished signal to Resource loading
2016-03-23 17:17:53 -07:00
Anthony J. Thibault
73725106f0
OpenGLDisplayPlugin: For non-threaded present use fetchAndReleasewithGpuWait
2016-03-23 17:13:29 -07:00
Anthony J. Thibault
8bb387dc74
Revert GLEscrow changes
2016-03-23 17:11:16 -07:00
Brad Hefta-Gaub
fdd0b48ae1
reduce log spam
2016-03-23 17:06:03 -07:00
howard-stearns
c435ca212a
Report previous session time.
2016-03-23 16:59:17 -07:00
samcake
22191a2864
When an albedo texture is replaced from script,make sure its aloha channel is checked for opacity
2016-03-23 16:12:43 -07:00
samcake
40f04f871f
Merge branch 'master' of https://github.com/highfidelity/hifi into lemon
2016-03-23 16:04:26 -07:00
Anthony J. Thibault
0d37515784
Merge branch 'master' into tony/vive-rendering-work
2016-03-23 15:59:59 -07:00
samcake
1e46b0803c
fixing repported issues during review
2016-03-23 15:59:57 -07:00
Brad Hefta-Gaub
3fa3b40f43
fix non-animated motor proteins
2016-03-23 15:56:31 -07:00
howard-stearns
550738776c
Pass whether or not previous session crashed to the UserActivityLogger.
2016-03-23 15:56:29 -07:00
samcake
7d99183474
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-03-23 15:47:00 -07:00
samcake
138a996013
First draft of monitoring the memeory consumption
2016-03-23 15:46:17 -07:00
Andrew Meadows
ecfe198e35
patch btCompoundShape memory leak
2016-03-23 14:39:49 -07:00
Andrew Meadows
119ef24d5d
cleanup ShapeManager API and fix bitrot in tests
2016-03-23 14:39:49 -07:00
Andrew Meadows
a52ac3cc50
remove excess whitespace
2016-03-23 14:39:49 -07:00
Zach Pomerantz
8b1a78bac0
Restrict Resource reinsertion
2016-03-23 13:00:29 -07:00
Zach Pomerantz
17aa2845a8
Add finished signal to Resource loading
2016-03-23 13:00:02 -07:00
Brad Davis
84dc15aff6
Fix potential deadlock in QML
2016-03-23 12:59:17 -07:00
Brad Hefta-Gaub
8c290ea6b9
Merge pull request #7390 from Atlante45/feat/udp-flood-protection
...
Server side bandwidth dial
2016-03-23 11:47:41 -07:00
Brad Hefta-Gaub
08b87b9b98
Merge pull request #7434 from zzmp/clean/incomplete-fbo
...
Clean up QML Render Thread
2016-03-23 10:43:21 -07:00
Brad Hefta-Gaub
2e6c360708
Merge pull request #7427 from huffman/fix-scriptengine-threading
...
Add protection around ScriptEngine::runInThread being called twice
2016-03-23 10:27:16 -07:00
samcake
de96e34f7e
Merge branch 'master' of https://github.com/highfidelity/hifi into lemon
2016-03-23 10:00:06 -07:00
samcake
b29ef7b037
IMplementing a memory counter
2016-03-23 09:45:38 -07:00
Chris Collins
29ac80d3fe
Merge pull request #7430 from ZappoMan/blenderDestructorCrash
...
make Blender keep a shared pointer to the model it's blending
2016-03-23 09:00:01 -07:00
Brad Hefta-Gaub
03a12ecf5a
Merge pull request #7433 from zzmp/fix/long-qml-instantiation
...
Avoid triggering deadlock on long local qml component instantion
2016-03-23 08:30:50 -07:00
Brad Davis
252a49eea4
Add a tracker and logging of memory allocated by the GPU library
2016-03-22 22:35:46 -07:00
samcake
24b26e3097
first few elements
2016-03-22 19:18:46 -07:00
Zach Pomerantz
40b21933a5
Clean QML Surface render log
2016-03-22 18:42:54 -07:00
Zach Pomerantz
fe1d8b24b4
Lock the QML Surface resizing better
2016-03-22 18:42:46 -07:00
Zach Pomerantz
b41c106f3c
Only set the context once per QML surface
2016-03-22 18:40:58 -07:00
Anthony J. Thibault
9dd24f81d4
Fix for osx and linux
2016-03-22 18:24:48 -07:00
Anthony J. Thibault
c40b70688c
Made Nsight wrapper win32 only.
2016-03-22 17:43:36 -07:00
Zach Pomerantz
745438148a
Reset deadlock watch before qml load
2016-03-22 17:17:36 -07:00
samcake
34633c2f19
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-03-22 16:51:32 -07:00
samcake
3274df9923
Fixing the missing field for blender translucent map
2016-03-22 16:18:51 -07:00
Brad Hefta-Gaub
9f0084dbb1
make Blender keep a shared pointer to the model it's blending
2016-03-22 16:01:31 -07:00
Anthony Thibault
209524a5c0
openvr: Non-threaded present work
...
In the unlikely event you hit 90htz in non-threaded present mode, you will have perfect tracking and latency.
This verifies that there are no other sources of tracking or rendering latency, other then the ones we already know about.
2016-03-22 15:38:10 -07:00
samcake
3c075532f8
Good to go for merge
2016-03-22 15:14:01 -07:00
Brad Davis
3e71316589
Merge pull request #7426 from ZappoMan/avatarIdentityFix
...
fix to default avatar model
2016-03-22 13:46:52 -07:00
Brad Hefta-Gaub
d372ca47ad
Merge pull request #7428 from zzmp/fix/clear-qml-gl
...
Clear GL error before initializing qml to avoid mystery crash
2016-03-22 13:39:45 -07:00
Zach Pomerantz
e28a876629
Compare gl to GL_NO_ERROR, not GLEW_OK
2016-03-22 13:25:43 -07:00
Zach Pomerantz
471ac80135
Revert most of "Rm extra GL logging"
2016-03-22 13:24:29 -07:00
Brad Hefta-Gaub
361aa3e683
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarIdentityFix
2016-03-22 12:31:19 -07:00
Zach Pomerantz
362e288be8
Rm mystery GL error before qml fbo
2016-03-22 12:05:24 -07:00
Zach Pomerantz
23e3b7e4e3
Rm extra GL logging
2016-03-22 12:04:58 -07:00
Zach Pomerantz
64ced6ee04
Add comment explaining bare glGetError
2016-03-22 12:04:24 -07:00
Brad Hefta-Gaub
691ee87c73
fix to default avatar model
2016-03-22 11:32:38 -07:00
Ryan Huffman
1a2f74f43a
Add protection around ScriptEngine::runInThread being called twice
2016-03-22 11:26:10 -07:00
Seth Alves
47fb85eaeb
be more defensive in FBXGeometry::convexHullContains
2016-03-22 11:24:12 -07:00
Anthony Thibault
50ac101d56
Avatar and Rig NSIGHT instrumentation
2016-03-22 10:36:32 -07:00
samcake
67abdab8b2
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-03-22 10:13:50 -07:00
Philip Rosedale
f57332e4be
Merge pull request #7421 from ZappoMan/fixBlenderCrashRedux
...
one more crack at fixing the blender
2016-03-22 09:51:21 -07:00
Andrew Meadows
114cb27c4f
Merge pull request #7422 from jherico/tabs
...
Fix occasional crash on creating overlay tool windows
2016-03-22 09:49:22 -07:00
Anthony Thibault
9faccabf0d
Merge branch 'master' of https://github.com/highfidelity/hifi into tony/vive-rendering-work
2016-03-21 21:55:53 -07:00
Anthony Thibault
b1286517c6
Removed frame latency in GLEscrow
...
This could occur if the GLEscrow queue has extra frames in it.
When new textures were fetched, before this fix, they were simply popped from the queue.
This commit introduces a loop, that will fetch from the queue until it is empty.
2016-03-21 21:51:16 -07:00
Anthony Thibault
225c462685
Improved NSIGHT instrumentation
...
* Application::idle, physics and avatar processing are tracked
* Application::paintGL frameNumber payload is tracked
* OpenGLDisplayPlugin::present is profiled with corresponding frameNumber payload
* Added color and payload support to Nsight ProfileRange class.
2016-03-21 21:47:59 -07:00
Brad Davis
28f25489f8
Fix occasional crash on creating overlay tool windows
2016-03-21 19:17:31 -07:00
Brad Hefta-Gaub
513138ca98
one more crack at fixing the blender
2016-03-21 18:28:26 -07:00
Philip Rosedale
6b3a4eb327
Merge pull request #7419 from hyperlogic/tony/no-locks-no-problem
...
Prevent deadlocks in AvatarUpdate
2016-03-21 17:54:27 -07:00
Seth Alves
eee4abfd95
Merge pull request #7420 from birarda/octree-leak
...
fix a memory leak in OctreePacketProcessor packet piggybacking
2016-03-21 17:52:04 -07:00
samcake
de374c0cac
Switching emissive and lightmap somewhere but not big issue
2016-03-21 17:51:57 -07:00
Anthony Thibault
0d046b12de
OpenVR: Moved WaitGetPoses after main window preview.
2016-03-21 17:39:10 -07:00
Stephen Birarda
20c923db32
remove leaking unused method from NLPacketList
2016-03-21 17:26:49 -07:00
Chris Collins
277f49ef64
Merge pull request #7410 from hyperlogic/tony/limit-accumulate-time-loops
...
AnimUtil: prevent accumulateTime from looping forever
2016-03-21 16:39:37 -07:00
samcake
695e558851
Trying to clena up the problem?
2016-03-21 16:36:47 -07:00
Brad Hefta-Gaub
7f3ce6dd26
Merge pull request #7417 from zzmp/fix/skybox-default
...
Default background behavior to stars
2016-03-21 16:15:06 -07:00
Brad Hefta-Gaub
afa6e6e30a
Merge pull request #7414 from zzmp/fix/leaking-reply
...
Delete used QNetworkReply
2016-03-21 16:06:45 -07:00
Anthony J. Thibault
7cab8f63fb
Merge branch 'master' of github.com:highfidelity/hifi into tony/no-locks-no-problem
2016-03-21 16:03:33 -07:00
Brad Hefta-Gaub
8cfa6fc960
Merge pull request #7413 from huffman/fix-emit-audio-packet
...
Fix audio packet being used in a thread-unsafe way
2016-03-21 15:58:10 -07:00
Chris Collins
6324d0e3be
Merge pull request #7393 from ZappoMan/protectMeshBoxes
...
Fix for crash in recalculateMeshBoxes()
2016-03-21 15:46:28 -07:00
Brad Hefta-Gaub
a6bf84b90e
Merge pull request #7399 from zzmp/fix/qml-thread
...
Move QML rendering to a defined thread
2016-03-21 15:31:42 -07:00
Brad Hefta-Gaub
5f3c29d3e2
Merge pull request #7416 from zzmp/fix/static-cast-network
...
Static cast avatar network reply
2016-03-21 15:31:20 -07:00
Chris Collins
ed3a9cb24b
Merge pull request #7415 from howard-stearns/thread-safe-entityToElementMap
...
Possible fix for getContainingElement crash.
2016-03-21 15:30:04 -07:00
Zach Pomerantz
2b92756c65
Default bg to SKY_DOME
2016-03-21 15:11:26 -07:00
Anthony J. Thibault
ce47f83288
Prevent deadlock if idle is called during rendering
...
This extraordinary event can occur if a MessageBox is popped up by the opengl driver.
* removed AvatarData::avatarLock
* removed AvatarUpdate
This code was left over from an earlier avatar threading experiment.
Removed AvatarData avatarLock and AvatarUpdate class
2016-03-21 15:11:15 -07:00
Andrew Meadows
0a00436700
Merge pull request #7411 from ZappoMan/fixBlenderCrashRedux
...
Fix blender crash redux
2016-03-21 15:04:22 -07:00
Atlante45
170433997c
Set Asset server max bandwidth wiring
2016-03-21 14:50:18 -07:00
Atlante45
6d2498b4f2
Remove debug print
2016-03-21 14:50:18 -07:00
Atlante45
c48be75a37
Make sure everyone calls sendPeriod's setter
2016-03-21 14:50:18 -07:00
Brad Hefta-Gaub
d28db7bec6
fix typo
2016-03-21 14:47:53 -07:00
Zach Pomerantz
cc83a9bc36
Actually loop qml render and wake on pause
2016-03-21 14:36:45 -07:00
Stephen Birarda
884df5739d
remove comment that indicates that onTimeout is not used
2016-03-21 14:28:55 -07:00
Stephen Birarda
0956649cdb
give CongestionControl timeout event from SendQueue
2016-03-21 14:28:55 -07:00
Stephen Birarda
8e97a50957
unlock before de-activating the queue
2016-03-21 14:28:55 -07:00
Stephen Birarda
c65ab5f1ad
re-check the timeout guards before acting on timeout
2016-03-21 14:28:55 -07:00
Stephen Birarda
24fd39dfa3
make sure NAKs is empty before append from timeout
2016-03-21 14:28:26 -07:00
Stephen Birarda
4fe9ad94f5
notify on the emptyCondition if an ACK is received
2016-03-21 14:28:26 -07:00
Stephen Birarda
74ae18e514
replace append with insert to work around assert
2016-03-21 14:28:26 -07:00
Stephen Birarda
b059e98ff5
fix units for timeout check on expiry
2016-03-21 14:28:26 -07:00
Stephen Birarda
b7ff94e20d
put packets back in the queue if flow window is full
2016-03-21 14:28:26 -07:00
Stephen Birarda
4c5ad8a03e
remove first congestion event drops
2016-03-21 14:28:26 -07:00
Stephen Birarda
08dff9c7ac
handle expiry check even if a packet was sent
2016-03-21 14:28:26 -07:00
Stephen Birarda
cbcc6e3ef2
fix for last decrease sequence number
2016-03-21 14:28:26 -07:00
Stephen Birarda
93a00c3d5d
don't perform a decrease during single packet loss events
2016-03-21 14:28:26 -07:00
Zach Pomerantz
1750b973e0
Static cast avatar network reply
2016-03-21 14:28:15 -07:00
Stephen Birarda
13a906aa20
Merge pull request #7412 from huffman/fix-handshake-packet
...
Fix handshake packet being used across SendQueues
2016-03-21 14:28:07 -07:00
Stephen Birarda
eb5ecc84ff
Merge pull request #7398 from huffman/add-request-handshake
...
Add HandshakeRequest packet
2016-03-21 14:27:28 -07:00
Ryan Huffman
c515355cff
Fix handshakeRequestPacket not being thread safe
2016-03-21 14:07:15 -07:00
howard-stearns
8858559247
Make access to entityToElementMap thread safe.
2016-03-21 14:02:18 -07:00
Ryan Huffman
99010c7bf6
Fix audio packet being used in a thread-unsafe way
2016-03-21 13:33:56 -07:00
samcake
ec7165983d
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-03-21 13:30:28 -07:00
samcake
d189dc4af2
Problem not fixed yet, need to merge with upstream
2016-03-21 13:30:08 -07:00
Zach Pomerantz
40aabe7fae
Delete used QNetworkReply
2016-03-21 13:30:01 -07:00
Ryan Huffman
afb1d68f3b
Fix handshake packet being used across SendQueues
2016-03-21 13:24:04 -07:00
Andrew Meadows
f58a00f75a
Merge pull request #7409 from huffman/fix-handle-reply-finished
...
Fix edge-case where resource can receive a signal after request deleted
2016-03-21 13:10:24 -07:00
Andrew Meadows
47c4b226ea
Merge pull request #7395 from hyperlogic/tony/openvr-crash-on-exit
...
openvr crash on exit fix
2016-03-21 13:04:45 -07:00
Brad Hefta-Gaub
2389295217
actually properly remove pending blendshapes
2016-03-21 13:04:37 -07:00
samcake
227ddb12a6
Trying to clen up the way the opacity final value comes to the fragment shader
2016-03-21 12:14:59 -07:00
Anthony J. Thibault
df5afffc77
AnimUtil: prevent accumulateTime from looping forever
...
This might happen with large dts, large timeScales.
2016-03-21 11:58:13 -07:00
Ryan Huffman
4f32749c17
Fix edge-case where resource can receive a signal after request deleted
2016-03-21 11:54:41 -07:00
Brad Hefta-Gaub
492e71345a
Revert "Revert "Fix ModelBlender crash""
...
This reverts commit f274cdcc7f
2016-03-21 11:42:25 -07:00
Zach Pomerantz
d3d0f229aa
Merge branch 'master' of github.com:highfidelity/hifi into fix/qml-thread
2016-03-21 11:25:14 -07:00
Zach Pomerantz
41fcf4cc6d
Forward declare qml render thread
2016-03-21 11:18:18 -07:00
Brad Hefta-Gaub
091e34e792
Merge pull request #7396 from AndrewMeadows/do-not-trust
...
prevent crash in SwingTwistConstraint
2016-03-21 11:13:41 -07:00
Brad Hefta-Gaub
f274cdcc7f
Revert "Fix ModelBlender crash"
2016-03-21 10:47:31 -07:00
Andrew Meadows
cd802a6549
Merge pull request #7406 from hyperlogic/tony/transparent-texture-fix
...
Model: fix for avatars with late loaded transparent textures.
2016-03-21 09:19:33 -07:00
Andrew Meadows
d7d428d1b2
Merge pull request #7387 from ZappoMan/fixBlenderCrash
...
Fix ModelBlender crash
2016-03-21 09:14:11 -07:00
Anthony Thibault
b06f027f2e
Model: fix for avatars with late loaded transparent textures.
2016-03-20 18:20:03 -07:00
Brad Hefta-Gaub
92c9dbc1aa
Merge pull request #7404 from sethalves/quiet-invisible-zone
...
don't spam log when a zone is invisible
2016-03-20 17:56:15 -07:00
Seth Alves
f8b8877369
coding standard
2016-03-20 17:37:06 -07:00
Brad Hefta-Gaub
5b3be03098
Merge pull request #7402 from hyperlogic/tony/empty-geometry-crash
...
NetworkGeometry: Fix crash for empty geometry/bad FBX versions
2016-03-20 17:25:27 -07:00
Seth Alves
d4ed9993b2
don't spam log when a zone is invisible
2016-03-20 15:06:17 -07:00
Anthony Thibault
5b2a050df7
display-plugins: Pulled getHeadPose into common base class.
...
* Moved getHeadPose and _headPoseCache out of each derived class and into HmdDisplayPlugin.
* updated comment in application.
2016-03-20 14:08:35 -07:00
Anthony Thibault
6e872edcae
NetworkGeometry: Fix crash for empty geometry/bad FBX versions
...
Interpret empty geometry as an error.
2016-03-20 12:13:54 -07:00
Brad Hefta-Gaub
b8929c4416
Merge pull request #7384 from zzmp/fix/bugsplat-1836
...
Check qml gl context on create
2016-03-20 11:26:09 -07:00
Menithal
cdbb7b2ad4
Set UserAnimPreAndPostRotations true by Default
...
If Blender avatars are animated by Blender animations, they have missing
Pre and Post rotations. This step is no longer necessary to have false,
and also makes sure all animations from Blender Work on all avatars (from
other platforms).
This commit make it default to be enabled:
2016-03-19 12:49:57 +02:00
Zach Pomerantz
62e635a52a
Compile qml render thread on *nix
2016-03-18 18:43:59 -07:00
Zach Pomerantz
12aa057ff6
Always log if gl context fails
2016-03-18 18:37:14 -07:00
