Andrew Meadows
|
170ec83870
|
remove unnecessary assert
|
2018-03-30 13:18:32 -07:00 |
|
Andrew Meadows
|
eb07f6732f
|
add reminder comment
|
2018-03-30 13:18:32 -07:00 |
|
Andrew Meadows
|
49dce6fa1a
|
remove some redundancy checks
no need to assert(_entity) : guaranteed by ctor and dtor logic
moved some checks around to avoid redundant work
|
2018-03-30 13:18:32 -07:00 |
|
Andrew Meadows
|
dcf5110caa
|
clarify hardcoded constant
|
2018-03-30 13:18:32 -07:00 |
|
Andrew Meadows
|
4e0f307dc0
|
quint8 --> uint8_t
|
2018-03-30 13:18:32 -07:00 |
|
Andrew Meadows
|
d6ac294f39
|
use uint8_t instead of quint8
|
2018-03-30 13:18:32 -07:00 |
|
Andrew Meadows
|
4501033861
|
add description of simulation ownership rules
|
2018-03-30 13:18:32 -07:00 |
|
Andrew Meadows
|
2be0f0fa22
|
better comments
|
2018-03-30 13:18:32 -07:00 |
|
Andrew Meadows
|
c61a226bb5
|
delete default EntityMotionState ctor
|
2018-03-30 13:18:32 -07:00 |
|
Andrew Meadows
|
73fa6d3d2f
|
slightly simpler EntityMotionState delete logic
|
2018-03-30 13:18:32 -07:00 |
|
Andrew Meadows
|
6746e08206
|
faster EntitySimulation::takeDeadEntities()
|
2018-03-30 13:18:32 -07:00 |
|
Andrew Meadows
|
e1d2a5e5f3
|
more cleanup for deleting entities
|
2018-03-30 13:18:32 -07:00 |
|
Andrew Meadows
|
5854a36ff7
|
more correct handling of simulated entity
|
2018-03-30 13:18:32 -07:00 |
|
Andrew Meadows
|
a05c753e03
|
only process changed entities when simulated
|
2018-03-30 13:18:32 -07:00 |
|
Andrew Meadows
|
738e1267ab
|
small optimization in EntitySimulation::changeEntity()
|
2018-03-30 13:18:32 -07:00 |
|
Andrew Meadows
|
f20c9d3c5b
|
EntitySimulation::removeEntityInternal isn't pure virtual
|
2018-03-30 13:18:32 -07:00 |
|
Andrew Meadows
|
0596497930
|
more correct comments
|
2018-03-30 13:18:32 -07:00 |
|
Andrew Meadows
|
5649748b17
|
make EntitySimulation::changeEntityInternal() pure virtual
|
2018-03-30 13:18:32 -07:00 |
|
Andrew Meadows
|
bd434e3f18
|
make EntitySimulation::addEntityInternal() pure virtual
|
2018-03-30 13:18:32 -07:00 |
|
Andrew Meadows
|
6837d042ad
|
move entityCollisionWithEntity to PhysicalEntitySimulation
|
2018-03-30 13:18:32 -07:00 |
|
John Conklin II
|
542d1ad1ff
|
Merge pull request #12720 from druiz17/fix-parent-tree
Fix far grabbing a grabbable child when the parent is not grabbable.
|
2018-03-30 12:25:22 -07:00 |
|
Ken Cooke
|
ff6c9f3127
|
Merge pull request #12704 from ElderOrb/FB13057
Improve audio devices selection logic
|
2018-03-30 11:18:05 -07:00 |
|
Ken Cooke
|
a2be291363
|
Merge pull request #12715 from ctrlaltdavid/21677
Add Window.raise() as replacement for Window.raiseMainWindow()
|
2018-03-30 09:41:54 -07:00 |
|
John Conklin II
|
379df87d0c
|
Merge pull request #12697 from misslivirose/feat/disable-add-without-url
Disable Add Button in Model Modal until user has entered text in the model URL
|
2018-03-29 11:39:48 -07:00 |
|
John Conklin II
|
a76b4b1008
|
Merge pull request #12734 from samcake/RC66-fetchMetaItem
RC66: Add an extra sanity check when calling fetchMetaSubItemBounds
|
2018-03-29 11:05:08 -07:00 |
|
John Conklin II
|
97d9c1b735
|
Merge pull request #12726 from jherico/fix/rc66_crashes
Attempt to resolve potential overlay crashes at shutdown
|
2018-03-29 09:37:23 -07:00 |
|
Liv Erickson
|
387ff680d5
|
support deleted scenario
|
2018-03-28 18:12:30 -07:00 |
|
Liv Erickson
|
b78f00342e
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/disable-add-without-url
|
2018-03-28 17:53:42 -07:00 |
|
Sam Gondelman
|
d2a74e5713
|
Merge pull request #12686 from gcalero/android_ui_not_move_camera
Android - Prevent Camera movement with UI (especially Windows and Radar mode)
|
2018-03-28 17:14:42 -07:00 |
|
samcake
|
2ee0af03c8
|
Add an extra sanity check when calling fetchMetaSubItems when the subItems is not allocated yet
|
2018-03-28 16:17:55 -07:00 |
|
Stephen Birarda
|
a697f971bb
|
Merge pull request #12732 from birarda/bug/scripts-copy-in-dev
fix cmake changes for script copy for dev builds
|
2018-03-28 15:55:37 -07:00 |
|
Cristian Luis Duarte
|
fe9481b28d
|
Cleanup code, comment out log, simplify radar is valid touch code (no more flag)
|
2018-03-28 19:50:44 -03:00 |
|
Stephen Birarda
|
0172c24cf2
|
fix cmake changes for script copy for dev builds
|
2018-03-28 14:47:09 -07:00 |
|
John Conklin II
|
790162c88b
|
Merge pull request #12689 from ctrlaltdavid/21808
Reinstate Overlays.getOverlayObject API function
|
2018-03-28 14:00:28 -07:00 |
|
Cristian Luis Duarte
|
f0bcaa47c8
|
Merge remote-tracking branch 'hifi/master' into android_ui_not_move_camera
|
2018-03-28 16:47:21 -03:00 |
|
John Conklin II
|
5a7267a844
|
Merge pull request #12671 from Triplelexx/21794_inspect_avatars
WL#21794: Modify inspect.js to work with Avatars as well as entities
|
2018-03-28 10:44:30 -07:00 |
|
Brad Hefta-Gaub
|
16df773de4
|
Merge pull request #12721 from highfidelity/RC66
RC66 - Mergeback
|
2018-03-28 09:55:46 -07:00 |
|
John Conklin II
|
586fb4829c
|
Merge pull request #12637 from druiz17/fix-asset-server-qml
Fix asset server qml sorting
|
2018-03-28 09:35:53 -07:00 |
|
John Conklin II
|
d59a721f16
|
Merge pull request #12724 from sethalves/fix-entity-import
fix entity importing
|
2018-03-28 09:18:20 -07:00 |
|
Brad Davis
|
9be162de95
|
Synchronously shut down QML rendering threads
|
2018-03-28 09:13:46 -07:00 |
|
Brad Davis
|
aacfe92751
|
Don't trigger crashes from timers while waiting for some operation on exit
|
2018-03-28 09:09:56 -07:00 |
|
Seth Alves
|
46fb2033f2
|
Merge pull request #12574 from druiz17/remap-keybaord
changing keyboard mapping
|
2018-03-27 19:00:05 -07:00 |
|
Seth Alves
|
bb101956a6
|
fix entity importing
|
2018-03-27 18:25:43 -07:00 |
|
Dante Ruiz
|
ad9ca0da20
|
fix tablet version
|
2018-03-27 16:03:06 -07:00 |
|
John Conklin II
|
a258a330d3
|
Merge pull request #12676 from druiz17/fix-keyboard
fixing AddressManager keyboard when switching domains
|
2018-03-27 15:34:23 -07:00 |
|
Brad Davis
|
29106fbbbe
|
Prevent potential double delete of QML overlays
|
2018-03-27 14:18:19 -07:00 |
|
Brad Davis
|
eb20181b60
|
Shut down the overlay interface on exit
|
2018-03-27 14:18:01 -07:00 |
|
Dante Ruiz
|
3d7f7f0e62
|
fix parent tree grabbing
|
2018-03-27 14:05:43 -07:00 |
|
John Conklin II
|
0862f345fe
|
Merge pull request #12717 from sethalves/workaround-dialog-crash
fix -- work around asset-upload dialog crash
|
2018-03-27 13:35:50 -07:00 |
|
Clément Brisset
|
d8042f78e8
|
Merge pull request #12713 from highfidelity/RC66
RC66 - Merge Back
|
2018-03-27 13:01:14 -07:00 |
|