Andrew Meadows
|
ed1761945c
|
add/remove entities to physics using workload output
|
2018-04-06 07:22:05 -07:00 |
|
samcake
|
a5ee211dbf
|
Dirty attempt to capture the owner typefor a payload
|
2018-04-05 18:04:35 -07:00 |
|
samcake
|
c5b88d55ab
|
Spliting the creation of the Workload engine from the setup and configuration, changing the output from region tracker
|
2018-04-05 16:05:40 -07:00 |
|
Andrew Meadows
|
8035dde5dd
|
fix Windows warnings
|
2018-04-05 12:54:43 -07:00 |
|
Andrew Meadows
|
4f0980b94b
|
hook up prototype PhysicsBoundary job
|
2018-04-05 12:11:57 -07:00 |
|
Andrew Meadows
|
d9ab166aac
|
initial PhysicsBoundary job implementation
|
2018-04-05 12:10:46 -07:00 |
|
Andrew Meadows
|
299f2a92e0
|
merge 'master' into 'workload'
|
2018-04-05 12:01:19 -07:00 |
|
John Conklin II
|
9e21bab67e
|
Merge pull request #12748 from AndrewMeadows/untangle-003
cleanup around simulation-ownership
|
2018-04-05 10:58:45 -07:00 |
|
John Conklin II
|
2e37b4a312
|
Merge pull request #12747 from Zvork/fade
Update to Transitions debugging / editing script
|
2018-04-04 14:31:59 -07:00 |
|
John Conklin II
|
cba307f28b
|
Merge pull request #12762 from samcake/one
Remove notifications and print outs when degrading LOD
|
2018-04-04 10:35:05 -07:00 |
|
Zach Fox
|
752246d950
|
Merge pull request #12760 from zfox23/inspection_rightClickTweaking
Inspection: Tweak mouse-right-click-to-inspect behavior
|
2018-04-04 09:32:29 -07:00 |
|
samcake
|
88a5105b81
|
Merge branch 'workload' of https://github.com/highfidelity/hifi into workload
|
2018-04-03 18:00:16 -07:00 |
|
samcake
|
fa35d659dc
|
Merge branch 'master' of https://github.com/highfidelity/hifi into upstream-workload
|
2018-04-03 17:56:41 -07:00 |
|
Clément Brisset
|
3d4490f3fd
|
Merge pull request #12737 from highfidelity/RC66
RC66 mergeback
|
2018-04-03 15:39:16 -07:00 |
|
samcake
|
2dc4630e68
|
Merge branch 'master' of https://github.com/highfidelity/hifi into one
|
2018-04-03 12:55:21 -07:00 |
|
samcake
|
efd2b2720b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
|
2018-04-03 12:46:10 -07:00 |
|
Seth Alves
|
5f13df4102
|
Merge pull request #12722 from druiz17/fix-entities-outline
fix ContextOverlayInferface highlighing unspecified entities.
|
2018-04-03 12:29:19 -07:00 |
|
samcake
|
5bfaa84258
|
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
|
2018-04-03 09:16:07 -07:00 |
|
John Conklin II
|
53a5261905
|
Merge pull request #12712 from zfox23/newUpdateCertLocation
Fix cert location for content sets; handle .content.zip content sets
|
2018-04-03 09:10:11 -07:00 |
|
Sam Gateau
|
2afd5f9813
|
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
|
2018-04-02 19:11:02 -07:00 |
|
samcake
|
5a1eac563b
|
Code review fixes
|
2018-04-02 15:50:18 -07:00 |
|
John Conklin II
|
9dcef996c5
|
Merge pull request #12684 from vladest/assetserver_wrong_dialog
Fix invalid message if cancel adding asset to AssetServer
|
2018-04-02 15:28:46 -07:00 |
|
John Conklin II
|
74ca98dc81
|
Merge pull request #12727 from amantley/triggerRecenterBehaviour
Trigger Avatar Recenter Behaviour
|
2018-04-02 14:42:21 -07:00 |
|
Zach Fox
|
1f3063193a
|
Tweak right-click to inspect
|
2018-04-02 14:24:51 -07:00 |
|
samcake
|
d4bc61fb3d
|
Remove notifications and print outs for LOD changes because it was too much noise
|
2018-04-02 13:53:30 -07:00 |
|
John Conklin II
|
796bd069b2
|
Merge pull request #12659 from alexiamandeville/script_charcontroller
Updating char controller
|
2018-04-02 13:24:15 -07:00 |
|
Dante Ruiz
|
a9a53c7d64
|
make resquested changes
|
2018-04-02 10:51:39 -07:00 |
|
Sam Gateau
|
dada0b9024
|
Exploring better task job config api that work
|
2018-04-02 01:09:35 -07:00 |
|
Sam Gateau
|
9e2295525d
|
merging with upstream workload after it s been updated with master
|
2018-03-31 13:31:20 -07:00 |
|
samcake
|
59a081bcdb
|
merge with upstream
|
2018-03-30 18:08:38 -07:00 |
|
Dante Ruiz
|
4b7e2cb331
|
made requested changes
|
2018-03-30 15:15:17 -07:00 |
|
Dante Ruiz
|
c99676b510
|
atlernate fix for selected entities
|
2018-03-30 13:44:54 -07:00 |
|
Andrew Meadows
|
73fa6d3d2f
|
slightly simpler EntityMotionState delete logic
|
2018-03-30 13:18:32 -07:00 |
|
Andrew Meadows
|
6837d042ad
|
move entityCollisionWithEntity to PhysicalEntitySimulation
|
2018-03-30 13:18:32 -07:00 |
|
Olivier Prat
|
5c26b4030b
|
Merge branch 'master' of http://github.com/highfidelity/hifi into fade
|
2018-03-30 14:38:42 -04:00 |
|
Ken Cooke
|
ff6c9f3127
|
Merge pull request #12704 from ElderOrb/FB13057
Improve audio devices selection logic
|
2018-03-30 11:18:05 -07:00 |
|
Zach Fox
|
32e5e9986f
|
Merge branch 'master' of github.com:highfidelity/hifi into newUpdateCertLocation
|
2018-03-30 10:10:43 -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
|
5013760aa1
|
Merge pull request #12742 from jherico/fix/rc66_crashes
Fix/rc66 crashes
|
2018-03-29 18:04:52 -07:00 |
|
Olivier Prat
|
5f8693aae2
|
Merge branch 'master' of http://github.com/highfidelity/hifi into fade
|
2018-03-29 15:52:38 -04:00 |
|
samcake
|
028959f240
|
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
|
2018-03-29 12:00:10 -07:00 |
|
Seth Alves
|
dcfebde54a
|
put back the pre serverless-domain behavior for when a json file is dragged-and-dropped into the interface window -- import the json rather than load as a serverless-domain
|
2018-03-29 10:50:43 -07:00 |
|
amantley
|
3f44b88d2d
|
added js documentation for the three trigger recenter functionsthat have been added to MyAvatar class
|
2018-03-29 10:09:51 -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 |
|
Olivier Prat
|
3c8cd48dfb
|
Merge branch 'master' of http://github.com/highfidelity/hifi into fade
|
2018-03-29 07:21:01 -04:00 |
|
amantley
|
90d87c5b5d
|
changed get functions to const in MyAvatar.cpp changed bool variables to atomic for thread safety
|
2018-03-28 14:00:36 -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 |
|
amantley
|
4b1f974561
|
fixed merge conflict for declaring _hmdLeanRecenterEnabled in MyAvatar.h
|
2018-03-28 11:57:48 -07:00 |
|
amantley
|
95f1d0e4fa
|
added get and set functions for the activate recenter variables
|
2018-03-28 10:33:00 -07:00 |
|
Zach Fox
|
ca2fba675d
|
Merge branch 'master' of github.com:highfidelity/hifi into newUpdateCertLocation
|
2018-03-28 10:28:32 -07:00 |
|