Andrew Meadows
|
58bb137c4d
|
bulletRotationStep --> computeBulletRotationStep
|
2015-01-27 17:37:12 -08:00 |
|
Andrew Meadows
|
23bd3f90d9
|
Bullet-style rotation integration for kinematics
and for dead reckoning after wire-transfer
|
2015-01-27 17:27:15 -08:00 |
|
Brad Hefta-Gaub
|
a46fda3749
|
Merge pull request #4174 from huffman/delete-entity
Update deleteEntity to obey entity locked property
|
2015-01-27 13:05:05 -08:00 |
|
ZappoMan
|
23892ab1e7
|
fixed comments
|
2015-01-27 11:38:14 -08:00 |
|
ZappoMan
|
b1586d4f90
|
move debug into ifdef
|
2015-01-27 11:29:17 -08:00 |
|
ZappoMan
|
45dbff67f8
|
more hacking
|
2015-01-27 11:15:33 -08:00 |
|
Ryan Huffman
|
f65640a593
|
Update EntityTree.cpp to not delete entity when locked
|
2015-01-27 10:24:54 -08:00 |
|
Ryan Huffman
|
86f7c28ee9
|
Update EntityScriptingInterface::deleteEntity to not delete when known entity is locked
|
2015-01-27 10:24:28 -08:00 |
|
ZappoMan
|
83d1cc911a
|
hacking
|
2015-01-26 19:38:24 -08:00 |
|
ZappoMan
|
02c0700db3
|
support for skipping forward on new edit packets from server
|
2015-01-26 17:25:06 -08:00 |
|
ZappoMan
|
81185cfe56
|
removed some debugging
|
2015-01-26 12:46:22 -08:00 |
|
ZappoMan
|
a1ec44b8e0
|
add developer menu item to disable sending physics updates
|
2015-01-26 12:05:57 -08:00 |
|
ZappoMan
|
73b9c06ec0
|
added some debugging
|
2015-01-26 11:13:30 -08:00 |
|
ZappoMan
|
f85774c687
|
adding some debugging
|
2015-01-26 09:45:33 -08:00 |
|
ZappoMan
|
9a0576adfb
|
remove setting last simulated in setLastEdited() because it may cause problems
|
2015-01-23 15:54:26 -08:00 |
|
ZappoMan
|
9cc61e90f7
|
Merge branch 'master' of https://github.com/highfidelity/hifi into fixGlitches
Conflicts:
libraries/entities/src/EntityItem.cpp
|
2015-01-23 15:01:35 -08:00 |
|
ZappoMan
|
fa485d21b7
|
added comment
|
2015-01-23 13:52:28 -08:00 |
|
ZappoMan
|
3c38a9eb53
|
add last simulated to the protocal
|
2015-01-23 13:32:38 -08:00 |
|
Andrew Meadows
|
36c20c24fe
|
fix for velocity in units of domain size
|
2015-01-23 13:20:12 -08:00 |
|
Andrew Meadows
|
f2bcdfa2b4
|
update _lastSimulated for kinematic motion
|
2015-01-23 13:10:41 -08:00 |
|
Andrew Meadows
|
d173afaa70
|
add support for non-physical kinematic movement
|
2015-01-23 11:01:46 -08:00 |
|
ZappoMan
|
31f72107da
|
remove support for old pre-entity svo files
|
2015-01-23 09:26:48 -08:00 |
|
ZappoMan
|
838a549abe
|
debugging stutter
|
2015-01-22 13:31:09 -08:00 |
|
ZappoMan
|
14c7dc8eb9
|
debugging stutter
|
2015-01-22 13:13:18 -08:00 |
|
Andrew Meadows
|
1b7074e52a
|
purge EntityCollisionSystem
|
2015-01-21 14:16:34 -08:00 |
|
Andrew Meadows
|
1c38b08e8f
|
remane emitEntityCollision... to entityCollision...
|
2015-01-21 14:07:23 -08:00 |
|
Andrew Meadows
|
86583f3f3f
|
physics collisions emit script collision events
|
2015-01-21 11:27:32 -08:00 |
|
Philip Rosedale
|
1ff90bec5d
|
Merge pull request #4124 from AndrewMeadows/inertia
support for simple kinematic motion
|
2015-01-16 13:33:44 -08:00 |
|
Andrew Meadows
|
4392af3b3a
|
Remove pre-Bullet server-side EntityItem motion
|
2015-01-16 09:26:43 -08:00 |
|
Andrew Meadows
|
3fed38793e
|
merge andrew/origin/inertia to andrew/local/inertia
|
2015-01-15 17:55:51 -08:00 |
|
Andrew Meadows
|
250fd98fee
|
support for simple kinematic motion
|
2015-01-15 17:51:01 -08:00 |
|
Brad Hefta-Gaub
|
89967fbe7a
|
Merge pull request #4104 from AndrewMeadows/inertia
store density in EntityItem instead of mass
|
2015-01-14 17:17:45 -08:00 |
|
ZappoMan
|
ff60833129
|
fix ray pick of ellipsoids away from origin
|
2015-01-14 16:55:24 -08:00 |
|
Andrew Meadows
|
ccc50dd94f
|
use density instead of mass
|
2015-01-14 15:47:44 -08:00 |
|
Andrew Meadows
|
03b8badd81
|
EntityItem stores density rather than mass.
|
2015-01-14 15:00:57 -08:00 |
|
Andrew Meadows
|
04b4a95ccb
|
fix for bad cleanup (3 places)
|
2015-01-13 14:21:41 -08:00 |
|
Andrew Meadows
|
cee7a4db10
|
merge upstream/master into andrew/inertia
|
2015-01-13 14:03:27 -08:00 |
|
Andrew Meadows
|
dcca5d532a
|
fix for glitchy physics updates
The main problem was: ObjectMotionState::_sentPosition and friends
were not being updated when the EntityServer update arrives.
|
2015-01-13 14:00:37 -08:00 |
|
Clément Brisset
|
206e1e48f6
|
Merge pull request #4086 from huffman/std-to-qstring
Std to qstring
|
2015-01-12 16:19:28 -08:00 |
|
Andrew Meadows
|
7a2ecd27fd
|
fix typo
|
2015-01-12 14:32:32 -08:00 |
|
Andrew Meadows
|
081037bc5f
|
merge upstream/master into andrew/inertia
|
2015-01-12 12:34:50 -08:00 |
|
Andrew Meadows
|
bece05a994
|
entity prop defaults move to their own header
|
2015-01-12 11:49:31 -08:00 |
|
Andrew Meadows
|
89a782c55a
|
remove functional code from inside assert
|
2015-01-11 13:31:37 -08:00 |
|
ZappoMan
|
60f55c7f3f
|
remove important code from assert so it still runs in release build
|
2015-01-11 12:07:16 -08:00 |
|
Andrew Meadows
|
e711b86519
|
scale DEFAULT_DIMENSIONS correctly
also remove a block of commented out cruft
|
2015-01-10 19:07:58 -08:00 |
|
Andrew Meadows
|
1184f5b668
|
merge upstream/master into andrew/inertia
|
2015-01-10 12:45:14 -08:00 |
|
Andrew Meadows
|
25e64d619c
|
move statics out of EntityItem
This makes for much more readable core dumps
|
2015-01-10 11:46:42 -08:00 |
|
Andrew Meadows
|
99e1fdd46e
|
fix for EntityServer crash
adding EntityItem::_element backpointer for easier add/remove logic
|
2015-01-10 07:44:26 -08:00 |
|
chris
|
8bb69d0a90
|
Update std::string instances to QString
|
2015-01-09 16:22:52 -08:00 |
|
Andrew Meadows
|
4946ec18b6
|
remove some TODO comments
|
2015-01-09 09:28:01 -08:00 |
|