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
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
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
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
Brad Hefta-Gaub
c85d6800c3
reduce activity logging spam
2016-07-24 11:44:25 -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
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 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
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
Zander Otavka
c25b87c33f
Use custom dialog for asset server add to world
2016-07-22 17:14:45 -07:00
Zander Otavka
530e17a7e5
Move JSON parsing for custom dialog to be sooner
2016-07-22 17:14:45 -07:00
Ryan Downe Karpf
91714aaca6
Merge pull request #8258 from AlexanderOtavka/edit-model-ui
...
Edit model dialog improvements
2016-07-22 17:11:52 -07:00
Chris Collins
e755528cf2
Merge pull request #8278 from sethalves/fix-equip-fly-away
...
fix equip fly-away
2016-07-22 16:47:31 -07:00
Anthony Thibault
3b14988577
Fix another crash if "Hips" joint is not found.
2016-07-22 16:27:43 -07:00
Anthony Thibault
a43e9a5710
Fix for crash on avatars with missing "Hips" joint
2016-07-22 16:00:40 -07:00
James B. Pollack
5202038210
Merge pull request #8282 from hyperlogic/bug-fix/avatar-embedded-in-floor
...
Vive HMD fixes to prevent user from becoming embedded in the floor.
2016-07-22 09:04:40 -07:00
Brad Hefta-Gaub
566e0f5dbf
Merge pull request #8287 from AndrewMeadows/fix-simple-compound
...
fix bug breaking simple-compound shape type
2016-07-21 18:18:04 -07:00
Brad Hefta-Gaub
c24472d390
Merge pull request #8290 from howard-stearns/cleanup-heartbeat
...
cleanup domain-server heartbeat code
2016-07-21 18:17:19 -07:00
Anthony Thibault
2429b82b5e
Support for animGraphUrl override in FST file.
2016-07-21 17:17:08 -07:00
howard-stearns
b303c6df8e
strong type checking my arse
2016-07-21 16:04:12 -07:00
Brad Davis
faba1a4b4e
Fix UI elements triggered by WebViews
2016-07-21 15:13:07 -07:00
Brad Hefta-Gaub
bb8224be8c
fix silence on no codec after previous codec has been set
2016-07-21 13:57:11 -07:00
Anthony Thibault
592a50356b
Merge pull request #8211 from highfidelity/skin
...
Skin sub-surface lighting
2016-07-20 15:48:25 -07:00
Andrew Meadows
20eebb90f8
fix build -- remove some accidental changes
2016-07-20 14:08:25 -07:00
Andrew Meadows
3fdfc0db14
fix bug breaking simple-compound shape type
2016-07-20 12:55:13 -07:00
samcake
1c4742e710
Fixing comments from review
2016-07-20 11:02:27 -07:00
samcake
853f31f6ea
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
2016-07-20 10:49:27 -07:00
David Kelly
7b2d5e7fab
Potential cause of that buzzsaw when resetting
2016-07-20 10:41:16 -07:00
Andrew Meadows
2afd65467a
fix bug where model is not yet ready for col shape
2016-07-19 18:01:22 -07:00
Andrew Meadows
22e7e150fc
remove debug cruft
2016-07-19 18:01:06 -07:00
Seth Alves
56726183f6
clear internal bullet flag before switching entity to kinematic
2016-07-19 16:45:57 -07:00
