SamGondelman
de10dfb032
don't bind materials during shadow pass
2018-08-07 11:17:18 -07:00
Sam Gateau
00c5b6f5f4
Merge pull request #13743 from SamGondelman/transparent
...
Fix primitives always drawing as transparents
2018-08-06 16:28:30 -07:00
Brad Davis
ae8f841912
Shader refactoring for explicit bindings
2018-08-03 14:58:11 -07:00
Brad Davis
04e84f1d23
Moving to cmake time shader compiling
2018-08-03 14:58:11 -07:00
SamGondelman
2f358f3380
fix shapes always drawing as transparents
2018-08-02 12:16:01 -07:00
John Conklin II
7a635b6a57
Merge pull request #13709 from thoys/fix/require-load-queue
...
MS17041: Fix for require fail when the same script loaded simultaneously from another entity script
2018-08-01 11:15:32 -07:00
Thijs Wenker
003e826d60
move over definition so it could be linked in the assignment-client too
2018-08-01 00:23:34 +02:00
Thijs Wenker
74343c71d8
CR fixes
2018-07-31 22:29:53 +02:00
Seth Alves
4ff9252b47
Merge pull request #13718 from jherico/fix/fb15963
...
Support rendering of 'about' URLs in web entities
2018-07-31 09:44:31 -07:00
Brad Davis
c991053c93
Support rendering of 'about' URLs in web entities
2018-07-30 11:56:31 -07:00
Seth Alves
a6aaa71d02
Revert "Allow empty web entities to be rendered"
2018-07-30 11:54:52 -07:00
Sam Gondelman
8201997a16
Merge pull request #13660 from SamGondelman/parabolic
...
Parabolic Picking + Pointers
2018-07-30 10:49:02 -07:00
Seth Alves
32ec984f82
Merge pull request #13577 from dback2/invisibleWebEntities
...
Allow empty web entities to be rendered
2018-07-30 10:12:32 -07:00
John Conklin II
fc88165e23
Merge pull request #13696 from SamGondelman/particleRot
...
Particles don't spin with head roll, new spin + rotateWithEntity properties
2018-07-27 14:54:48 -07:00
Sam Gateau
a95ddb0492
Merge pull request #13616 from AndrewMeadows/remove-cruft-001
...
remove cruft for rendering collision shapes
2018-07-27 19:19:44 +02:00
SamGondelman
1c1b68ee66
emitterShouldTrail fix, review comments, rotateWithEntity
2018-07-26 11:41:16 -07:00
SamGondelman
4750611af9
particles don't spin with head roll, add particle spin properties, negative emitSpeed
2018-07-24 23:47:58 -07:00
SamGondelman
318ef907b8
parabola/polyvox, fixing some bugs
2018-07-24 10:08:35 -07:00
SamGondelman
956c1511b6
Merge remote-tracking branch 'upstream/master' into parabolic
2018-07-19 15:23:25 -07:00
Andrew Meadows
207aea8712
remove cruft from rendering collision shapes
2018-07-16 10:29:34 -07:00
David Back
c4236d7442
allow rendering empty web entity
2018-07-10 13:53:18 -07:00
SamGondelman
ca5ce888f4
parabola triangle intersection
2018-07-09 18:11:57 -07:00
Dante Ruiz
ae03dcb57a
fix parent grab dropping and cullig flickering
2018-07-06 15:42:21 -07:00
SamGondelman
7130b5aa7f
fixing findRayIntersection bugs
2018-07-05 10:27:12 -07:00
SamGondelman
90091d11e4
parabola picks, started implementing math
2018-07-03 09:47:31 -07:00
John Conklin II
e7d5ea561b
Merge pull request #13469 from hyperlogic/safeLandingFix4
...
Fix for landing on the roof of some domains.
2018-06-27 10:23:35 -07:00
Dante Ruiz
d8834af749
make requested changes
2018-06-26 11:53:45 -07:00
Dante Ruiz
17f4a27ceb
Merge branch 'master' of github.com:highfidelity/hifi into fix-entity-lag-2
2018-06-26 10:55:27 -07:00
Anthony J. Thibault
328a485ad1
Prevent ray-picks against ModelEntity bounding boxes when loading has not yet completed.
2018-06-25 10:38:53 -07:00
Sam Gondelman
850e2d5cf5
Merge branch 'master' into particleFix
2018-06-21 17:32:24 -07:00
Sam Gondelman
afc64a18a1
Merge pull request #13362 from SamGondelman/modelTextures
...
Fix transparent textures rendering wrong sometimes
2018-06-21 14:23:49 -07:00
SamGondelman
8f411ad6c8
CR
2018-06-20 16:13:10 -07:00
Dante Ruiz
f891c37ac8
fix particle entity
2018-06-20 10:59:19 -07:00
Dante Ruiz
3d4f164a9f
fixing web entity and whitespace cleanup
2018-06-19 16:53:36 -07:00
Dante Ruiz
694c272424
fixed text entity
2018-06-19 16:27:10 -07:00
Dante Ruiz
568ba6f777
fixing shape entity
2018-06-19 14:14:16 -07:00
Andrew Meadows
6d422e4678
Merge 'master' into 'workload'
2018-06-18 10:30:13 -07:00
SamGondelman
7771661948
fix particle spread properties
2018-06-15 17:35:49 -07:00
SamGondelman
9ea65950d5
particles: threadsafe, cleanup, rework initialized logic
2018-06-15 15:45:06 -07:00
SamGondelman
0b79e9f6c7
whoops
2018-06-15 15:13:29 -07:00
Sam Gondelman
225a98129a
Merge branch 'master' into modelTextures
2018-06-15 15:09:32 -07:00
John Conklin II
2483c45f40
Merge pull request #13350 from sabrina-shanman/bulletcollisionrenderonly
...
Remove functionality for rendering collision models directly in the Model class
2018-06-15 14:46:40 -07:00
sabrina-shanman
b2ec7f78c1
Remove signaling and render code for collision models in RenderableModelEntityItem and EntityTreeRenderer
2018-06-14 15:49:40 -07:00
SamGondelman
5ac7ced306
cleanup renderable model entity item, fix crash on reload, fix different transparent bug
2018-06-13 17:14:52 -07:00
Ryan Huffman
a558f71fcd
Fix resoruces path URLs not working with Script.resolvePath
...
Depending on the context, "/~/" means different things. The ScriptEngine
resolves this path to `/scripts`, but everywhere else it resolves to
`/resources`. This change forces us to expand those paths instead of
storing the "/~/" path, which will be incorrectly resolved once the
ScriptEnging is using it.
2018-06-12 16:55:31 -07:00
sabrina-shanman
4c39d08358
Remove "Draw Collision Shapes" option from developer physics menu
2018-06-11 11:03:57 -07:00
sabrina-shanman
440c77905a
Remove functionality for rendering collision meshes directly in the Model class
2018-06-11 11:03:57 -07:00
Brad Davis
380137a660
Fix particle entity shader
2018-06-10 12:15:00 -07:00
SamGondelman
c18602d22e
fix models starting as green boxes
2018-06-07 13:03:56 -07:00
Andrew Meadows
4329ea5240
Merge master' into 'workload'
2018-06-04 16:11:25 -07:00
