Seth Alves
|
b425cc6491
|
merge from upstream
|
2015-06-05 11:56:33 -07:00 |
|
Seth Alves
|
b0480af040
|
Merge pull request #5053 from AndrewMeadows/isothermal
fix crash during bogus reconnect on login
|
2015-06-05 11:38:23 -07:00 |
|
Seth Alves
|
28c034698f
|
Merge branch 'master' of github.com:highfidelity/hifi into actions
|
2015-06-05 10:41:20 -07:00 |
|
Seth Alves
|
c5143cdfa0
|
Merge pull request #5027 from AndrewMeadows/isentropic
cleanup around sending all "terse update" data whenever some of it changes
|
2015-06-05 10:41:06 -07:00 |
|
Seth Alves
|
4e10c28b41
|
merge from upstream
|
2015-06-05 10:31:13 -07:00 |
|
Seth Alves
|
edb3622c85
|
Merge pull request #5037 from AndrewMeadows/inertia
collision groups for physical objects
|
2015-06-05 10:26:28 -07:00 |
|
Seth Alves
|
51f5730e68
|
formatting
|
2015-06-05 10:05:11 -07:00 |
|
Seth Alves
|
b2db5f7fee
|
update grab.js to use pull-to-point action, various other fixes
|
2015-06-05 07:10:44 -07:00 |
|
Seth Alves
|
ba42b0dcc4
|
updateAction and deleteAction
|
2015-06-04 17:51:59 -07:00 |
|
Andrew Meadows
|
911baee8b8
|
fix for crash during bogus reconnect on login
|
2015-06-04 16:57:29 -07:00 |
|
Andrew Meadows
|
cd6bf9d461
|
cleanup comments
|
2015-06-04 16:56:14 -07:00 |
|
Howard Stearns
|
5cbb5dadca
|
More perspicacious zero.
|
2015-06-04 14:21:12 -07:00 |
|
Seth Alves
|
5e5bc497d9
|
remove debugging prints
|
2015-06-04 12:44:08 -07:00 |
|
Seth Alves
|
66ab3d455f
|
use shared pointers to keep track of action objects
|
2015-06-04 12:29:05 -07:00 |
|
Seth Alves
|
8f19bad97d
|
pull argument extracting code into EntityActionInterface
|
2015-06-04 11:39:15 -07:00 |
|
Andrew Meadows
|
6b03e671d8
|
remove comment cruft
|
2015-06-04 11:28:07 -07:00 |
|
Seth Alves
|
14026667f5
|
script interface for creating an action now takes an action-type name rather than having a different call for each action
|
2015-06-04 10:55:32 -07:00 |
|
Andrew Meadows
|
6ea4c58319
|
material changes are an "easy" property to update
|
2015-06-04 10:22:01 -07:00 |
|
Seth Alves
|
57d85cece0
|
get rid of simulation back-pointer in actions
|
2015-06-04 09:41:32 -07:00 |
|
Seth Alves
|
d634663bb1
|
simple action is working. destructor sequense is still suspicous
|
2015-06-03 17:33:55 -07:00 |
|
Andrew Meadows
|
b0ca2df3aa
|
move API from PhysicsEngine to ObjectMotionState
|
2015-06-03 14:56:04 -07:00 |
|
Andrew Meadows
|
8e61a10bcf
|
compute collision group for entity
|
2015-06-03 14:22:48 -07:00 |
|
Andrew Meadows
|
ec0b4a956a
|
move collision group consts to shared lib
|
2015-06-03 14:13:51 -07:00 |
|
Andrew Meadows
|
7b6cc59d30
|
basic support for collision groups
|
2015-06-03 11:40:48 -07:00 |
|
Seth Alves
|
c8ab22c517
|
hook up entity-scripting-interface to actions
|
2015-06-03 11:19:45 -07:00 |
|
Howard Stearns
|
c036b5fd4b
|
Actually commit the changes this time!
|
2015-06-03 10:19:28 -07:00 |
|
Seth Alves
|
1d0d002222
|
clear out action change lists after applying them
|
2015-06-03 09:10:42 -07:00 |
|
Seth Alves
|
a31a5a1554
|
main actions interface is in EntityItem. changes in actions are queued up and applied before simulation step
|
2015-06-02 19:40:20 -07:00 |
|
Seth Alves
|
d6549948d0
|
first pass at entity interface to actions
|
2015-06-02 16:06:27 -07:00 |
|
Seth Alves
|
100248c4e8
|
beginnings of ObjectAction class
|
2015-06-02 13:19:07 -07:00 |
|
Seth Alves
|
b24cd82b80
|
beginnings of ObjectAction class
|
2015-06-02 13:18:49 -07:00 |
|
Andrew Meadows
|
2400f5c000
|
update ALL parameters of remote physics simulation
|
2015-06-01 09:02:59 -07:00 |
|
Andrew Meadows
|
4e073c77b3
|
Merge pull request #4978 from sethalves/fix-4973
recreate PR #4973 with some additional changes -- removed const keywo…
|
2015-05-27 21:11:28 -07:00 |
|
Andrew Meadows
|
aba539928d
|
fix grab glitches and failure to own simulation
|
2015-05-27 18:05:59 -07:00 |
|
Seth Alves
|
bfa0e9c234
|
recreate PR #4973 with some additional changes -- removed const keyword from qinvokables for avatar getter methods such as getVelocity
|
2015-05-27 14:44:23 -07:00 |
|
andrew
|
2a6955ce12
|
fix windows build
|
2015-05-27 09:14:11 -07:00 |
|
Andrew Meadows
|
39d8244255
|
use highfideltiy style for class data member names
|
2015-05-26 22:59:29 -07:00 |
|
Andrew Meadows
|
708203089c
|
replace tabs with spaces
|
2015-05-26 22:53:57 -07:00 |
|
Andrew Meadows
|
efbb9b0238
|
rewritten MassProperties with complete unit tests
|
2015-05-26 22:48:45 -07:00 |
|
Andrew Meadows
|
16e5710325
|
Merge pull request #4954 from ZappoMan/entitysmartpointers
EnitityItem smart pointers
|
2015-05-26 14:05:03 -07:00 |
|
ZappoMan
|
8b78fc4190
|
EnitityItem smart pointers
|
2015-05-22 17:57:50 -07:00 |
|
Andrew Meadows
|
461d08c0a9
|
merge upstream/master into andrew/bispinor
|
2015-05-22 11:35:02 -07:00 |
|
Andrew Meadows
|
bf225e4886
|
fix bug masking physics shape changes
|
2015-05-22 11:33:45 -07:00 |
|
Andrew Meadows
|
0431e8da36
|
put avatar body in right spot, and give it mass
|
2015-05-22 11:08:56 -07:00 |
|
Andrew Meadows
|
466af03fa9
|
support for ShapeInfo::offset
|
2015-05-21 16:25:05 -07:00 |
|
Andrew Meadows
|
f6721aa6eb
|
moved ShapeInfoUtil to be ShapeFactory
|
2015-05-21 15:53:16 -07:00 |
|
Andrew Meadows
|
2e3973dfdd
|
impl AvatarMotionState::set/getWorldTransform()
|
2015-05-21 15:34:30 -07:00 |
|
Andrew Meadows
|
67f5d0773d
|
some list management of AvatarMotionStates
|
2015-05-21 14:40:47 -07:00 |
|
Seth Alves
|
4a59dc24c5
|
split entity-add and entity-edit messages
|
2015-05-20 14:52:03 -07:00 |
|
Seth Alves
|
a769cfdaf2
|
client decides on new entity-ids, keep EntityItemID class
|
2015-05-20 10:42:19 -07:00 |
|