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
|
eb912892dc
|
code review
|
2015-06-05 09:56:34 -07:00 |
|
Seth Alves
|
2086a25f93
|
oops
|
2015-06-05 08:59:19 -07:00 |
|
Seth Alves
|
086b9d404a
|
fix return-type in lambda
|
2015-06-05 08:59:08 -07:00 |
|
Andrew Meadows
|
08b64666fe
|
Merge pull request #5033 from howard-stearns/smooth-initial-crash-volume
Smooth initial crash volume
|
2015-06-05 08:40:09 -07:00 |
|
Seth Alves
|
3dbf28b7b4
|
use lambdas to remove some repeated code
|
2015-06-05 07:33:39 -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
|
9a67f35b59
|
Merge branch 'master' of github.com:highfidelity/hifi into actions
|
2015-06-04 19:02:46 -07:00 |
|
Seth Alves
|
ba42b0dcc4
|
updateAction and deleteAction
|
2015-06-04 17:51:59 -07:00 |
|
Eric Levin
|
5e15c14539
|
added sanitization for invalid line points data. Fixed bug where occasionally wrong view frustum would be sent to script"
|
2015-06-04 16:45:32 -07:00 |
|
Howard Stearns
|
407d3b6a6e
|
Pitch is dependent on (largest dimension of) minimum bounding, not max.
Adjust sound range of full volume.
|
2015-06-04 14:23:51 -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
|
5f60ad3b51
|
put back unused variables as commented out -- there is a comment lower down that talks about them
|
2015-06-04 12:39:48 -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 |
|
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 |
|
Seth Alves
|
9cae11cc3c
|
clean up actions when DeleteEntityOperator's list is processed rather than as it's made
|
2015-06-04 09:55:25 -07:00 |
|
Seth Alves
|
57d85cece0
|
get rid of simulation back-pointer in actions
|
2015-06-04 09:41:32 -07:00 |
|
Howard Stearns
|
0b52f85c60
|
Merge branch 'master' of https://github.com/highfidelity/hifi into smooth-initial-crash-volume
|
2015-06-04 09:10:42 -07:00 |
|
Seth Alves
|
4414b67837
|
Merge branch 'master' of github.com:highfidelity/hifi into actions
|
2015-06-03 20:43:22 -07:00 |
|
Seth Alves
|
31bc106189
|
remove unneeded include
|
2015-06-03 20:43:11 -07:00 |
|
Seth Alves
|
d634663bb1
|
simple action is working. destructor sequense is still suspicous
|
2015-06-03 17:33:55 -07:00 |
|
Brad Davis
|
a12fd5c3d0
|
Merge pull request #5023 from AndrewMeadows/bispinor
fix crash in ~OffscreenGlCanvas on linux shutdown
|
2015-06-03 17:21:39 -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
|
a989998816
|
fix typo in comment
|
2015-06-03 14:13:30 -07:00 |
|
Seth Alves
|
9861e8afcc
|
adjust assert
|
2015-06-03 11:47:42 -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 |
|
Seth Alves
|
57c3a14b6a
|
quiet compiler
|
2015-06-03 11:18:38 -07:00 |
|
Howard Stearns
|
407746b842
|
Fix (consistent) typo in non-magic-number constant's name.
|
2015-06-03 10:38:20 -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
|
f84e970c48
|
Merge branch 'master' of github.com:highfidelity/hifi into actions
|
2015-06-02 16:28:07 -07:00 |
|
Seth Alves
|
d6549948d0
|
first pass at entity interface to actions
|
2015-06-02 16:06:27 -07:00 |
|
Andrew Meadows
|
9e0c2a3c6c
|
fix crash in ~OffscreenGlCanvas on linux shutdown
|
2015-06-02 14:36:34 -07:00 |
|
Andrew Meadows
|
2702e07863
|
Merge pull request #5015 from sethalves/polyvox
PolyVox improvements -- depends on #5008
|
2015-06-02 14:34:49 -07:00 |
|
Brad Hefta-Gaub
|
2a8e758559
|
Merge pull request #5010 from ericrius1/lineEntity
Modified the line entity to take two new properties: lineWidth and linePoints
|
2015-06-02 14:25:44 -07:00 |
|
Eric Levin
|
7527efc2d6
|
removed unsuded variable
|
2015-06-02 13:58:09 -07:00 |
|
Eric Levin
|
a98baef736
|
another code cleanup
|
2015-06-02 13:56:18 -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 |
|
Seth Alves
|
981ac2ce7d
|
quiet-compiler -- remove unused prototype for cleanupMenuItems
|
2015-06-02 13:17:15 -07:00 |
|
Eric Levin
|
55ffb7f1c0
|
code style changes
|
2015-06-02 12:51:45 -07:00 |
|
Seth Alves
|
11eb073bcf
|
fix comment
|
2015-06-02 10:04:39 -07:00 |
|