Commit graph

45258 commits

Author SHA1 Message Date
David Kelly
1d7cdff2bc Snapshot button plus script
Minor change to allow snapshots to not notify (though the old way
with CTRL+S still does).  Added button to do it, saves them to disk.

The plan is for us to add UI to share (or not) the snapshot.  That's
why we are not going through the notifications.  Also, the
script makes sure to hide/unhide hud and overlays.  Next we will upload
the pick to AWS via data-web (if you are logged in), and _then_ make
the share UI.
2016-08-01 18:21:01 -07:00
Brad Hefta-Gaub
17a5fa040d Merge pull request #8322 from jherico/deferred_batches
Deferred batches
2016-07-26 21:43:53 -07:00
Bradley Austin Davis
5bbcbbb811 Update render perf tool to use the new API 2016-07-26 17:06:44 -07:00
Bradley Austin Davis
54a7265be8 Removing empty file, because jenkins 2016-07-26 16:32:56 -07:00
Bradley Austin Davis
a9740b803f Defer batch execution to the end of the frame generation 2016-07-26 16:13:48 -07:00
Bradley Austin Davis
fa20898285 Remove last direct use of gpu::Context::render() 2016-07-26 16:13:22 -07:00
Bradley Austin Davis
bb6abf11d3 FramebufferCache, cleanup & thread safety 2016-07-26 15:32:31 -07:00
Bradley Austin Davis
a455f3a435 Add frame concept to gpu library 2016-07-26 15:25:36 -07:00
Andrew Meadows
5ce681154d Merge pull request #8301 from AlexanderOtavka/asset-browser-ui
Asset browser ui
2016-07-26 15:04:10 -07:00
Chris Collins
a13c8385bb Merge pull request #8319 from ZappoMan/punishSlowScripts
better allocation of CPU time while loading scenes and when slow scripts are running
2016-07-26 12:54:31 -07:00
Brad Hefta-Gaub
af9032e6fb Merge pull request #8321 from jherico/depth_fix
Fix depth state caching / resetting
2016-07-26 12:49:04 -07:00
Bradley Austin Davis
ac743b6acb PR feedback 2016-07-26 11:55:25 -07:00
Bradley Austin Davis
3962487ee3 Fix depth state caching / resetting 2016-07-26 11:55:25 -07:00
Brad Hefta-Gaub
2d199fe3d0 rename function for better clarity 2016-07-26 08:08:44 -07:00
Brad Hefta-Gaub
a12034cb45 fix unix warning, added comments 2016-07-26 07:54:55 -07:00
Brad Hefta-Gaub
83dc9ea6bb punish slow scripts and don't send updates while physics is still loading 2016-07-25 21:46:30 -07:00
James B. Pollack
40c24b8cd1 Merge pull request #8312 from imgntn/whiteboard_far_swiper
Make whiteboard marker spawning work with 'far trigger'
2016-07-25 17:01:48 -07:00
James B. Pollack
5ed1e602e6 Merge pull request #8316 from AlexanderOtavka/fix-script-end-errors
Fix script end errors
2016-07-25 16:50:05 -07:00
Zander Otavka
90154158b6 Fix gravity zero vector 2016-07-25 14:08:07 -07:00
Zander Otavka
344ec25bcd Fix gravity for dynamic entities 2016-07-25 14:01:57 -07:00
Chris Collins
e1e1ca1c12 Merge pull request #8306 from AndrewMeadows/fix-crash-on-avatar-change
fix interface crash when chaning avatar models
2016-07-25 12:11:46 -07:00
Brad Hefta-Gaub
43602ab0fb Merge pull request #8237 from imgntn/html5
updates to overlay web browser
2016-07-25 11:37:17 -07:00
James B. Pollack
38765e6fa4 extra space 2016-07-25 11:12:34 -07:00
James B. Pollack
84e4de4bad update formatting 2016-07-25 11:11:37 -07:00
James B. Pollack
708cce64b6 work with far trigger 2016-07-25 11:05:55 -07:00
Chris Collins
3c9b9aef4f Merge pull request #8304 from ChristophHaag/fixGridShader
fix grid shader
2016-07-25 09:47:12 -07:00
Andrew Meadows
1df3b59aa1 change BUG to FIXME 2016-07-24 19:19:35 -07:00
Andrew Meadows
d876251f1e release geometry refs in Model::deleteGeometry() 2016-07-24 19:17:39 -07:00
James B. Pollack
cb848362ec Merge pull request #8309 from ZappoMan/reduceLogSpamX
reduce activity logging spam
2016-07-24 19:06:52 -07:00
James B. Pollack
ea1c21e685 resolve merge 2016-07-24 18:51:00 -07:00
James B. Pollack
3b25b36db3 cleanup 2016-07-24 16:57:15 -07:00
James B. Pollack
8acb30da8e add permissions bar 2016-07-24 16:54:00 -07:00
Brad Hefta-Gaub
c85d6800c3 reduce activity logging spam 2016-07-24 11:44:25 -07:00
Brad Hefta-Gaub
4f04dbc926 Merge pull request #8308 from jherico/overlay_multi_edit
Allow atomic editing of multiple overlays from scripts
2016-07-23 13:51:51 -07:00
Brad Hefta-Gaub
1802f8e7a2 Merge pull request #8298 from imgntn/lazzzers
Update hand controller laser colors
2016-07-23 13:50:38 -07:00
Brad Hefta-Gaub
43064807d1 Merge pull request #8292 from jherico/webui
Fix some UI elements triggered by WebViews
2016-07-23 13:47:04 -07:00
Brad Hefta-Gaub
6f613e77b6 Merge pull request #8296 from jherico/perf
More work on perf testing
2016-07-23 13:45:06 -07:00
Brad Hefta-Gaub
f0574282eb Merge pull request #8299 from hyperlogic/bug-fix/no-hips-no-problem
Prevent avatars with missing "Hips" joints from causing crashes
2016-07-23 13:44:14 -07:00
Brad Hefta-Gaub
41e02276e5 Merge pull request #8297 from hyperlogic/feature/fst-anim-graph-override
Support for animGraphUrl override in FST file.
2016-07-23 13:42:46 -07:00
Brad Hefta-Gaub
e5e3967030 Merge pull request #8307 from jherico/osx_laser_fix
Disable glow lines on Mac
2016-07-23 13:23:06 -07:00
Brad Davis
121a0f0f5e Allow atomic editing of multiple overlays from scripts 2016-07-23 11:41:58 -07:00
Brad Davis
85b0440e32 Disable glow lines (and the use of geometry shaders) on non-Windows platforms for now 2016-07-23 11:06:33 -07:00
Andrew Meadows
7280992806 add mutex lock around AvatarData joint data 2016-07-23 10:30:44 -07:00
Christoph Haag
7134d2bfd4 fix grid shader
this shader is used for example in
developer - audio - audio scope - show scope
2016-07-23 11:09:16 +02:00
Brad Davis
89d9affb41 Merge remote-tracking branch 'upstream/stable' 2016-07-22 19:47:31 -07:00
Chris Collins
2c3b25cfa7 Merge pull request #8302 from davidkelly/dk/hotfixForAudio
Hotfix for RC-16: Audio fix for injectors and Assignment Clients
2016-07-22 19:11:56 -07:00
David Kelly
3d3a7a8820 Merge branch 'stable' of github.com:highfidelity/hifi into dk/hotfixForAudio 2016-07-22 18:40:06 -07:00
David Kelly
8b8a98bfcc Acutally audio was really broken
Seems there were 2 issues:
* If you couldn't inject locally (say, no audio interface
  because you are an assignment client), we would not do the
  network injection at all.  That's bad.
* When we don't have a codec, like when using an injector, we
  were serializing the empty string in some problematic way.  I
  just use the built-in serialization, and it seems fine.

I tested this by first playing a sound in the console (or maybe you
want to tip some cows, that is ok too).  Then in _another_ interface
client on another machine in the same domain, I better hear the
sound.

Then, I added a script to play audio as a persistent script, which
just loops forever and ever.  You should hear that on both interface
clients also.

A detailed test plan to follow.

Also: using @zappoman serialization code, which is safer than using
the Qt code which does magical things for nulls.  Good to do this cuz
you know, things happen...
2016-07-22 18:33:38 -07:00
Chris Collins
a06ef47bb3 Merge pull request #8300 from davidkelly/dk/noACAudioPlus
Actually audio was really broken
2016-07-22 18:23:28 -07:00
David Kelly
4b48cc7c2e Acutally audio was really broken
Seems there were 2 issues:
* If you couldn't inject locally (say, no audio interface
  because you are an assignment client), we would not do the
  network injection at all.  That's bad.
* When we don't have a codec, like when using an injector, we
  were serializing the empty string in some problematic way.  I
  just use the built-in serialization, and it seems fine.

I tested this by first playing a sound in the console (or maybe you
want to tip some cows, that is ok too).  Then in _another_ interface
client on another machine in the same domain, I better hear the
sound.

Then, I added a script to play audio as a persistent script, which
just loops forever and ever.  You should hear that on both interface
clients also.

A detailed test plan to follow.

Also: using @zappoman serialization code, which is safer than using
the Qt code which does magical things for nulls.  Good to do this cuz
you know, things happen...
2016-07-22 17:47:24 -07:00