Brad Hefta-Gaub
c0cf717a04
CR feedback
2016-01-11 11:13:33 -08:00
Brad Hefta-Gaub
dfba05ae5f
CR feedback
2016-01-11 11:07:07 -08:00
Brad Hefta-Gaub
e2a3903def
add support for advanced/developer plugins and change diplay modes to match spec
2016-01-08 16:58:25 -08:00
Brad Hefta-Gaub
86691d5d0e
remove vsync and framerate menus from 2d display plugin
2016-01-08 13:12:43 -08:00
Philip Rosedale
d5c8689843
Merge pull request #6793 from sethalves/fix-get-query-aabox
...
fix queryAABox bug
2016-01-08 09:49:27 -08:00
Seth Alves
31bed934fe
fix bug caused by accidental reuse of variable -- queryAABox was often of size 1 rather than the correct dimensions
2016-01-07 16:27:14 -08:00
Anthony J. Thibault
7bef1ebdac
Merge remote-tracking branch 'upstream/master' into tony/soft-avatar-attachment-script
2016-01-07 16:14:52 -08:00
Anthony J. Thibault
031f59b7b5
Support for adding soft attachments from script.
...
Also, bug fixes for setting MyAvatar.attachmentData property.
2016-01-07 16:12:36 -08:00
Philip Rosedale
c5ab29071e
Merge pull request #6791 from jherico/qml_hang
...
Stop QML hanging the app on shutdown
2016-01-07 13:29:47 -08:00
Brad Davis
660304a0a3
Stop QML hanging the app on shutdown
2016-01-07 12:25:25 -08:00
Seth Alves
bc538a0f7d
Merge pull request #6756 from AndrewMeadows/physics-cleanup-003
...
more correct management of MotionState pointers
2016-01-07 11:04:28 -08:00
Andrew Meadows
8ae1e750ab
Merge pull request #6783 from sethalves/fix-h0ld-action
...
try harder to ensure that a held object is active in bullet
2016-01-07 10:53:55 -08:00
Andrew Meadows
0df920d9a3
Merge pull request #6718 from birarda/master
...
cleanup QTimer management in ThreadedAssignment
2016-01-07 10:53:35 -08:00
Seth Alves
cf9af462b5
replace some logging with an assert
2016-01-07 10:21:39 -08:00
Andrew Meadows
42711e5bad
remove unused variable
2016-01-07 10:20:03 -08:00
Andrew Meadows
36e19b43c9
add some comments; specify const and overrides
2016-01-07 10:19:46 -08:00
Andrew Meadows
4f29156da1
fixing asserts for EntityItem delete pipeline
2016-01-07 10:19:46 -08:00
Andrew Meadows
6a642bdcf8
fix misusage of smart-pointers
2016-01-07 10:19:46 -08:00
Andrew Meadows
e8e965d548
fix crash mode for empty LineEntityItem
2016-01-07 10:19:46 -08:00
Andrew Meadows
6eb177091b
overhaul of MotionState cleanup
...
Moved MotionState deletes out of PhysicsEngine.
EntityMotionStates are deleted by the PhysicsEntitySimulation.
AvatarMotionStates are deleted in the Avatar dtor.
2016-01-07 10:19:46 -08:00
Andrew Meadows
8886f48c78
minor cleanup
2016-01-07 10:19:46 -08:00
Andrew Meadows
f5d24a87ca
remove entities from physics before we delete them
2016-01-07 10:19:46 -08:00
Andrew Meadows
b34df211df
cleanup API for removal from EntitySimulation
2016-01-07 10:19:46 -08:00
Andrew Meadows
4208380d1c
namechange
2016-01-07 10:19:46 -08:00
Brad Hefta-Gaub
553e455a53
Merge pull request #6759 from huffman/script-engine-slot-exception
...
Add logging of signal slot exceptions in ScriptEngine
2016-01-07 08:54:34 -08:00
Brad Hefta-Gaub
a78d5274e7
Merge pull request #6780 from jherico/z_order
...
Address some z-ordering issues in overlay windows
2016-01-06 20:08:52 -08:00
Brad Hefta-Gaub
8b9c2cde63
fix warnings
2016-01-06 15:29:05 -08:00
Brad Hefta-Gaub
f0338690c8
whitespace change
2016-01-06 14:54:50 -08:00
Seth Alves
b873d92469
try harder to ensure that a held object is active in bullet
2016-01-06 14:12:58 -08:00
Brad Hefta-Gaub
edc132efce
fix warning
2016-01-06 12:53:57 -08:00
Brad Hefta-Gaub
0b43685f1e
Merge branch 'master' of https://github.com/highfidelity/hifi into onlyNotifyOwner
2016-01-06 11:26:05 -08:00
Seth Alves
096ab44311
fix network version number
2016-01-06 11:01:31 -08:00
Brad Davis
1b82200ecb
Address some z-ordering issues in overlay windows
2016-01-06 10:58:56 -08:00
Brad Hefta-Gaub
f3aeaec6a9
Merge branch 'master' of https://github.com/highfidelity/hifi into onlyNotifyOwner
2016-01-06 10:58:50 -08:00
Anthony Thibault
95f821d61a
Merge pull request #6732 from sethalves/set-model-entity-joints
...
hook up a way for scripts to set model-entity joint state
2016-01-05 17:31:18 -08:00
Brad Davis
e4913a56ab
Merge pull request #6775 from sethalves/fix-polyvox-rendering
...
update polyvox shader to track changes in packDeferredFragment
2016-01-05 20:24:33 -05:00
Brad Davis
4a9c558809
Merge pull request #6776 from Atlante45/fix/lambda-crash
...
Cleanup web entity connections
2016-01-05 20:23:51 -05:00
Seth Alves
722fe46a27
Merge pull request #6777 from AndrewMeadows/whitespace
...
nothing but whitespace
2016-01-05 17:14:19 -08:00
Brad Hefta-Gaub
2435e160a8
only emit collision events if you're the owner
2016-01-05 16:56:24 -08:00
Clément Brisset
a2135dfdd2
Merge pull request #6720 from ctrlaltdavid/20760
...
Fix particle radius and rgba start, middle, finish interpolation
2016-01-05 16:48:13 -08:00
Andrew Meadows
9ab5ef358a
remove dangling whitespace
2016-01-05 16:44:36 -08:00
David Rowe
4d7ed6b68f
Whitespace
2016-01-06 13:20:44 +13:00
Atlante45
981c6c7af5
Cleanup web entity connections
2016-01-05 16:08:25 -08:00
Seth Alves
1e69f695b4
update polyvox shader to track changes in packDeferredFragment
2016-01-05 16:06:59 -08:00
Seth Alves
b59934573a
Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints
2016-01-05 13:50:12 -08:00
Seth Alves
f7041136ff
put new property in right place
2016-01-05 13:26:16 -08:00
Brad Hefta-Gaub
c2f2f950fb
Merge pull request #6673 from hyperlogic/tony/get-palm-thread-safe
...
Make Avatar palm position/rotation accessors thread safe
2016-01-05 13:07:47 -08:00
Brad Davis
908c1072ce
Merge pull request #6763 from ZappoMan/scriptMessageBoxesOffscreen
...
move alert and confirm to use offscreen ui
2016-01-05 15:26:48 -05:00
Seth Alves
b222c12857
unmangle merge
2016-01-05 12:21:50 -08:00
Seth Alves
cd82383d33
Merge branch 'master' of github.com:highfidelity/hifi into improve-grab-action-reliability
2016-01-05 11:13:38 -08:00
