ericrius1
|
2663e5a876
|
correct particle count for systems without textures
|
2015-06-15 14:43:13 -07:00 |
|
eric levin
|
27c6190665
|
fixed particles not showing up by fixing billboarding code to account for new winding order
|
2015-06-15 14:24:18 -07:00 |
|
Brad Hefta-Gaub
|
a5b28660ad
|
Merge pull request #5113 from Atlante45/debug
Fix text entities wrapping
|
2015-06-12 11:23:31 -07:00 |
|
Atlante45
|
30ae78e3b6
|
Rename getRowHeight
|
2015-06-12 19:50:32 +02:00 |
|
Atlante45
|
228f8c2e61
|
Fix a few items rendering without pipeline
|
2015-06-12 17:34:16 +02:00 |
|
Atlante45
|
565bf8bcb2
|
Fix text entities wrapping
|
2015-06-12 15:41:37 +02:00 |
|
Andrew Meadows
|
a3c5ea1b58
|
Merge pull request #5088 from sethalves/actions
spring action with rotation and position target, rework grab script to use it
|
2015-06-11 13:23:57 -07:00 |
|
Brad Hefta-Gaub
|
684e93cf42
|
Merge pull request #5105 from Atlante45/debug
Fix zones wireframe rendering
|
2015-06-11 10:17:28 -07:00 |
|
ZappoMan
|
a878559e0c
|
fix transforms for items with non-default registration point
|
2015-06-11 09:38:45 -07:00 |
|
ZappoMan
|
47888b4671
|
fix transforms for items with non-default registration point
|
2015-06-11 09:34:56 -07:00 |
|
Atlante45
|
f4f5f16758
|
Fix zones wireframe rendering
|
2015-06-11 18:34:39 +02:00 |
|
Seth Alves
|
4216308b9b
|
Merge branch 'master' of github.com:highfidelity/hifi into actions
|
2015-06-10 19:05:25 -07:00 |
|
ZappoMan
|
93c0bd63e9
|
fix debug rendering transforms
|
2015-06-10 18:54:07 -07:00 |
|
Andrew Meadows
|
6497ac6c82
|
renderBoundingBox() for sim-ownership debug
|
2015-06-10 14:24:00 -07:00 |
|
Andrew Meadows
|
4df87ec4e8
|
fix rendering of simulation ownership debug info
|
2015-06-09 17:23:37 -07:00 |
|
Seth Alves
|
b1a209b9db
|
pull some common code out of subclasses and into ObjectAction
|
2015-06-09 16:17:48 -07:00 |
|
Brad Hefta-Gaub
|
759a4a323b
|
Merge pull request #5087 from Atlante45/debug
Reduce debug on domain connection
|
2015-06-09 07:54:21 -07:00 |
|
Atlante45
|
bf56ee49a6
|
Print new URL only when it actually changes
|
2015-06-09 16:37:48 +02:00 |
|
Seth Alves
|
983ae5b2f0
|
quiet compiler, fix some whitespace
|
2015-06-08 21:19:37 -07:00 |
|
Brad Hefta-Gaub
|
202e39799a
|
Merge pull request #5062 from ZappoMan/team-teaching
Team teaching - merge from master
|
2015-06-05 12:21:10 -07:00 |
|
ZappoMan
|
35f40df6e2
|
fix build buster
|
2015-06-05 12:06:13 -07:00 |
|
ZappoMan
|
f8a2fff5a7
|
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
|
2015-06-05 11:06:10 -07:00 |
|
Brad Hefta-Gaub
|
4c52076e13
|
Merge pull request #5063 from huffman/fix-entity-delete-payload
Team Teaching - Fix entity payloads not being removed on delete
|
2015-06-05 11:03:46 -07:00 |
|
Andrew Meadows
|
53fa6cf0b2
|
Merge pull request #5040 from jherico/web-entities-fix
Fixing web entity glow and 'back' behavior
|
2015-06-05 10:46:58 -07:00 |
|
Seth Alves
|
edb3622c85
|
Merge pull request #5037 from AndrewMeadows/inertia
collision groups for physical objects
|
2015-06-05 10:26:28 -07:00 |
|
Ryan Huffman
|
37d9394140
|
Fix entity payloads not being removed on delete
|
2015-06-05 10:26:09 -07:00 |
|
ZappoMan
|
807cc3db24
|
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
|
2015-06-05 09:37:39 -07:00 |
|
Brad Hefta-Gaub
|
4bbde3d724
|
Merge pull request #5058 from huffman/entity-update-url
TEAM TEACHING - Fix model entities correctly updating payloads when url changes
|
2015-06-05 09:27:36 -07:00 |
|
Ryan Huffman
|
9814d11bea
|
Fix model entities correctly updating payloads when url changes
|
2015-06-05 08:45:31 -07:00 |
|
Andrew Meadows
|
08b64666fe
|
Merge pull request #5033 from howard-stearns/smooth-initial-crash-volume
Smooth initial crash volume
|
2015-06-05 08:40:09 -07:00 |
|
Brad Hefta-Gaub
|
ba5eab7460
|
Merge pull request #5057 from Atlante45/team-teaching
Team Teaching - Transform to polyvox corner for render
|
2015-06-05 07:48:28 -07:00 |
|
Atlante45
|
260272d288
|
Transform to polyvox corner for render
|
2015-06-05 14:32:47 +02:00 |
|
Clément Brisset
|
5f16b8752b
|
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod
Conflicts:
libraries/entities-renderer/src/RenderableEntityItem.cpp
libraries/render-utils/src/Model.cpp
|
2015-06-05 13:28:42 +01:00 |
|
Eric Levin
|
5e15c14539
|
added sanitization for invalid line points data. Fixed bug where occasionally wrong view frustum would be sent to script"
|
2015-06-04 16:45:32 -07:00 |
|
Howard Stearns
|
407d3b6a6e
|
Pitch is dependent on (largest dimension of) minimum bounding, not max.
Adjust sound range of full volume.
|
2015-06-04 14:23:51 -07:00 |
|
Ryan Huffman
|
a62b55fcb2
|
Update entity payload items to correctly hide when not visible
|
2015-06-04 13:25:40 -07:00 |
|
Atlante45
|
8e21d9c14b
|
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod
|
2015-06-04 18:11:17 +02:00 |
|
Clément Brisset
|
7ffe7b31a6
|
Merge pull request #5041 from ZappoMan/team-teaching-all-entities
TEAM TEACHING - overlays and entities, fix to shrunken avatars
|
2015-06-04 18:00:44 +02:00 |
|
ZappoMan
|
c4756f4816
|
remove dead code
|
2015-06-04 08:49:26 -07:00 |
|
ZappoMan
|
4b389793ad
|
CR feedback
|
2015-06-04 08:42:10 -07:00 |
|
Atlante45
|
a4340b17e9
|
Remove deprecated render stats
|
2015-06-04 14:47:04 +02:00 |
|
Atlante45
|
ab9cfac672
|
Restore line width
|
2015-06-04 11:35:41 +02:00 |
|
Atlante45
|
78e9c5870b
|
Line updateGeometry in render
|
2015-06-04 10:56:48 +02:00 |
|
Atlante45
|
504be28143
|
Remove unused variables
|
2015-06-04 10:55:51 +02:00 |
|
Atlante45
|
166eff7df1
|
Fix line entity rendering
|
2015-06-04 10:54:57 +02:00 |
|
ZappoMan
|
042384c5e2
|
light rendering as payload
|
2015-06-03 20:46:47 -07:00 |
|
ZappoMan
|
c6fb22b915
|
make sure all entities are rendering in pipeline part 1
|
2015-06-03 17:16:45 -07:00 |
|
Brad Davis
|
7f0a7b4f7e
|
Fixing web entity glow and 'back' behavior
|
2015-06-03 17:15:50 -07:00 |
|
Andrew Meadows
|
b0ca2df3aa
|
move API from PhysicsEngine to ObjectMotionState
|
2015-06-03 14:56:04 -07:00 |
|
Atlante45
|
7654533888
|
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod
|
2015-06-03 19:47:51 +02:00 |
|