Atlante45
d8a389ff92
First cut at custom pipelines
2015-12-17 15:18:23 -08:00
Atlante45
9d6618c341
Cleanup DebugDeferredBuffer code
2015-12-17 15:18:23 -08:00
Atlante45
06d7de7106
Make Shader interface take more consts
2015-12-17 15:18:23 -08:00
Atlante45
b271542b73
Save DebugMode to setting, restore on script start
2015-12-17 15:18:23 -08:00
Andrew Meadows
1bb6ddb99f
Merge pull request #6676 from sethalves/dejitter-hold-action
...
Dejitter hold action
2015-12-17 14:29:39 -08:00
Clément Brisset
992cffd6d6
Merge pull request #6686 from samcake/hdr
...
Graphics: Fix bad returned references which should be copied values
2015-12-17 13:20:59 -08:00
Brad Davis
5088eec2a2
Move directory web UI into the overlay
2015-12-17 12:23:39 -08:00
Brad Davis
82c865af2c
Rename QmlWebWindow to OverlayWebWindow, move ctor registration to script engine
2015-12-17 12:20:38 -08:00
Seth Alves
b80fa1c806
code review
2015-12-17 11:46:41 -08:00
Ryan Huffman
3da5cf1fe5
Merge pull request #6684 from birarda/read-type-assert
...
fix reading of empty or malformed packets
2015-12-17 11:26:47 -08:00
Seth Alves
f3adb8a2f7
fix offset math in hold action
2015-12-17 11:16:59 -08:00
Brad Hefta-Gaub
63a63152a4
add procedural hand pose example
2015-12-17 11:10:49 -08:00
Seth Alves
eb173815f5
Merge branch 'master' of github.com:highfidelity/hifi into dejitter-hold-action
2015-12-17 11:08:05 -08:00
Stephen Birarda
06e9731fe4
don't attempt to read an empty or malformed packet
2015-12-17 11:07:36 -08:00
Seth Alves
aabc544d6c
Merge pull request #6683 from birarda/shtml-content-type
...
serve SHTML files with HTML MIME type
2015-12-17 11:05:34 -08:00
Stephen Birarda
08f42c08d9
use a ternary for single assignment
2015-12-17 10:54:32 -08:00
Stephen Birarda
286b984d6f
serve SHTML files with HTML MIME type
2015-12-17 10:48:33 -08:00
samcake
927cdc0880
Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr
2015-12-17 10:30:04 -08:00
samcake
593f74aa99
Merge pull request #6682 from samcake/graphicsMaster
...
Graphics: merging upstream master into upstream graphics
2015-12-17 10:27:30 -08:00
samcake
d8a71db929
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-17 10:11:03 -08:00
samcake
8d4d0d4e9a
FIxing the bad returned value per reference
2015-12-17 10:08:40 -08:00
Clément Brisset
40272faa3f
Merge pull request #6679 from hyperlogic/tony/particle-system-invalidated-iterator-fix
...
ParticleEffectEntityItem: fix for invalid iterator increment
2015-12-17 09:43:39 -08:00
Clément Brisset
aac59ad442
Merge pull request #6678 from samcake/hdr
...
Graphics: Tone mapping Tone curve is now configurable and Material colors are sRGB by default
2015-12-17 09:43:02 -08:00
Seth Alves
32fb4decd5
Merge branch 'master' of github.com:highfidelity/hifi into dejitter-hold-action
2015-12-17 07:32:52 -08:00
Brad Hefta-Gaub
24dde9ea92
Merge branch 'master' of https://github.com/highfidelity/hifi into rightClickMenu
2015-12-16 21:28:42 -08:00
Brad Hefta-Gaub
0b9bd858a7
implement support for pose ScriptEndpoints
2015-12-16 21:28:27 -08:00
Brad Hefta-Gaub
0db0ef89d7
Merge pull request #6674 from murillodigital/master
...
Unifying Windows PR and Release installer pipeline
2015-12-16 20:42:13 -08:00
Brad Hefta-Gaub
275b35ef60
Merge pull request #6670 from Atlante45/ac-race
...
Fix entity server race
2015-12-16 20:21:56 -08:00
Brad Davis
343d31b38f
Merge pull request #6677 from AlessandroSigna/overlays
...
Fix to remove a VS warning
2015-12-16 20:12:27 -08:00
Anthony J. Thibault
2eecb61da5
Prefer erase over repeated pop_front calls
2015-12-16 19:08:31 -08:00
samcake
7bc815448e
The material colors for diffuse and emissive are now gamma corrected by default
2015-12-16 18:14:43 -08:00
Anthony J. Thibault
3b1ba67a88
ModelEntityItem: Fix for incorrect animations with preTranslations
...
ModelEntities that were playing animations on models with local pivot offsets were not working correctly.
Specifically, the windmill animation in the demo domain.
We now compose a matrix containing all of the FBX's preTranslation, preRotation and postTranformations.
2015-12-16 17:08:22 -08:00
Anthony J. Thibault
1b08563079
ParticleEffectEntityItem: fix for invalid iterator increment
...
Was causing an assert in debug, due to calling ++ on an invalid iterator.
In release this might lead to memory corruption.
2015-12-16 16:56:49 -08:00
samcake
1b1365fd40
Exposing the tone curve in the js api
2015-12-16 16:32:53 -08:00
Brad Davis
fa5bab08b1
Support web content inside QML
2015-12-16 16:25:38 -08:00
Atlante45
2c8be15e66
Unnecessary shutdown (Already shutting down)
2015-12-16 15:56:22 -08:00
Seth Alves
5f9bdcb2aa
fix lock type
2015-12-16 15:52:20 -08:00
Seth Alves
ea202c5271
Merge branch 'master' of github.com:highfidelity/hifi into dejitter-hold-action
2015-12-16 15:44:44 -08:00
AlessandroSigna
364a70bb46
Fix to avoid MVS warning
2015-12-16 15:41:27 -08:00
Seth Alves
d7affcf811
keep track of palm rotation vs avatar as well as palm translation
2015-12-16 15:41:27 -08:00
Andrew Meadows
45e31ca442
fix warning about unused variable
2015-12-16 15:35:23 -08:00
Seth Alves
489d4099a7
add locationChanged to model entities
2015-12-16 15:21:20 -08:00
samcake
c0faf978f8
Introducing a setting for the tone curve
2015-12-16 15:21:09 -08:00
Andrew Meadows
ff83f8fc37
fix crash mode when leaving domain with handgun
2015-12-16 15:11:47 -08:00
Andrew Meadows
c14433979b
fix crash mode when model late to get collision URL
2015-12-16 15:11:47 -08:00
Leonardo Murillo
bbe444ffc1
Forgot to add file
2015-12-16 16:40:51 -06:00
Leonardo Murillo
a7b61cf791
Couple of fixes
2015-12-16 16:39:09 -06:00
samcake
dc6585591f
t :wq
...
Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr
2015-12-16 14:38:47 -08:00
Atlante45
b709c8162c
Fix node flapping race
2015-12-16 14:27:26 -08:00
Atlante45
6bda8d3f18
CR logging category
2015-12-16 14:27:26 -08:00
