samcake
b5c942f7f6
Merge branch 'master' of https://github.com/highfidelity/hifi into game-render-interface
2017-09-26 10:47:59 -07:00
Andrew Meadows
ec80846281
Merge pull request #11443 from SamGondelman/sharks
...
Laser Pointer fixes and updates
2017-09-26 10:22:55 -07:00
Sam Gateau
ff1101cc69
Merge pull request #11453 from Menithal/entity-custom-shader-emit-fix
...
Experimental Fix: Entity Shader Lightmap use / emissive
2017-09-26 09:39:33 -07:00
Menithal
19a290be70
Fixed Entity Shader emmissive
...
Makes sure that the emissiveAmount information is used correctly for a custom
shader, instead of using specular rgb information to generate the
emissiveness, which was incorrect
2017-09-26 00:12:45 +03:00
SamGondelman
a73fdf4397
fix pointer event properties
2017-09-25 10:19:42 -07:00
Andrew Meadows
cf0dd6f8c3
Merge pull request #11371 from cain-kilgore/21542
...
WL 21542 - Allow Scripts to change Avatar Gravity [Experimental]
2017-09-23 22:20:52 -07:00
Brad Hefta-Gaub
bafb59e691
Merge pull request #11436 from SamGondelman/missingModels
...
Fix missing models
2017-09-23 13:56:50 -07:00
Zach Fox
921ebc221e
Merge pull request #11431 from zfox23/contextOverlayInterface_fixEnabled
...
Enable Inspection Mode for all; change Commerce setting name
2017-09-22 17:52:27 -07:00
SamGondelman
86198606e0
add _modelJustLoaded and updateTransforForSkinnedMesh on creation
2017-09-22 17:12:44 -07:00
SamGondelman
cbe621f2b7
add searchRay to RayPickResult, fix precision picking caching with multiple lasers, make laser addition/removal immediate
2017-09-22 15:15:15 -07:00
SamGondelman
bc477608ee
fix alpha on glowLines
2017-09-22 13:22:08 -07:00
Zach Fox
430d1b22bb
Update angular size and i behavior
2017-09-22 11:41:28 -07:00
Zach Fox
bb9db3ef6d
Updates to behavior and shader appearance
2017-09-22 11:24:30 -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
samcake
061ec69b09
Merge branch 'master' of https://github.com/highfidelity/hifi into game-render-interface
2017-09-22 10:52:30 -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
Cain Kilgore
0d33976035
Real time changes
2017-09-22 00:38:30 +01:00
Ryan Huffman
abbe263142
Fix FBXBaker not properly handling textures with the same name
2017-09-21 13:40:39 -07:00
Ken Cooke
84786ac8e3
Merge pull request #11424 from ctrlaltdavid/21548
...
Fix recording just made not playing back if reload it
2017-09-21 12:19:23 -07:00
David Rowe
a2d8152a3a
Coding standard
2017-09-22 07:13:32 +12:00
Zach Fox
57b5a23373
Enable Inspection Mode for all; change Commerce setting name
2017-09-21 11:18:21 -07:00
samcake
9a9d13e519
Merge branch 'master' of https://github.com/highfidelity/hifi into game-render-interface
2017-09-21 09:05:46 -07:00
Andrew Meadows
6b3b3a7448
Merge pull request #11382 from ElderOrb/case6618
...
6618 [Worklist] Add Input Field On Top of Keyboard
2017-09-21 08:54:11 -07:00
Andrew Meadows
b803344f0c
Merge pull request #11421 from jherico/fix/transform_log_spam
...
Don't add items to the scene graph until they have a valid parent chain
2017-09-21 08:42:56 -07:00
Ryan Huffman
a56303a3fe
Merge pull request #11379 from highfidelity/feat/auto-bake
...
Add auto baking to Asset Server and mesh compression for FBXs
2017-09-21 08:33:51 -07:00
samcake
ad1cab71f3
Merge branch 'master' of https://github.com/highfidelity/hifi into game_render_interface
2017-09-20 18:10:37 -07:00
David Rowe
4ce5e4ac46
Fix recording just made not playing back if reload it
2017-09-21 12:19:32 +12: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
Cain Kilgore
45f79b4341
Small fix
2017-09-21 00:00:24 +01:00
Cain Kilgore
322b7fc060
Cleanup from Merge
2017-09-20 23:37:33 +01:00
Cain Kilgore
f06c04e1b0
Fixed things
2017-09-20 23:24:56 +01:00
Cain Kilgore
796e9e7ab3
Fixed things
2017-09-20 23:23:30 +01:00
Cain Kilgore
4d904bd5ce
Changed naming of avatarGrav
2017-09-20 18:43:16 +01:00
Cain Kilgore
506226ead0
Merge branch 'master' into 21542
2017-09-20 18:22:34 +01:00
samcake
fd8868f609
Moving the render transform evaualtion in game loop for Models
2017-09-19 17:30:20 -07:00
Chris Collins
0a213e24c4
Merge pull request #11389 from highfidelity/RC-55
...
Beta Release 55 - Includes up to Developer Release 7127
2017-09-19 14:23:58 -07:00
Ryan Huffman
20759b0c97
Merge pull request #11404 from birarda/feat/auto-bake
...
add abort on shutdown to Baker/FBXBaker/TextureBaker
2017-09-19 14:20:56 -07:00
Stephen Birarda
a8ac015bc4
address code review comments
2017-09-19 13:56:42 -07:00
Clément Brisset
a6376fcc12
Merge pull request #11402 from huffman/fix/remove-fbxcpp
...
Remove FBX.cpp and other cleanup
2017-09-19 13:54:50 -07:00
Stephen Birarda
e1d79ee8f4
add abort to Baker and subclasses
2017-09-19 13:18:23 -07:00
Stephen Birarda
0d166cc250
Merge pull request #11400 from Atlante45/feat/auto-bake
...
Remove unused Algorithms.h
2017-09-19 12:44:15 -07:00
Ryan Huffman
5950006111
Remove extraneous logging
2017-09-19 11:18:25 -07:00
Ryan Huffman
641addf397
Remove FBX.cpp
2017-09-19 11:13:39 -07:00
vladest
6c32783a09
Merge branch 'master' into audio_devices_split
2017-09-19 17:43:03 +02:00
Clément Brisset
108de209bb
Merge pull request #11393 from birarda/feat/auto-bake
...
don't export embedded textures with original, remove triangle warning
2017-09-18 16:21:07 -07:00
Atlante45
b9e5957c9f
Remove unused Algorithms.h
2017-09-18 16:14:06 -07:00
Anthony J. Thibault
73ad9051a4
Shapes now render at the correct size.
2017-09-18 15:27:58 -07:00
