Brad Hefta-Gaub
e929e3f789
more work on angular velocity tests
2015-12-18 19:20:32 -08:00
Brad Davis
6098c4a1d6
Revert "Revert "Migrate QML based web views to Qt WebEngine""
...
This reverts commit 1f3adeb666
2015-12-18 17:18:46 -08:00
samcake
7e66515beb
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-18 17:13:48 -08:00
Brad Davis
1f3adeb666
Revert "Migrate QML based web views to Qt WebEngine"
2015-12-18 17:09:38 -08:00
samcake
41525a7c4d
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-18 16:20:41 -08:00
Brad Hefta-Gaub
4075f355a3
more work on hand movement
2015-12-18 15:44:01 -08:00
samcake
f24800cf10
Change the default tone curve to jusimple gamma correct and fix the renaming in the renderENgineDebug script
2015-12-18 15:35:01 -08:00
Brad Hefta-Gaub
868d10651a
Merge pull request #6651 from jherico/webengine
...
Migrate QML based web views to Qt WebEngine
2015-12-18 14:56:35 -08:00
Brad Davis
88b88a3306
Fixing warnings
2015-12-18 14:32:35 -08:00
Brad Hefta-Gaub
42764426ce
Merge branch 'master' of https://github.com/highfidelity/hifi into rightClickMenu
2015-12-18 14:30:16 -08:00
Andrew Meadows
aa3d1c6e4c
Merge pull request #6680 from hyperlogic/tony/windmill-anim-fix
...
ModelEntityItem: Fix for incorrect animations with preTranslations
2015-12-18 14:16:35 -08:00
Seth Alves
154bf5978b
Merge pull request #6697 from samcake/hdr
...
Graphics: Adding gamma correction to color vertex attribute
2015-12-18 14:11:14 -08:00
Andrew Meadows
eb3210071e
Merge pull request #6664 from hyperlogic/tony/idle-to-walk-transition
...
Improved idle to walk forward transition
2015-12-18 13:59:03 -08:00
samcake
19769ddd8f
Merge pull request #6691 from zzmp/refactor/scene-render
...
Split JS global Scene into Scene and Render
2015-12-18 13:57:25 -08:00
samcake
0492bb1c6d
Final cleans and tests using R11G11B10 for lighting buffer
2015-12-18 13:50:28 -08:00
Eric Levin
2e4df5f859
Merge pull request #6692 from ctrlaltdavid/20758
...
Update particlesTest.js per current particles implementation
2015-12-18 13:35:19 -08:00
samcake
f6c80e01e9
Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr
2015-12-18 13:23:09 -08:00
samcake
5a4d028573
Merge pull request #6699 from samcake/graphicsMaster
...
Graphics : merge upstream master into upstream graphics
2015-12-18 13:23:05 -08:00
samcake
0482a2a7f7
Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr
2015-12-18 13:20:46 -08:00
samcake
d22811a771
Merge pull request #6698 from zzmp/fix/check-locations-pipeline
...
Stop modelMesh render if pipeline is not found
2015-12-18 13:20:12 -08:00
samcake
dff4327f7d
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-18 13:18:30 -08:00
Zach Pomerantz
2c2b794683
Stop modelMesh render if pipeline is not found
2015-12-18 13:16:05 -08:00
samcake
3014b3bd5b
Adding Gamma correction to all the Color coming for the attribute stream if used as color
2015-12-18 12:50:21 -08:00
Brad Hefta-Gaub
5701ad2e8c
update to new angular velocity
2015-12-18 12:38:50 -08:00
Brad Hefta-Gaub
fff567d854
Merge branch 'master' of https://github.com/highfidelity/hifi into rightClickMenu
2015-12-18 12:31:24 -08:00
Brad Hefta-Gaub
bfecf68a2e
Merge pull request #6696 from AndrewMeadows/angular-velocity-is-a-vector
...
angular velocity is a vector
2015-12-18 12:29:56 -08:00
Zach Pomerantz
674bfa4f37
Replace RenderContext substructs with subclasses
2015-12-18 12:04:21 -08:00
Zach Pomerantz
d057239023
Rename RenderContext::ItemsMeta to ItemsConfig
2015-12-18 11:48:40 -08:00
Brad Davis
08a087c5aa
PR comments
2015-12-18 11:19:01 -08:00
Andrew Meadows
d6541e9ee7
angular velocity is a vector, not a quaternion
2015-12-18 11:06:58 -08:00
Zach Pomerantz
cdcb2d565d
Use new RenderContext accessors for rendering
2015-12-18 10:34:39 -08:00
Zach Pomerantz
919a4b6728
Split global JS Scene into Render
2015-12-18 10:33:41 -08:00
samcake
157597e783
Merge pull request #6690 from samcake/hdr
...
Graphics: Fix the shading equation to respect the fresnel term for the diffuse
2015-12-18 10:30:36 -08:00
Brad Hefta-Gaub
a7824a06d0
fix Assignment copy constructor warning
2015-12-17 18:51:27 -08:00
Brad Hefta-Gaub
a2d5124964
Merge branch 'master' of https://github.com/highfidelity/hifi into rightClickMenu
2015-12-17 18:12:12 -08:00
David Rowe
9a7c0cb182
Typo noticed in passing
2015-12-18 15:12:03 +13:00
Brad Hefta-Gaub
d344ef6e2a
fix warning in my PR
2015-12-17 18:10:41 -08:00
samcake
c891bcb8cd
FIxing the diffuse contribution bug maybe
2015-12-17 17:44:40 -08:00
samcake
32bb8f020c
FIxing the diffuse contribution bug maybe
2015-12-17 17:40:35 -08:00
Brad Hefta-Gaub
762aefbbca
add hand driven reticle
2015-12-17 17:38:20 -08:00
Atlante45
78b805a19a
Fix file shader file lookup on windows
2015-12-17 16:06:55 -08:00
Atlante45
c0a675dd9e
Fix msvc warning
2015-12-17 16:02:49 -08:00
Atlante45
f41ca9fc50
More custom debug work
2015-12-17 15:18:23 -08:00
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
Andrew Meadows
1bb6ddb99f
Merge pull request #6676 from sethalves/dejitter-hold-action
...
Dejitter hold action
2015-12-17 14:29:39 -08:00
ericrius1
92f96cbb2f
Removed un-needed libraries from particle effect entity
2015-12-17 12:49:30 -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
ericrius1
5b52b5e5e7
Merge branch 'master' into polylineOptimizations
2015-12-17 11:41:34 -08:00
ericrius1
2aaefbcfcb
refactoring, adding headers
2015-12-17 11:32:48 -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
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
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
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
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
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
Seth Alves
ea202c5271
Merge branch 'master' of github.com:highfidelity/hifi into dejitter-hold-action
2015-12-16 15:44:44 -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
Atlante45
b4dc3b1b47
Fix windows compile error.
2015-12-16 14:27:26 -08:00
Atlante45
a541fdd2df
Move OctreeSendThread to the OctreeServer
2015-12-16 14:27:26 -08:00
Atlante45
95da71b19c
Assignment don't inherit from NodeData
...
This is an artefact from an old design that stuck around
2015-12-16 14:27:26 -08:00
Atlante45
562d9ac2de
Forward QThread's finished signal in GenericThread
2015-12-16 14:27:26 -08:00
Atlante45
346c28f9e2
Remove OctreeServer's static instance
2015-12-16 14:27:26 -08:00
Seth Alves
d3c57821c0
call a method on actions before each physics simulation step. use this to attempt to dejitter held objects
2015-12-16 14:00:04 -08:00
David Rowe
b25fc5be6c
Don't send a domain-server check in when shutting down
2015-12-17 09:52:34 +13:00
Anthony Thibault
0c1ae5bb61
Merge pull request #6657 from AndrewMeadows/avatar-capsule-2
...
Correct collision capsule for scaled avatars
2015-12-16 11:36:08 -08:00
Ryan Huffman
a422103e89
Merge pull request #6662 from AlessandroSigna/overlays
...
Exposing emmisive property of the Image3DOverlay
2015-12-16 10:29:34 -08:00
AlessandroSigna
08f7591787
Fix misspelling
2015-12-16 10:02:47 -08:00
samcake
7c8f12b9c4
Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr
2015-12-16 09:55:37 -08:00
samcake
b4b541178d
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-16 09:42:06 -08:00
samcake
1364329886
FIxing the compil bug by checking security of the call with assert and avoiding the compilation error
2015-12-15 22:07:06 -08:00
Zach Pomerantz
3280894e29
Load texture by convention with .obj
2015-12-15 19:30:15 -08:00
ericrius1
61bad36d5c
tweaks
2015-12-15 18:49:04 -08:00
samcake
a60ef4fb5a
Finalize the names
2015-12-15 18:32:30 -08:00
samcake
c2feec16de
Cleaning the code
2015-12-15 18:24:16 -08:00
samcake
d2ebaef69e
Adding a simple manual exposure control to configure the tonemapping and expose it to js. Add a convenient way to access the Job._concept._data with template
2015-12-15 18:18:42 -08:00
Andrew Meadows
7baee8c391
use glm::clamp() instead of std::min() and max()
2015-12-15 18:18:08 -08:00
Andrew Meadows
c3823de353
setClampedTargetScale()-->setTargetScaleVerbose()
2015-12-15 18:18:08 -08:00
Andrew Meadows
33634cdaa1
properly delete departing avatars
2015-12-15 18:18:08 -08:00
Andrew Meadows
e9f52b1211
properly scale avatar collision shape
2015-12-15 18:18:08 -08:00
ericrius1
d9c93130e5
In a state where non uniform random vals are clear
2015-12-15 18:02:11 -08:00
Anthony J. Thibault
30480f126b
Improved idle to walk forward transition
...
Hooked up a transition animation from idle to walk in the animation json.
Also fixed a bug in the AnimBlendLinearMove which was preventing the interpolation
into idle from being correct.
2015-12-15 17:26:17 -08:00
Brad Davis
29516619ee
Merge pull request #6661 from ZappoMan/rightClickMenu
...
first cut at simulating mouse/reticle behavior with input contorllers
2015-12-15 16:08:59 -08:00
