Commit graph

36349 commits

Author SHA1 Message Date
samcake
d8a71db929 Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-17 10:11:03 -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
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
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
Atlante45
2c8be15e66 Unnecessary shutdown (Already shutting down) 2015-12-16 15:56:22 -08:00
AlessandroSigna
364a70bb46 Fix to avoid MVS warning 2015-12-16 15:41:27 -08:00
samcake
c0faf978f8 Introducing a setting for the tone curve 2015-12-16 15:21:09 -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
Atlante45
b55d8f750f CR 2015-12-16 14:27:26 -08:00
Atlante45
0f7093bed7 Whitespace 2015-12-16 14:27:26 -08:00
Atlante45
df24fafe49 CR feedback 2015-12-16 14:27:26 -08:00
Atlante45
a655557af0 Make variable name more obvious 2015-12-16 14:27:26 -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
51ec7ae2ed Keep UUID of node in send thread 2015-12-16 14:27:26 -08:00
Atlante45
3cd1eea1dc Use weak pointer to the Node instead of strong ownership 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
Atlante45
09701fdcf1 deadlock 101 2015-12-16 14:27:26 -08:00
Atlante45
b65cdd2865 Add logging categories to assignment client. 2015-12-16 14:27:26 -08:00
Atlante45
bd7fa266cf Bit of cleanup 2015-12-16 14:27:26 -08:00
Leonardo Murillo
66770cc907 Finishing touches 2015-12-16 16:11:35 -06:00
Leonardo Murillo
cbed8bf35a NSIS Changes 2015-12-16 15:12:14 -06:00
Leonardo Murillo
5ed422e3a1 Removing unwanted changes 2015-12-16 14:28:49 -06:00
Leonardo Murillo
56ef52022d Removing unwanted changes 2015-12-16 14:28:05 -06:00
Leonardo Murillo
711d02ba2f Consolidating installer checkpoint 2015-12-16 14:26:24 -06:00
Clément Brisset
48429eddc8 Merge pull request #6666 from samcake/hdr
Graphics: Adding a simple manual exposure for configuring the tone mapping
2015-12-16 12:09:52 -08: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
1ff5c1e985 Merge pull request #6669 from samcake/graphicsMaster
Graphics: merge upstream master into upstream graphics
2015-12-16 09:52:30 -08:00
samcake
b4b541178d Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-16 09:42:06 -08:00
Leonardo Murillo
3e6316f089 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-12-16 11:34:58 -06:00
Seth Alves
4429890cd8 Merge pull request #6668 from zzmp/fix/fbx-texture
Load texture by convention with .obj
2015-12-16 06:47:02 -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
Brad Davis
1e5793893b Merge pull request #6665 from ZappoMan/rightClickMenu
fix bug in simulated left click - make qml menus work
2015-12-15 21:40:00 -08:00
Zach Pomerantz
3280894e29 Load texture by convention with .obj 2015-12-15 19:30:15 -08:00
Clément Brisset
7c8f019507 Merge pull request #6663 from birarda/baseball
update link to bat script in createBatButton.js
2015-12-15 19:26:33 -08:00