David Rowe
110e7a773b
Implement crash option that deletes Interface.ini
2015-08-24 13:36:03 -07:00
David Rowe
f6cf77ae68
Add Developer > Display Crash Options menu item
...
Is enabled by default. Disabling it stops the display of the crash
handling options dialog at start-up.
2015-08-24 13:24:31 -07:00
Seiji Emery
bd18951be8
fixed AUTOSCRIBE_SHADER_LIB to work for targets outside of libraries/
2015-08-24 13:13:24 -07:00
David Rowe
9c782f6a6d
Display dialog of crash handling options at startup if Interface crashed
...
Default option and Esc continue without taking any action.
2015-08-24 12:45:35 -07:00
ericrius1
13892db866
removed logging
2015-08-24 11:41:03 -07:00
Howard Stearns
57e4ff182d
Merge branch 'master' of https://github.com/highfidelity/hifi into eye-correction-application
2015-08-24 11:27:52 -07:00
Seiji Emery
691cb48a08
Fixed to use standard shaders from render-utils
2015-08-24 11:26:56 -07:00
Anthony J. Thibault
47b8ab373c
Fix for RenderableParticleEffectEntity crash.
...
The render item payload now keeps a shared_ptr to the entity.
2015-08-24 11:15:30 -07:00
Howard Stearns
484db87abc
Set head pitch before making downstream eye corrections.
2015-08-24 11:10:29 -07:00
David Rowe
63ad972576
Write and delete "application is running" marker file
2015-08-24 11:09:41 -07:00
ericrius1
5fa27a7cf1
added back computeAndUpdate mmethod for particles, and now handling parsing old streams
2015-08-24 10:59:38 -07:00
David Rowe
07c9a0e2bb
Add Developer > Crash Interface menu item
2015-08-24 10:48:58 -07:00
Brad Hefta-Gaub
275cdf9d8f
Merge pull request #5581 from larsnaesbye/master
...
Preliminary da_DK translation of Interface
2015-08-24 10:36:30 -07:00
Brad Davis
78a08ed7c7
Merge pull request #5641 from thoys/20660
...
CR for Job #20660 - Render the world Axis markers into negative space, add view option
2015-08-24 10:16:56 -07:00
Howard Stearns
a8bbd8d43f
Merge branch 'master' of https://github.com/highfidelity/hifi into howard-stearns-restore-body-indicators
2015-08-24 09:40:52 -07:00
Howard Stearns
bb91b17314
Merge pull request #5634 from hyperlogic/tony/animation-resource-fix
...
Fix for animation resources
2015-08-24 08:13:33 -07:00
Nex Pro
8d8a9535a0
Merge branch '20660' of github.com:thoys/hifi into 20660
2015-08-24 16:07:38 +01:00
Nex Pro
3f4323e084
Added overload for renderDashedLine
2015-08-24 16:07:07 +01:00
Andrew Meadows
1d7d5071ae
Merge pull request #5633 from howard-stearns/restore-body-indicators
...
Restore body indicators (e.g., lookAt vectors).
2015-08-23 15:46:57 -07:00
Brad Hefta-Gaub
0eaeb99064
Merge pull request #5640 from jherico/maggie
...
Fixing build problem with 3d connexion
2015-08-23 13:46:49 -07:00
Thijs Wenker
bbd6f25ff7
style fixes
2015-08-23 20:01:58 +02:00
Thijs Wenker
0f8cf80d45
Merge branch 'master' of https://github.com/worklist/hifi into 20660
2015-08-23 19:53:50 +02:00
Thijs Wenker
63f0173665
extend world boundaries
2015-08-23 19:52:29 +02:00
Brad Davis
b7237fb5ca
Fixing build problem with 3d connexion
2015-08-23 09:32:58 -07:00
Howard Stearns
a1be458721
Merge branch 'master' of https://github.com/highfidelity/hifi into howard-stearns-restore-body-indicators
2015-08-23 09:30:16 -07:00
Nex Pro
53a63fed79
Changed constants red, green, blue and grey to uppercase as per style guide.
2015-08-23 17:16:23 +01:00
Thijs Wenker
748625399e
"View -> World Axes" menu option
2015-08-23 17:59:58 +02:00
Thijs Wenker
b7f9bc13da
Merge branch '20660' of github.com:thoys/hifi into 20660
2015-08-23 17:52:51 +02:00
Nex Pro
0ef2def56e
changed default DASH_LENGTH and GAP_LENGTH to 1.0f
2015-08-23 16:52:12 +01:00
Thijs Wenker
9de35511fc
Merge branch '20660' of github.com:thoys/hifi into 20660
2015-08-23 17:50:28 +02:00
Nex Pro
3e8970cc1e
corrected declaration of float constants DASH_LENGTH and GAP_LENGTH as per style guide.
2015-08-23 16:49:39 +01:00
Thijs Wenker
90c8200d66
Merge branch '20660' of github.com:thoys/hifi into 20660
2015-08-23 17:44:43 +02:00
Nex Pro
ad315cf68a
Merge branch '20660' of github.com:thoys/hifi into 20660
...
Conflicts:
interface/src/Util.cpp
2015-08-23 16:30:46 +01:00
Nex Pro
1f08444369
Modified the world box to render axes in negative space
...
Also Modified renderDashedLine to accept params for dash len and gap len so we can display negative axes as dashed lines with 500mm dashes and gaps.
2015-08-23 16:21:20 +01:00
Seth Alves
dc31c7e233
back out previous attempt at theading polyvox code. lay groundwork for threading that can be reasoned about
2015-08-23 08:14:05 -07:00
Brad Hefta-Gaub
53f9815f69
Merge pull request #5639 from jherico/maggie
...
Stereo rendering work
2015-08-22 20:48:54 -07:00
Brad Davis
d3135dcfa6
Stereo rendering work
2015-08-22 16:15:10 -07:00
Brad Hefta-Gaub
62d8b14b8b
Merge pull request #5635 from samcake/punk
...
Improve the light attenuation formulae
2015-08-22 15:49:59 -07:00
Brad Hefta-Gaub
2bca05fb2e
Merge pull request #5629 from ctrlaltdavid/displayname-assert
...
More temporary logging to track down cause of assert
2015-08-22 15:48:58 -07:00
Brad Hefta-Gaub
fe44442ffe
Merge pull request #5577 from vastcharade/horizAmbOcclPerf
...
Horiz amb occl performance updates
2015-08-22 12:39:51 -07:00
Howard Stearns
17800d04be
Merge branch 'restore-body-indicators' of https://github.com/howard-stearns/hifi into howard-stearns-restore-body-indicators
2015-08-22 10:05:15 -07:00
Philip Rosedale
2bfa121925
Merge pull request #5637 from hyperlogic/tony/fbx-texture-fix
...
Resource fix for textures in FBX files.
2015-08-21 22:20:18 -07:00
Anthony J. Thibault
80d3ae68c2
Removed redundant ends with ‘fbx’ check.
2015-08-21 22:11:53 -07:00
Anthony J. Thibault
04e7084743
Resource fix for textures in FBX files.
...
The baseTexturePath url for textures in FBXGeometry
should default to the same base url as the fbx file itself.
This error was introduced in my recent refactoring.
Textures embedded in FBXGeometries should be un-affected
by this change.
2015-08-21 21:44:15 -07:00
Ryan Huffman
e9517ef929
Merge pull request #5594 from thoys/20638
...
CR for Job #20638 - Scripting: WebSocket Implementation
2015-08-21 19:13:43 -07:00
Thijs Wenker
67e945b884
fix unit test
2015-08-22 03:32:53 +02:00
Seiji Emery
e601484b17
...
2015-08-21 17:24:34 -07:00
Thijs Wenker
d84cf1859c
hook up the WebSocket error event directly
2015-08-22 02:18:21 +02:00
Thijs Wenker
0e255f4f3e
properly exposed WebSocketClass::ReadyState to the ScriptEngine
2015-08-22 01:59:44 +02:00
Seth Alves
90483e7c97
Merge pull request #5632 from birarda/master
...
force the HTTPManager to listen on IPv4
2015-08-21 16:56:55 -07:00
