Brad Hefta-Gaub
651e550063
Merge pull request #3925 from AndrewMeadows/thermonuclear
...
fix for non-animating models
2014-12-08 16:58:16 -08:00
Andrew Meadows
675a2dd989
add DIRTY_UPDATEABLE flag for changes that need it
2014-12-08 16:32:25 -08:00
Andrew Meadows
27bfc9907f
fix bug preventing butterflies from animating
...
(forgot to make base method virtual)
2014-12-08 16:31:36 -08:00
ZappoMan
efbe8ce757
Merge branch 'master' of https://github.com/highfidelity/hifi into entityCollisions
2014-12-08 14:15:20 -08:00
ZappoMan
0592b74a06
make collision callbacks work
2014-12-08 14:15:03 -08:00
Andrew Meadows
9e9929da91
merge upstream/master into andrew/thermonuclear
2014-12-08 11:22:39 -08:00
Andrew Meadows
3ce1d4a38d
set dirty bit when script changes simulation stuff
...
also fixes for linear and angular damping
2014-12-08 11:21:01 -08:00
Andrew Meadows
6fdfde31d9
whoops, forgot to increment the iterator
2014-12-08 11:20:27 -08:00
ZappoMan
27bc394bed
repair collision info mismatch
2014-12-08 10:52:53 -08:00
Philip Rosedale
7de2256744
Merge pull request #3919 from ZappoMan/enforceDimensionsForLightsAndText
...
enforce dimensions for Light and Text entities
2014-12-08 09:19:06 -08:00
Philip Rosedale
732b40f68c
Merge pull request #3918 from ZappoMan/acEntityCrash
...
Ac entity crash
2014-12-08 09:16:40 -08:00
ZappoMan
cf98bff28b
enforce dimensions for Light and Text entities
2014-12-08 07:23:45 -08:00
ZappoMan
497fbade9b
fix crash in entity related AC scripts
2014-12-08 06:48:04 -08:00
ZappoMan
398b5b1f91
Merge branch 'master' of https://github.com/highfidelity/hifi into fixEllipsoidRayPick
...
Conflicts:
libraries/entities/src/SphereEntityItem.cpp
libraries/entities/src/SphereEntityItem.h
2014-12-07 21:03:09 -08:00
ZappoMan
dd4f3a4006
coding standard, added comments
2014-12-07 20:18:30 -08:00
ZappoMan
b9891748e1
remove dead code
2014-12-07 01:32:31 -08:00
ZappoMan
b08d5b87ca
implement proper ray picking against ellipsoids
...
Conflicts:
libraries/entities/src/SphereEntityItem.cpp
2014-12-07 01:31:40 -08:00
ZappoMan
d698594899
use common findRayTriangleIntersection
2014-12-06 19:39:02 -08:00
ZappoMan
91fd574eb5
Merge branch 'master' of https://github.com/highfidelity/hifi into modelRayPick
2014-12-06 15:28:54 -08:00
ZappoMan
7011162c70
removed dead code
2014-12-06 15:07:02 -08:00
ZappoMan
08092e7abe
removed dead code
2014-12-06 15:06:00 -08:00
ZappoMan
3bb16ce831
properly wire up precision picking in JS api
2014-12-06 12:03:46 -08:00
ZappoMan
7ea85073f4
introduce precision picking in API form
2014-12-06 11:45:49 -08:00
ZappoMan
ec907d1d1d
removed debug
2014-12-06 09:44:30 -08:00
ZappoMan
1fec69698e
get the triangle picking for submeshes working, remove some debug
2014-12-05 23:23:21 -08:00
Andrew Meadows
7d96ad5836
cleanup of EntitySimulation API
...
* remove EntityItem::_simulationState (only useful to EntitySimulation)
* move code from SimpleEntitySimuation to EntitySimulation
* EntitySimulation now maintans many QSets of entities
* cleanup and clarify use of EnityTree::updateEntity()
* reduced cost of polling for entity expiries
* changed "UpdateFlags" to "DirtyFlags" and clarified what they're for
2014-12-05 18:08:53 -08:00
ZappoMan
ae647d39d0
fix models with registrations other than 0,0,0
2014-12-05 16:14:18 -08:00
ZappoMan
0ccbb98bde
more work on improved model picking
2014-12-05 15:03:35 -08:00
Sam Gateau
69792178b9
trying to fix the linux compilation
2014-12-05 13:43:04 -08:00
Sam Gateau
c49b753c98
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
2014-12-05 13:38:30 -08:00
ZappoMan
d5fbe5b6b4
Merge branch 'master' of https://github.com/highfidelity/hifi into modelRayPick
2014-12-05 12:48:00 -08:00
Brad Hefta-Gaub
1de7db390e
Merge pull request #3908 from PhilipRosedale/master
...
Orbiting sound example, ability to set injector position, better butterflies
2014-12-05 12:37:42 -08:00
ZappoMan
a6b86da47a
basics of triangle picking working for models
2014-12-05 11:31:27 -08:00
Sam Gateau
0fbdda7582
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
2014-12-05 10:13:38 -08:00
Philip Rosedale
0ad361fd60
Merge pull request #3902 from samcake/tot
...
Adding detection of a "hifi" global light in a FBX file used to pass information
2014-12-05 10:07:52 -08:00
Philip Rosedale
c5247ca65b
Add ability to set injector properties during playing, and orbitingSound.js
2014-12-05 08:45:00 -08:00
Andrzej Kapolka
dff22b01b6
Allow loading "MDR" files saved by Wilbur, fix for reallocating error.
2014-12-05 01:58:45 -08:00
Sam Gateau
66c10544ae
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
2014-12-04 17:16:39 -08:00
dev
16da10bf19
compiling the gpu library on mac
2014-12-04 17:15:59 -08:00
dev
da1bb83eb0
compiling the gpu library on mac
2014-12-04 17:14:41 -08:00
Andrzej Kapolka
466d99bcbb
Removed unused members.
2014-12-04 17:12:06 -08:00
Andrzej Kapolka
ace415b138
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
...
Conflicts:
interface/src/MetavoxelSystem.cpp
2014-12-04 16:46:32 -08:00
Andrzej Kapolka
9819658e20
Spanner subdivision streaming bits.
2014-12-04 16:41:19 -08:00
Sam Gateau
1102b4d633
Moving GPU into it's own library
2014-12-04 16:40:55 -08:00
Sam Gateau
4168993ebe
Replace c++11 usage of auto by explicit declaration
2014-12-04 14:23:47 -08:00
ZappoMan
842ee714b8
make text entities correctly ray pick
2014-12-04 13:08:16 -08:00
Sam Gateau
3215957398
better interpretation of the hifi light intensity and fixes for compilation on mac
2014-12-04 12:31:40 -08:00
Andrzej Kapolka
a990b4ae1f
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-12-04 12:19:45 -08:00
ZappoMan
11f10f9512
make sphere entities pick off their actual sphere, fix bug in ray picking multiple items with different distances
2014-12-04 10:54:04 -08:00
ZappoMan
958b37dead
Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork
2014-12-04 09:38:38 -08:00
