Sam Gateau
|
6acda83f5c
|
Bringing the test to the workload ui
|
2018-04-09 23:13:39 -07:00 |
|
Sam Gateau
|
9cb918a4ad
|
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
|
2018-04-09 20:03:26 -07:00 |
|
Sam Gateau
|
62d5229811
|
Merge pull request #12842 from samcake/workload
Workload: building a test script for the physics /simulation workload
|
2018-04-09 19:56:18 -07:00 |
|
Sam Gondelman
|
d781cf43ee
|
Merge pull request #12775 from Cristo86/android_jump
Android Control - jump and view sensitivity
|
2018-04-09 17:32:57 -07:00 |
|
samcake
|
87b3f9bd1f
|
More featuers for the view of the workload and test scrtpts to stress the system)
|
2018-04-09 17:27:55 -07:00 |
|
samcake
|
72649f5c06
|
More featuers for the view of the workload and test scrtpts to stress the system)
|
2018-04-09 17:27:40 -07:00 |
|
Cristian Luis Duarte
|
1242446c52
|
Cleanup controller code
|
2018-04-09 19:57:55 -03:00 |
|
Clément Brisset
|
c62a701a2d
|
Merge pull request #12838 from highfidelity/RC66
RC66 merge back to master
|
2018-04-09 13:17:12 -07:00 |
|
John Conklin II
|
4dcab95b40
|
Merge pull request #12828 from Atlante45/fix/skybox-baking
Fix skybox baking
|
2018-04-09 11:55:51 -07:00 |
|
John Conklin II
|
890a63afb4
|
Merge pull request #12833 from ElderOrb/FB14015_RC66
Close 'goto' app on pressing 'forward' / 'backward' buttons
|
2018-04-09 11:42:17 -07:00 |
|
John Conklin II
|
d281d7b2cb
|
Merge pull request #12819 from Atlante45/fix/location-hostname
Fix location.hostname
|
2018-04-09 09:42:41 -07:00 |
|
John Conklin II
|
be3d5d03cc
|
Merge pull request #12808 from ElderOrb/FB13962_RC66
Fix for auto-reopening of closed query dialogs (aka hack-on-top-of-hack)
|
2018-04-09 09:42:00 -07:00 |
|
Alexander Ivash
|
faddc556d7
|
FB14015 - Go To app does not close when selecting forward and back arrows on desktop
|
2018-04-07 17:57:22 +03:00 |
|
samcake
|
49977d7fc3
|
Merge branch 'workload' of https://github.com/highfidelity/hifi into workload
|
2018-04-06 17:42:45 -07:00 |
|
Sam Gateau
|
476b75488c
|
Merge pull request #12827 from AndrewMeadows/lhf-needsToCallUpdate
Workload: low hanging fruit optimization: don't unneccessarily update() entities
|
2018-04-06 17:38:54 -07:00 |
|
Andrew Meadows
|
9c84f05275
|
rollback change to MaterialEntityItem, we'll fix later
|
2018-04-06 17:32:57 -07:00 |
|
Clement
|
6e7f8a2ef6
|
Fix value collision for baking version
|
2018-04-06 17:24:16 -07:00 |
|
Andrew Meadows
|
353afb47b3
|
more correct needsToCallUpdate() implementations
|
2018-04-06 16:53:08 -07:00 |
|
Andrew Meadows
|
b515fd50fc
|
remove unused data member
|
2018-04-06 16:52:49 -07:00 |
|
samcake
|
694baa81e8
|
removing logging around physics
|
2018-04-06 16:12:02 -07:00 |
|
Andrew Meadows
|
b523b2a81a
|
more correct proxyID validation
|
2018-04-06 15:41:38 -07:00 |
|
Sam Gateau
|
f996989a40
|
Merge pull request #12825 from AndrewMeadows/workload
only add to physics simulation that when necessary
|
2018-04-06 15:29:41 -07:00 |
|
Andrew Meadows
|
2cfb835b56
|
only add to physics simulation that when necessary
|
2018-04-06 15:26:33 -07:00 |
|
Sam Gateau
|
ae0af3ab62
|
Merge pull request #12823 from druiz17/fix-selection-api
fix enableHighlightList and disableHihglightList function for Selection API
|
2018-04-06 15:13:15 -07:00 |
|
Cristian Luis Duarte
|
f556c8d3a7
|
Merge remote-tracking branch 'hifi/master' into android_jump
|
2018-04-06 18:02:30 -03:00 |
|
Dante Ruiz
|
00713ab225
|
fix selection api
|
2018-04-06 14:00:50 -07:00 |
|
John Conklin II
|
02422ba538
|
Merge pull request #12820 from birarda/bug/store-serverless-with-tilde
RC66 - move file ~ expansion from AddressManager to DomainHandler
|
2018-04-06 13:31:01 -07:00 |
|
Andrew Meadows
|
39fcb762a7
|
fix compile warning on linux
|
2018-04-06 13:19:24 -07:00 |
|
Clement
|
dea5382991
|
Fix location.hostname
|
2018-04-06 13:19:07 -07:00 |
|
Andrew Meadows
|
c12ae9f3f0
|
Merge pull request #12821 from samcake/workload
Workload: FIxing the compilation on windows with math constants
|
2018-04-06 13:15:08 -07:00 |
|
John Conklin II
|
fe5e797a24
|
Merge pull request #12816 from SamGondelman/web66
RC66: Possible fix for QML texture leak
|
2018-04-06 13:08:50 -07:00 |
|
samcake
|
34426bb033
|
FIxing the compilation on windows with math constants
|
2018-04-06 12:17:51 -07:00 |
|
Cristian Luis Duarte
|
bd6f0fd59e
|
Make view/rotation control independent of touchUpdate events rate
|
2018-04-06 16:17:28 -03:00 |
|
John Conklin II
|
f6721d4ad0
|
Merge pull request #12802 from birarda/client-only-installer-name
66 fix - installer changes for client only name and clean install
|
2018-04-06 11:53:22 -07:00 |
|
samcake
|
25dc986be0
|
Merge branch 'workload' of https://github.com/highfidelity/hifi into workload
|
2018-04-06 11:30:53 -07:00 |
|
Sam Gateau
|
876082713e
|
Merge pull request #12815 from AndrewMeadows/workload-010
workload: add/remove entities to physics simulation according to workload boundaries
|
2018-04-06 11:30:36 -07:00 |
|
Andrew Meadows
|
a9f5b57681
|
merge 'master' into 'workload-010'
|
2018-04-06 11:11:06 -07:00 |
|
Andrew Meadows
|
da48a5af20
|
fix compile errors and add PhysicsBoundary.cpp file
|
2018-04-06 11:10:23 -07:00 |
|
Stephen Birarda
|
1ff7939735
|
move file ~ expansion from AddressManager to DomainHandler
|
2018-04-06 11:05:17 -07:00 |
|
samcake
|
026e335c1a
|
Merge branch 'workload' of https://github.com/highfidelity/hifi into workload
|
2018-04-06 10:52:38 -07:00 |
|
Stephen Birarda
|
1d76dea9f6
|
Merge pull request #12818 from highfidelity/RC66
Merge back RC66 to master
|
2018-04-06 10:43:01 -07:00 |
|
John Conklin II
|
c8d109854b
|
Merge pull request #12800 from huffman/fix/entity-lock
Remove lock file recovery in entity server
|
2018-04-06 10:04:34 -07:00 |
|
John Conklin II
|
55154b670a
|
Merge pull request #12801 from sethalves/fix-serverless-sharable
fix -- don't tell steam about serverless domain urls
|
2018-04-06 10:04:03 -07:00 |
|
John Conklin II
|
384b0a0f41
|
Merge pull request #12804 from birarda/new-serverless-tutorial
update to serverless tutorial with RC66 fixes
|
2018-04-06 10:03:03 -07:00 |
|
SamGondelman
|
d38dadaf58
|
possible fix for qml texture leak
|
2018-04-06 09:34:00 -07:00 |
|
Andrew Meadows
|
ed1761945c
|
add/remove entities to physics using workload output
|
2018-04-06 07:22:05 -07:00 |
|
Andrew Meadows
|
b96a4ed4be
|
add Space::getRegion(id)
|
2018-04-06 07:20:53 -07:00 |
|
Stephen Birarda
|
a2250a2a6d
|
write an install info ini file to the installation dir
|
2018-04-05 18:52:07 -07:00 |
|
Andrew Meadows
|
89b8ce2b01
|
merge samcake/workload into AndrewMeadows/workload
|
2018-04-05 18:07:17 -07:00 |
|
samcake
|
a5ee211dbf
|
Dirty attempt to capture the owner typefor a payload
|
2018-04-05 18:04:35 -07:00 |
|