Sam Gondelman
|
84b7f9b186
|
Merge pull request #8375 from SamGondelman/loadingFade
remove polyvox fade, fix web fade, add light fade
|
2016-08-05 11:53:15 -07:00 |
|
SamGondelman
|
f2ee57f2de
|
light fade
|
2016-08-05 11:17:02 -07:00 |
|
SamGondelman
|
b13edc7b6a
|
fixed web fade fo' real
|
2016-08-05 10:48:09 -07:00 |
|
SamGondelman
|
130e64aaba
|
remove polyvox fade, possibly fix web fade
|
2016-08-05 10:36:48 -07:00 |
|
Brad Hefta-Gaub
|
83280aa3f2
|
implement support for updating the render items of models when they finish their fade
|
2016-08-05 10:11:07 -07:00 |
|
SamGondelman
|
3107d63ad8
|
one more warning
|
2016-08-04 14:31:44 -07:00 |
|
SamGondelman
|
b6e73e06a2
|
merge from master
|
2016-08-04 13:34:38 -07:00 |
|
SamGondelman
|
004b0158a4
|
fix warnings on osx
|
2016-08-04 13:09:09 -07:00 |
|
SamGondelman
|
ac9a80131a
|
refactoring _fadeStartTime and isTransparent, make simple renderables switch to transparent when fade finishes
|
2016-08-04 12:34:46 -07:00 |
|
SamGondelman
|
6604c27f23
|
polyvox fade WIP
|
2016-08-04 10:55:37 -07:00 |
|
SamGondelman
|
d521315475
|
fade polylines (needs testing)
|
2016-08-03 17:03:52 -07:00 |
|
SamGondelman
|
d7052f6250
|
try to make text entities fade
|
2016-08-03 16:27:51 -07:00 |
|
SamGondelman
|
7713c1f4bf
|
try to fade in web entities
|
2016-08-03 15:56:41 -07:00 |
|
SamGondelman
|
27bacc9165
|
try to fade in procedural shapes
|
2016-08-03 14:33:05 -07:00 |
|
SamGondelman
|
2eb0c7735f
|
working on fading shape entities
|
2016-08-03 13:30:05 -07:00 |
|
SamGondelman
|
d63a0ef08f
|
working on making other entities transparent
|
2016-08-02 18:09:42 -07:00 |
|
Stephen Birarda
|
5d3e125a06
|
make failed geomtetry request not hold physics
|
2016-08-02 16:32:41 -07:00 |
|
Anthony Thibault
|
8e3bc97ef9
|
fix for unused variable warnings
|
2016-07-29 08:10:10 -07:00 |
|
Anthony Thibault
|
ea310bcc43
|
Web Entities now render correctly as well
|
2016-07-28 14:11:19 -07:00 |
|
Ryan Downe Karpf
|
91714aaca6
|
Merge pull request #8258 from AlexanderOtavka/edit-model-ui
Edit model dialog improvements
|
2016-07-22 17:11:52 -07:00 |
|
Brad Hefta-Gaub
|
566e0f5dbf
|
Merge pull request #8287 from AndrewMeadows/fix-simple-compound
fix bug breaking simple-compound shape type
|
2016-07-21 18:18:04 -07:00 |
|
Andrew Meadows
|
20eebb90f8
|
fix build -- remove some accidental changes
|
2016-07-20 14:08:25 -07:00 |
|
Andrew Meadows
|
3fdfc0db14
|
fix bug breaking simple-compound shape type
|
2016-07-20 12:55:13 -07:00 |
|
Andrew Meadows
|
2afd65467a
|
fix bug where model is not yet ready for col shape
|
2016-07-19 18:01:22 -07:00 |
|
samcake
|
a44aee84ce
|
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
|
2016-07-18 10:16:55 -07:00 |
|
samcake
|
744474982d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
|
2016-07-17 13:28:03 -07:00 |
|
Brad Davis
|
03cb6175ab
|
Support triangle and hexagon shapes, add shape support to overlays.
|
2016-07-15 22:02:17 -07:00 |
|
Andrew Meadows
|
25fdea6bac
|
fix for change of API after rebase
|
2016-07-13 15:13:35 -07:00 |
|
samcake
|
8acc18ae8b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
|
2016-07-13 11:42:07 -07:00 |
|
Andrew Meadows
|
72175ae09e
|
fix warnings about implicit casts
|
2016-07-09 22:55:55 -07:00 |
|
Andrew Meadows
|
207ddcea38
|
wrap hull about each mesh part
|
2016-07-09 22:25:28 -07:00 |
|
samcake
|
ed67fe4051
|
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
|
2016-07-08 09:04:40 -07:00 |
|
Brad Hefta-Gaub
|
5f71f77445
|
Merge pull request #8192 from AndrewMeadows/simple-hull-shapes
experimental ModelEntityItem collision shape options (no visual debugging)
|
2016-07-08 08:55:11 -07:00 |
|
Andrew Meadows
|
e4828b03b1
|
fix crash when building shape before model loaded
|
2016-07-07 13:32:30 -07:00 |
|
Brad Davis
|
c7382ea886
|
Optimize updateModelBounds
|
2016-07-07 11:11:26 -07:00 |
|
Brad Davis
|
5220b52cd9
|
Don't trigger entity scripts without scripting interface
|
2016-07-06 18:13:15 -07:00 |
|
Andrew Meadows
|
3c4f9f8016
|
refert debug hack
|
2016-07-06 15:51:17 -07:00 |
|
Andrew Meadows
|
15ff7bc731
|
final hack tweak
|
2016-07-06 14:35:57 -07:00 |
|
Andrew Meadows
|
301a9f4434
|
improved hack logging
|
2016-07-06 14:31:43 -07:00 |
|
Andrew Meadows
|
11ef245671
|
temp hack for debugging
|
2016-07-06 14:28:09 -07:00 |
|
Andrew Meadows
|
5659d57ac3
|
fix shape generation for SIMPLE_COMPOUND
|
2016-07-06 13:00:57 -07:00 |
|
Andrew Meadows
|
6cbc566a77
|
remove debug cruft
|
2016-07-06 11:53:26 -07:00 |
|
Andrew Meadows
|
33d732c446
|
construct geometry for new shape types
|
2016-07-06 10:51:15 -07:00 |
|
samcake
|
9281b28d43
|
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
|
2016-07-01 13:39:12 -07:00 |
|
Andrew Meadows
|
74781c0786
|
boxify static meshes with too many vertices
|
2016-06-28 16:36:10 -07:00 |
|
samcake
|
ec68eba3cb
|
Merge branch 'master' of https://github.com/highfidelity/hifi into skin
|
2016-06-24 09:37:52 -07:00 |
|
Andrew Meadows
|
e88b264864
|
revert compound hull shape generation
|
2016-06-22 09:30:44 -07:00 |
|
Andrew Meadows
|
937bd0c1be
|
SHAPE_TYPE_MESH --> SHAPE_TYPE_STATIC_MESH
|
2016-06-21 13:54:21 -07:00 |
|
samcake
|
0c882832bf
|
Bringing the Scattering type to the pixels and having a different shading during the lighting pass (for global right now)
|
2016-06-20 17:58:35 -07:00 |
|
Andrew Meadows
|
f22a5613bd
|
fix static mesh for model with per-mesh transforms
|
2016-06-20 17:29:20 -07:00 |
|