Ryan Huffman
|
35ea9908cd
|
Add default skybox
|
2016-08-08 16:00:58 -07:00 |
|
Ryan Huffman
|
2a071c4329
|
Fix improperly formatted floats
|
2016-08-08 10:39:06 -07:00 |
|
Ryan Huffman
|
d367583426
|
Clean up priority loading implementation
|
2016-08-08 08:53:06 -07:00 |
|
Ryan Huffman
|
4f9be2ae72
|
Fix camera position not being set for angular loading
|
2016-08-08 08:53:06 -07:00 |
|
Ryan Huffman
|
77e993510e
|
Cleanup implementation of angular loading
|
2016-08-08 08:53:05 -07:00 |
|
Ryan Huffman
|
c594dcdf9f
|
Add priority loading for model entities
|
2016-08-08 08:52:29 -07:00 |
|
Seth Alves
|
ad4fc8c656
|
merge from upstream, don't hold up enabling of physics if a collision hull fails to load
|
2016-08-03 10:42:15 -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 |
|
Andrew Meadows
|
5484b6fbb7
|
more correct extraction from triangle strips
|
2016-06-20 17:29:20 -07:00 |
|
Andrew Meadows
|
c0c77e9027
|
optimize/cleanup compound/mesh shape computation
|
2016-06-20 17:29:20 -07:00 |
|
Andrew Meadows
|
f444b70fdc
|
fix collision shape for scaled models
|
2016-06-20 17:29:20 -07:00 |
|
Andrew Meadows
|
ab3548cac0
|
fix crash
|
2016-06-20 17:29:20 -07:00 |
|
Andrew Meadows
|
d1752211e6
|
make implicit casts explict
|
2016-06-20 17:29:20 -07:00 |
|
Andrew Meadows
|
a519b77ae7
|
add SHAPE_TYPE_MESH and build mesh shapes
|
2016-06-20 17:29:20 -07:00 |
|
Andrew Meadows
|
9fc77ccfa2
|
use reference to avoid big copy
|
2016-06-20 17:29:20 -07:00 |
|
Andrew Meadows
|
d64729372a
|
ShapeInfo name changes
|
2016-06-20 17:29:20 -07:00 |
|
SamGondelman
|
8a682450a9
|
still trying to fix cmake errors
|
2016-06-10 17:01:22 -07:00 |
|