Seth Alves
95cc8672c0
remove unneeded assert
2015-03-31 14:32:43 -07:00
Seth Alves
347ef3c4e1
use scaling from visual model on collision model rather than using the bounds from the collision model
2015-03-31 14:03:37 -07:00
Seth Alves
c8e623ace7
remove some debugging prints, added some comments
2015-03-31 07:18:20 -07:00
Seth Alves
52fc75a114
merge upstream
2015-03-31 07:18:04 -07:00
Philip Rosedale
4961cf37b6
Merge pull request #4540 from ZappoMan/scriptCaching
...
quiet warning flood when scripts are bad
2015-03-30 21:48:13 -07:00
ZappoMan
a88b3c02d2
quiet warning flood when scripts are bad
2015-03-30 18:24:34 -07:00
Philip Rosedale
ce05d3104a
Merge pull request #4535 from ZappoMan/scriptCaching
...
Script caching & Fix to Stack Overflow Crash on Windows with lots of entity scripts
2015-03-30 18:02:52 -07:00
Seth Alves
acf30782b6
include quads in creation of hulls for physics collision. visual model vs collision model debug spew. fix dice script
2015-03-30 17:04:47 -07:00
ZappoMan
31072b2b2e
only start one download per url even if still pending
2015-03-30 16:48:41 -07:00
ZappoMan
e2d8d82096
more script caching cleanup
2015-03-30 16:34:04 -07:00
ZappoMan
74d50a9250
more work on improving script caching
2015-03-30 16:21:47 -07:00
Seth Alves
ee7247a5b4
fix a couple of crashes
2015-03-30 15:56:01 -07:00
ZappoMan
36657c9473
first cut at script caching
2015-03-30 14:36:48 -07:00
Seth Alves
8a5192c1d9
attempt to handle registration point in hull collisions
2015-03-30 11:22:31 -07:00
Seth Alves
16875338bf
Merge branch 'master' of github.com:highfidelity/hifi into multi-hull-collisions
2015-03-26 18:55:43 -07:00
ZappoMan
8e7ead2ead
fix locking issue in enter/leave entity scripts
2015-03-26 16:05:31 -07:00
Seth Alves
dccedeadff
diff minimization
2015-03-24 16:59:12 -07:00
Seth Alves
2f47f7c7ba
diff minimization
2015-03-24 16:51:42 -07:00
Seth Alves
8d2c942509
diff minimization
2015-03-24 16:38:11 -07:00
Seth Alves
1eeb2e89f8
remove some debug spam
2015-03-24 16:23:51 -07:00
Seth Alves
6e3be26013
attempting to figure out why physics motion object doesn't get updated when collision model url changes
2015-03-24 15:28:21 -07:00
Seth Alves
c8ad82917e
clean up some debugging spew. take dimensions into account when scaling points used for collision hull creation
2015-03-23 16:54:36 -07:00
Seth Alves
bfc5cf99d6
more code for compound hull collisions
2015-03-21 16:11:47 -07:00
Seth Alves
86d09a1607
more compound shape stuff
2015-03-21 08:55:49 -07:00
Seth Alves
769194f046
first stab at compound hull collisions
2015-03-20 13:41:14 -07:00
Seth Alves
1db9a9ef46
use .isEmpty on urls rather than convert them to strings and compare to empty string
2015-03-19 15:48:48 -07:00
Seth Alves
8eedab72b3
remove some unneeded asserts
2015-03-19 09:15:57 -07:00
Seth Alves
480eae7317
Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide
2015-03-19 09:14:26 -07:00
Andrew Meadows
c032b29633
proper shape management for ConvexHull shapes
2015-03-18 16:29:57 -07:00
Seth Alves
1cab14064d
remove unneeded code, quiet some debug spew
2015-03-18 13:10:53 -07:00
Seth Alves
36e0a5afc5
cleanups
2015-03-18 13:04:27 -07:00
Seth Alves
9161cc8b83
attempt to handle collision models in the same way as render models
2015-03-18 13:00:09 -07:00
Seth Alves
f9be7dda36
bump shape stuff from ModelEntityItem down to RenderableModelEntityItem
2015-03-17 18:55:13 -07:00
Andrew Meadows
e418872f7b
namechanges: setFooInMeters() --> setFoo()
...
also fixed some warnings, made code abide to standard,
and moved some variables to be closer to where they're used
2015-03-09 09:56:15 -07:00
Andrew Meadows
51d05cc43e
merge upstream/master into andrew/isentropic
...
Conflicts:
libraries/networking/src/PacketHeaders.cpp
2015-03-09 08:51:49 -07:00
Jason
0fd9540bc3
Sync to upstream
...
Did "fetch upstream", "merge upstream/master", and resolved one
conflict.
2015-03-07 21:40:06 -08:00
Jason
cfcc4679e1
Interview project updates (2).
...
Oops, I forgot to convert tabs-to-spaces on EntityTreeRenderer.
Committing it now.
2015-03-06 15:57:38 -08:00
Jason
7a5669f14e
Interview project updates.
...
Tried to address all of Brad's notes, most of which were related to
matching the coding style for the project. Also used GeometryCache
instead of making direct calls to OpenGL to do drawing, took a different
approach to seeding rand(), updated the packet version, and fixed a bug
that I noticed in the setting of the dimensions for the particle effect
entity.
2015-03-06 15:52:21 -08:00
Andrew Meadows
373be95297
entity cubes are in meters
2015-03-06 15:32:03 -08:00
Andrew Meadows
e4c68bf31c
committing some temp debug stuff to help git diff
...
(will remove this stuff later)
2015-03-05 18:06:08 -08:00
Andrew Meadows
49eee89c19
merge upstream/master into andrew/isentropic
...
Conflicts:
libraries/networking/src/PacketHeaders.cpp
libraries/networking/src/PacketHeaders.h
2015-03-05 08:22:02 -08:00
Jason
3522357c8c
High Fidelity interview project -- Jason Rickwald
...
For my project, I decided to add a new entity -- a Particle Effect.
This is really rudimentary to start out with, but you could see where
it's headed.
2015-03-04 16:06:06 -08:00
Andrew Meadows
b9cbd1ea6e
witch internal EntityItem data to use meters
2015-03-04 09:38:37 -08:00
Sam Gateau
4619ba1f5b
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
2015-03-03 10:56:04 -08:00
Sam Gateau
ea88cbd75f
Merge with upstream master
2015-02-27 13:19:50 -08:00
Ryan Huffman
5c9473cd24
Merge branch 'master' of github.com:highfidelity/hifi into update-light-entity-properties
...
Conflicts:
libraries/entities-renderer/src/RenderableLightEntityItem.cpp
2015-02-27 12:20:10 -08:00
Ryan Huffman
fdc1146339
Update RenderableLightEntityItem to use update light entity
2015-02-27 12:14:50 -08:00
Andrew Meadows
7836bb4dcd
rayIntersection uses meters instead of tree units
2015-02-26 17:42:17 -08:00
Andrew Meadows
64c28fe925
remove EntityItem::getSize()
2015-02-26 15:36:59 -08:00
Andrew Meadows
7210c7a88b
added EntityTree::findEntitiesInMeters()
...
progress toward conversion to meters
2015-02-26 15:16:59 -08:00
