Stephen Birarda
|
ba89c8a97a
|
remove some extra debug that isn't needed
|
2015-12-21 16:23:23 -07:00 |
|
Ryan Huffman
|
f5f0829216
|
Merge pull request #6716 from birarda/master
fix for stop of a nullptr QTimer
|
2015-12-21 15:21:42 -08:00 |
|
Stephen Birarda
|
8c6449a886
|
fix for stopping a nullptr QTimer
|
2015-12-21 16:20:06 -07:00 |
|
Brad Hefta-Gaub
|
111a8caa3c
|
Merge pull request #6701 from highfidelity/graphics
Graphics merge into Master: Adding Gamma correction, Tone Mapping and Debugging tool
|
2015-12-21 13:54:50 -08:00 |
|
Brad Davis
|
491d2fe95e
|
Merge pull request #6713 from ZappoMan/rightClickMenu
add absolute rotation based hand reticle movement
|
2015-12-21 12:45:50 -08:00 |
|
Brad Davis
|
e3ab230638
|
Merge pull request #6711 from samcake/hdr
Graphics : Fix procedural Shader Gamma and Adding color linear getters in Particle system
|
2015-12-21 12:22:14 -08:00 |
|
Brad Hefta-Gaub
|
b69892eb9b
|
Merge pull request #6714 from jherico/qml_dep_fix
Remove script -> qt::webchannel dependency
|
2015-12-21 12:10:38 -08:00 |
|
samcake
|
4f54b85c92
|
Remove warnings
|
2015-12-21 12:05:19 -08:00 |
|
samcake
|
ae124ebede
|
Tuning the proedural shader support to work with the current default: gamma corrected emissive
|
2015-12-21 12:00:30 -08:00 |
|
samcake
|
492572df45
|
Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr
|
2015-12-21 11:26:15 -08:00 |
|
samcake
|
1f6466f107
|
Merge pull request #6712 from samcake/graphicsMaster
Graphics: Merge upstream master into upstream graphics
|
2015-12-21 11:24:07 -08:00 |
|
Brad Davis
|
05b7fcc957
|
Remove script -> qt::webchannel dependency
|
2015-12-21 11:19:05 -08:00 |
|
Brad Hefta-Gaub
|
248b3d09ac
|
add absolute rotation based hand reticle movement
|
2015-12-21 10:49:49 -08:00 |
|
samcake
|
6bbc94badc
|
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
|
2015-12-21 10:48:55 -08:00 |
|
samcake
|
4c2d5c54c4
|
Merge branch 'hdr' of https://github.com/samcake/hifi into hdr
|
2015-12-21 10:43:41 -08:00 |
|
samcake
|
aef748b894
|
Adding linear color in Particule system
|
2015-12-21 10:40:29 -08:00 |
|
Brad Davis
|
46a4a469e9
|
Merge pull request #6689 from ZappoMan/rightClickMenu
Some early work to support hand driven reticle
|
2015-12-20 17:49:50 -08:00 |
|
Seth Alves
|
d71cecbc61
|
Merge pull request #6675 from AndrewMeadows/crash-fix
fix crash when visiting new domain with gun in hand
|
2015-12-20 06:24:44 -08:00 |
|
Brad Hefta-Gaub
|
ae04556f45
|
Merge pull request #6708 from sethalves/fix-entity-server-crash
fix entity-server crash
|
2015-12-19 16:13:24 -08:00 |
|
samcake
|
8f63a7ae11
|
Merge pull request #6710 from samcake/graphicsMaster
Graphics: merge upstream master to upstream graphics
|
2015-12-19 11:40:22 -08:00 |
|
samcake
|
1e8e3fec87
|
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
|
2015-12-19 11:38:20 -08:00 |
|
Seth Alves
|
9271209d89
|
another
|
2015-12-19 08:13:53 -08:00 |
|
Seth Alves
|
8b9de716f1
|
fix bad pointer juju
|
2015-12-19 08:08:10 -08:00 |
|
Brad Hefta-Gaub
|
e929e3f789
|
more work on angular velocity tests
|
2015-12-18 19:20:32 -08:00 |
|
Brad Hefta-Gaub
|
f55445bb88
|
Merge pull request #6707 from jherico/webengine
Fixing QML based web view crash.
|
2015-12-18 18:19:36 -08:00 |
|
Brad Davis
|
ae6cf131f5
|
Fixing crash bug
|
2015-12-18 17:19:06 -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
|
4e1a812ff3
|
Merge pull request #6706 from samcake/graphicsMaster
Graphics: apply upstream master revert
|
2015-12-18 17:15:54 -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
|
baf2d5acb7
|
Merge pull request #6705 from highfidelity/revert-6651-webengine
Revert "Migrate QML based web views to Qt WebEngine"
|
2015-12-18 17:09:44 -08:00 |
|
Brad Davis
|
1f3adeb666
|
Revert "Migrate QML based web views to Qt WebEngine"
|
2015-12-18 17:09:38 -08:00 |
|
samcake
|
33a14b07b9
|
Merge pull request #6704 from samcake/graphicsMaster
Graphics: Merge upstream master to upstream graphics
|
2015-12-18 16:32:11 -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
|
a621579f17
|
add philips version of hand movement
|
2015-12-18 15:44:21 -08:00 |
|
Brad Hefta-Gaub
|
4075f355a3
|
more work on hand movement
|
2015-12-18 15:44:01 -08:00 |
|
samcake
|
d5bac4c257
|
Merge pull request #6703 from samcake/hdr
Change the default tone curve to jusimple gamma correct and fix the r…
|
2015-12-18 15:36:44 -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 |
|
Brad Hefta-Gaub
|
bfa0652100
|
Merge pull request #6700 from AndrewMeadows/angular-velocity-is-a-vector
protect against NaN in measure of hydra angularVelocity
|
2015-12-18 14:29:23 -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 |
|
Andrew Meadows
|
4e76e9e50b
|
prevent nan values in measure of angularVelocity
|
2015-12-18 13:51:14 -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 |
|