Daniela
1d6985a9eb
Fix Animation hue bug.
2017-10-03 15:25:54 +01:00
Nissim Hadar
93a2776cb5
Changes for debug
2017-10-02 18:13:23 -07:00
Nissim Hadar
cdbf067a24
Rename (haze)getParametersBuffer to getHazeParametersBuffer.
...
Add corrections from Sam
2017-10-02 16:54:02 -07:00
Nissim Hadar
29d5e772d4
Removed "..Is.." from various methods.
2017-10-02 12:42:46 -07:00
Nissim Hadar
f26345a3f0
Working on adding zone to haze.
2017-09-29 15:15:49 -07:00
Nissim Hadar
0acf4b9de9
Working on adding zone to haze.
2017-09-28 23:53:53 -07:00
Nissim Hadar
9d0cf16c20
Fixed Ubuntu warnings.
2017-09-27 19:33:04 -07:00
Nissim Hadar
784f928433
After merge.
2017-09-27 18:46:55 -07:00
Nissim Hadar
4d8a1db895
Merge branch 'master' into hazeZone
...
# Conflicts:
# libraries/entities-renderer/src/RenderableModelEntityItem.cpp
2017-09-27 17:50:51 -07:00
Nissim Hadar
55fafeacb1
Implemented HazePropertyGroup and added the haze shader. Shader does not work yet!
2017-09-27 17:43:09 -07:00
Daniela
c22d2add17
Resolve conflict with hifi/master.
2017-09-27 17:06:12 +01:00
Nissim Hadar
4d501d6510
Adding HazeStage
2017-09-27 08:01:19 -07:00
Nissim Hadar
2394d0931c
Adding HazeStage
2017-09-26 19:05:11 -07:00
Nissim Hadar
f92707a00c
WIP
2017-09-26 18:08:41 -07:00
Sam Gateau
9317ad38aa
Merge pull request #11462 from highfidelity/game-render-interface
...
Moving transform evaluation out from render loop to gameplay loop / fixing tablet tearing
2017-09-26 17:40:23 -07:00
Bradley Austin Davis
e42068f681
Merge branch 'master' into android_new
2017-09-26 14:31:29 -07:00
samcake
510b446409
mergine with master, resolving conflict
2017-09-26 13:13:46 -07:00
Seth Alves
7397a123c5
Merge pull request #11345 from SamGondelman/textAA
...
Text3D Overlays and Entities fixes and no-AA
2017-09-26 12:26:08 -07:00
samcake
b5c942f7f6
Merge branch 'master' of https://github.com/highfidelity/hifi into game-render-interface
2017-09-26 10:47:59 -07:00
Daniela
e264503b9f
Merge remote-tracking branch 'upstream/master'
2017-09-26 17:49:15 +01:00
Daniela
179a426389
Address QA comments.
2017-09-26 17:44:46 +01:00
Andrew Meadows
67481287ff
comment out asserts that fail to compile in Debug
2017-09-26 09:29:43 -07:00
Nissim Hadar
1a9625d272
Merge branch 'master' into hazeZone
2017-09-24 18:27:36 -07:00
Nissim Hadar
543bc5a71b
HazeMode calls Haze::setIsHazeActive.
2017-09-24 18:25:20 -07:00
Nissim Hadar
6cbf087708
First version with combo for Haze Mode.
2017-09-24 15:08:22 -07:00
Nissim Hadar
678b4e35b1
Before replacing "Haze Active" checkbox with "Haze Mode" combo.
2017-09-24 14:06:00 -07:00
Brad Hefta-Gaub
bafb59e691
Merge pull request #11436 from SamGondelman/missingModels
...
Fix missing models
2017-09-23 13:56:50 -07:00
Nissim Hadar
c2eea7d40b
Minor cleanup.
2017-09-22 18:37:21 -07:00
Nissim Hadar
736a6aa311
Haze checkbox in UI doesn't disable the UI.
2017-09-22 18:20:35 -07:00
SamGondelman
86198606e0
add _modelJustLoaded and updateTransforForSkinnedMesh on creation
2017-09-22 17:12:44 -07:00
Anthony Thibault
20cb02dabb
Merge pull request #11440 from hyperlogic/bug-fix/text-entity-rendering
...
Fix for TextEntity rendering, the translation was incorrect
2017-09-22 11:19:24 -07:00
SamGondelman
be27376c52
add comment about bottleneck
2017-09-22 10:21:32 -07:00
Anthony J. Thibault
d3c60f3057
Fix for TextEntity rendering, the translation was incorrect
...
This was caused by the removal of _dimensions from the SpatiallyNestable scale component.
2017-09-22 09:44:51 -07:00
Brad Davis
549cb77902
Fix dimensions of rendered web entities
2017-09-21 20:59:01 -07:00
SamGondelman
9f12d3a365
fix missing models
2017-09-21 17:57:25 -07:00
Nissim Hadar
953ddfdcd3
First version of adding haze to the zone.
2017-09-21 14:54:16 -07:00
Daniela
d054c6dc36
Merge branch 'master' of https://github.com/highfidelity/hifi
2017-09-21 18:29:45 +01:00
samcake
9a9d13e519
Merge branch 'master' of https://github.com/highfidelity/hifi into game-render-interface
2017-09-21 09:05:46 -07:00
Brad Davis
27350bd7de
Don't add items to the scene graph until they have a valid parent chain
2017-09-20 16:52:23 -07:00
samcake
fd8868f609
Moving the render transform evaualtion in game loop for Models
2017-09-19 17:30:20 -07:00
Bradley Austin Davis
bc4193f276
Merge branch 'master' into android_new
2017-09-19 14:27:31 -07:00
Bradley Austin Davis
b93e91b9f3
New android toolchain
2017-09-19 13:45:12 -07:00
Daniela
1426e10024
Fix texture loading issue with upstream master. Tune amount of points.
2017-09-19 17:47:00 +01:00
Anthony J. Thibault
73ad9051a4
Shapes now render at the correct size.
2017-09-18 15:27:58 -07:00
Sam Gateau
84dfe53fee
Merge pull request #11362 from jherico/crash/model-race
...
Ensure thread-safety for model pointer access
2017-09-16 10:45:09 -07:00
Seth Alves
d968bbad6c
Merge pull request #11364 from sethalves/rework-scriptengine-lifetime
...
Rework scriptengine lifetime
2017-09-15 12:17:51 -07:00
Seth Alves
8a49edbecb
code review
2017-09-15 10:08:35 -07:00
Brad Davis
688ee68cf9
Ensure thread-safety for model pointer access
2017-09-14 12:29:23 -07:00
Brad Davis
aef85eb69d
Fix polyline rendering using default texture
2017-09-14 10:48:14 -07:00
Seth Alves
cf2979dc78
Merge branch 'master' of github.com:highfidelity/hifi into rework-scriptengine-lifetime
2017-09-14 10:42:26 -07:00
Seth Alves
d89f2b77da
rework ScriptEngine lifetimes using 'smart' pointers
2017-09-14 10:42:21 -07:00
Brad Davis
501eee8b10
Fix transform of polylines with high update rates
2017-09-14 08:45:37 -07:00
Brad Davis
75e7146c5b
Fix polyline crash and flicker
2017-09-14 08:45:36 -07:00
Brad Davis
f4d8216501
Fix race condition accessing QString sub-properties in zones
2017-09-13 18:06:21 -07:00
Andrew Meadows
5741699bab
Merge pull request #11301 from Menithal/21484-Fix
...
WL21484 _- Hotfix - Solve Joint array issues with Similar, but not same Skeletons
2017-09-13 08:05:53 -07:00
Artur Gomes
b65520e788
Merge remote-tracking branch 'upstream/master'
2017-09-13 12:32:17 +01:00
SamGondelman
a955381726
Merge remote-tracking branch 'upstream/master' into textAA
2017-09-12 16:50:16 -07:00
SamGondelman
1b85a453ab
working on text3d overlays and entities
2017-09-12 16:49:51 -07:00
Menithal
40d339a831
21484: Updated code to go with PR feedback
2017-09-11 20:36:29 +03:00
Bradley Austin Davis
eb8b892571
Various Mac fixes
2017-09-07 14:45:35 -07:00
Bradley Austin Davis
37b184d982
Fix crashes in entity rendering on OSX
2017-09-07 14:32:50 -07:00
Daniela
608e4858fc
Add Fix polyline crash and flicker
2017-09-06 19:06:05 +01:00
Menithal
856452405e
Made Code abit more concise for better compilation
2017-09-05 08:46:37 +03:00
Menithal
119a2703f7
Removed Debug Joints that wasnt used anylonger
2017-09-04 22:20:00 +03:00
Menithal
03e076046b
Added Joint Name check for translations
...
This way if there is a mismatch in the skeleton, the translations are
applied to the models correctly
2017-09-04 22:16:02 +03:00
Menithal
5506520226
Fixed missing semi colon
2017-09-01 08:20:54 +03:00
Brad Davis
65b49a958f
Merge branch 'master' into 21484
2017-08-31 14:59:30 -07:00
Menithal
0e3fc64f63
Fixed Inverse logic and Cleanup
2017-09-01 00:35:56 +03:00
Daniela
42be6434af
Merge branch 'master' of https://github.com/highfidelity/hifi
2017-08-31 18:03:39 +01:00
Zach Fox
fdcc149c34
Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface
2017-08-30 13:27:18 -07:00
Menithal
ea79748ed3
Some adjustments
2017-08-29 23:59:36 +03:00
Seth Alves
7220a6998a
remove unneeded bind-by-ref thing from lambdas
2017-08-28 17:08:59 -07:00
Seth Alves
b9c68f9156
give MouseRayPickResultOperator and SetPrecisionPickingOperator default values to avoid crash on startup
2017-08-28 17:01:01 -07:00
Zach Fox
0cdef28cfd
Fixup after Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface
2017-08-28 14:55:18 -07:00
Sam Gondelman
4e7818180b
Merge branch 'master' into tabletLayer2
2017-08-24 17:56:44 -07:00
SamGondelman
4a49801217
web overlays and entities are always nonAA
2017-08-24 14:23:21 -07:00
Brad Davis
e817d3ced4
Threaded rendering & entity rendering refactor
2017-08-24 13:34:34 -07:00
Zach Fox
69364f2ecd
Initial progress
2017-08-22 17:10:57 -07:00
Zach Fox
edb64b047f
It compiles!
2017-08-22 16:00:44 -07:00
Zach Fox
2a75d97006
First steps
2017-08-22 12:56:16 -07:00
SamGondelman
a904ae1a8a
can set precision picking on lasers/raypicks, EntityTreeRender uses ray pick API
2017-08-22 11:41:20 -07:00
Menithal
dc5e374485
Merge remote-tracking branch 'upstream/master' into 21484
2017-08-17 22:28:43 +03:00
Artur Gomes
482924266c
Fix brush texture stretching at start.
...
Add some code refactoring.
2017-08-16 18:35:21 +01:00
Artur Gomes
83cdd1739d
Add hue, saturation and brightness dynamic brushes.
...
Add continuous drawing mode.
Add new brushes.
Remove some brushes.
Fix animation play distance for when painting in Desktop mode.
Fix Hue animation not starting from the chosen color (would always start
from red).
Fix multiple color polyline.
2017-08-16 18:35:15 +01:00
Artur Gomes
03b70ed492
Do not test!
...
Add color qvector to polyline entity to allow for multiple colors
through the line.
Add some new icons to the tabs of the app.
2017-08-16 18:32:17 +01:00
Artur Gomes
5c40a6810e
Add drawing in Desktop mode.
...
Remove dynamic rotation and translation brushes since the movement would
be unsynced after a while, resulting in a poor user experience.
Fix restoring last used settings taking to long, which caused the user
to see the values to change after the tablet application was open.
Fix using a different brush after restarting the app, if drawing before
the brush was reset.
2017-08-16 18:28:55 +01:00
Artur Gomes
dffbc442be
Add new Interface (more similar to the ui used on other apps)
...
Fix brush on repeat mode (keeps the the aspect ratio of the texture)
2017-08-16 18:28:55 +01:00
Delanir
0a97cfd736
Change UVMode updateGeometry Function
2017-08-16 18:25:01 +01:00
Delanir
ed5515a2d4
Add new Property to polyline to enable different uv modes. 2
2017-08-16 18:25:00 +01:00
Sam Gateau
79f3be1efe
Merge pull request #11021 from Zvork/fade2
...
Fade dissolve effect JUST AVATARS
2017-08-10 13:48:30 -07:00
Zach Fox
b8c45b0c30
Don't always do precision picking inside mouseMoveEvent
2017-08-09 14:23:43 -07:00
Menithal
982d4a451f
Updated Protocol to add allowTranslation
...
There still is a bug for the value no actually updating
2017-08-08 23:47:37 +03:00
Menithal
34d9e9b371
Preliminary Research Complete
...
Found the part that needs updating with the AnimationProperty
2017-08-08 00:03:24 +03:00
Brad Davis
86e3489167
Updates from Threaded Rendering project
2017-08-04 15:22:14 -07:00
Howard Stearns
71ce5a6494
Merge pull request #11016 from highfidelity/context-overlays
...
Context Overlays
2017-08-03 16:28:14 -07:00
Andrew Meadows
e465186511
Merge pull request #11048 from 1P-Cusack/21389
...
WL21389 PR1: Representation of collision shapes need updating (details below).
2017-08-03 09:04:31 -07:00
David Kelly
4b7779f0f5
add flag to outline render flags, fix pal.js/edit.js interaction
2017-08-03 07:57:21 -07:00
LaShonda Hopper
0b79809f54
[WL21389] PR1 Feedback: Small change missed last commit (details below).
...
Until they're properly implemented, default the hedrons and polygons to
SHAPE_TYPE_ELLIPSOID within RenderableShapeEntity::computeShapeInfo.
Changes committed:
modified: libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
2017-07-31 17:08:30 -04:00
Olivier Prat
e85bb6fd08
Fixed compilation warnings on Mac
2017-07-31 19:19:00 +02:00
Olivier Prat
5f1d45d4de
Revert "Added check on EntityItem::getEntitiesShouldFadeFunction and reactivated fade on model, voxels and polylines"
...
This reverts commit 8a2fd01e81
2017-07-31 18:06:51 +02:00
