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
cec6e7dd8d
Application: reduced idle PROFILE_RANGE spam
2016-03-23 17:12:48 -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
dbdf79f96f
Restore whitespace so there aren't superfluous diffs.
2016-03-23 17:01:50 -07:00
howard-stearns
c435ca212a
Report previous session time.
2016-03-23 16:59:17 -07:00
Menithal
12ecd592ab
Added Refresh Buttons to entityProperties
...
Pressing buttons next to the url bar will now allow for content to have an
automatic unix timestamp to be applied / updated to the end of the url.
Applies for all url entity Properties
2016-03-24 01:14:48 +02: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
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
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
Brad Hefta-Gaub
dbfea6ec82
Merge pull request #7439 from jherico/deadlock_qml
...
Fix potential deadlock in QML
2016-03-23 14:16:37 -07:00
Brad Hefta-Gaub
61651b21db
Merge pull request #7443 from Atlante45/readme
...
Update readme
2016-03-23 14:16:07 -07:00
Stephen Birarda
34fb06a7bd
changes to attachments dialog from contractor
2016-03-23 13:52:47 -07:00
Atlante45
fdd7bb9f58
Update readme
2016-03-23 13:19:34 -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
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 Hefta-Gaub
fc920c321b
Merge pull request #7436 from jherico/alloc_watch
...
Add a tracker and logging of memory allocated by the GPU library
2016-03-23 08:28:31 -07:00
PhilipRosedale
7e658896e6
update header
2016-03-22 22:39:55 -07:00
PhilipRosedale
472dd07625
airship from hack project
2016-03-22 22:39:22 -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
Brad Davis
2fdb92e8cd
Move oglplus dependency from sourceforge to s3
2016-03-22 22:19:10 -07:00
Anthony J. Thibault
df187499ff
MyAvatar: fix jitter in hands when moving
...
Store hand controller positions within the avatar in sensor space, not world space.
Before IK the sensorToWorld matrix is updated to reflect the world space motion of the
character controller during physics. This ensures the IK hand targets move properly with the character.
2016-03-22 19:19:52 -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
Zach Pomerantz
9c11474dd7
Expose qApp->updateHeartbeat
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
