NissimHadar
d4d2f3c957
Moved ownership of test location into the Test Scripting class.
2018-05-14 16:32:04 -07:00
Zach Fox
43254e2981
Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements
2018-05-14 15:12:44 -07:00
NissimHadar
5f219e27f7
Merge branch 'master' of github.com:highfidelity/hifi into perfTest_1
2018-05-14 10:35:48 -07:00
vladest
f8ebe7e669
remoed no more used LOD dialogs. Fixed Slider properties min and max settings
2018-05-12 16:01:43 +02:00
vladest
0a67fc3b36
Merge conflicts
2018-05-12 11:24:35 +02:00
Gabriel Calero
db460e9856
Put back the worker thread for account manager in android
2018-05-11 16:09:40 -03:00
John Conklin II
5cd225e4de
Merge pull request #12947 from jherico/feature/splash2
...
Additional work on splash screen
2018-05-11 11:26:37 -07:00
NissimHadar
1364f4391d
Can store JSON object.
2018-05-10 18:02:44 -07:00
Seth Alves
826c427e2a
trying to sort-out audio-stream logging
2018-05-10 15:42:59 -07:00
Seth Alves
32d10641dc
don't enable so much logging when 'verbose logging' is turned on
2018-05-10 14:41:54 -07:00
Gabriel Calero
a1a48d9b9e
Merge remote-tracking branch 'upstream/master' into android_places_goto
2018-05-10 18:24:26 -03:00
Zach Fox
ce575d367a
Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements
2018-05-10 09:31:02 -07:00
vladest
62aa2df836
Merge branch 'master' into menu-updates
2018-05-10 10:36:38 +02:00
Zach Fox
44cfa95830
Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements
2018-05-09 15:01:24 -07:00
Seth Alves
16e832ac08
use setFilterRules rather than specifying each logging category to suppress
2018-05-09 13:01:49 -07:00
Seth Alves
7466d08f1f
more suppression of logging
2018-05-09 13:01:49 -07:00
Howard Stearns
bf466344ee
Merge pull request #13135 from zfox23/MS14951_fixSnapshotHotkeySound
...
MS14951: Fix Snapshot hotkey sound playback
2018-05-09 11:07:46 -07:00
Sam Gateau
17350a79dd
Merge pull request #13046 from NissimHadar/commandLineParametersForAutotester
...
Command line parameters for autotester
2018-05-09 10:51:31 -07:00
Gabriel Calero
843282739e
Remove unused includes and white spaces
2018-05-09 14:16:51 -03:00
Thijs Wenker
a42491ded7
Merge pull request #13055 from misslivirose/remove-help-ftue
...
Do not open help on first run
2018-05-09 18:48:05 +02:00
Zach Fox
06c6f55069
MS14951: Fix Snapshot hotkey sound playback
2018-05-09 09:35:42 -07:00
Gabriel Calero
5e337e90a3
Deactivates display plugin when qt app goes to background
2018-05-08 16:55:04 -03:00
Gabriel Calero
da69c9d077
Make qt application not stop in background and remove separete thread
2018-05-08 15:45:33 -03:00
NissimHadar
eb14658bc5
Per Austin's comments.
2018-05-08 11:13:06 -07:00
NissimHadar
8ad13826bd
Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester
2018-05-07 13:11:39 -07:00
NissimHadar
2e51a66441
Use 'standard' format for command line parameter with multiple options.
2018-05-07 13:01:18 -07:00
Gabriel Calero
9b63b76b68
Merge remote-tracking branch 'upstream/master' into android_new_login
2018-05-07 16:06:02 -03:00
Gabriel Calero
66b975192d
Merge remote-tracking branch 'cristo86/android_places_goto' into android_new_login
2018-05-07 15:56:43 -03:00
John Conklin II
6ac43c34c2
Merge pull request #13032 from druiz17/fix-spamming-reset-sensors
...
don't spam resetSensors function when holding down Qt::Key_Apostrophe
2018-05-07 10:52:51 -07:00
NissimHadar
481eddb2a3
Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester
2018-05-07 08:24:03 -07:00
vladest
1794113f37
Check global switch as well
2018-05-06 12:51:59 +02:00
vladest
c7ab1f3dbf
Merge branch 'master' into menu-updates
2018-05-05 20:48:40 +02:00
vladest
5a5bfcfe02
Merge branch 'master' into menu-updates
2018-05-05 07:11:39 +02:00
Bradley Austin Davis
38f43bdc68
Disable current splash frame implementaton
2018-05-04 16:40:05 -07:00
Bradley Austin Davis
803bd284a6
Alternate shader
2018-05-04 16:40:05 -07:00
Brad Davis
72526781d9
Additional work on splash screen
2018-05-04 16:40:05 -07:00
Cristian Luis Duarte
03ca427234
Merge remote-tracking branch 'hifi/master' into android_places_goto
2018-05-04 20:18:15 -03:00
Stephen Birarda
ec354620db
Merge pull request #12956 from huffman/feat/client-texture-selection-baking
...
Add support for client texture selection
2018-05-04 16:14:43 -07:00
Gabriel Calero
087c6ff730
Patch for secondary camera assert error on Android
2018-05-04 18:45:39 -03:00
Cristian Luis Duarte
8c96d2be3c
Patch for secondary camera assert error on Android
2018-05-04 18:44:07 -03:00
Clement
ad60a79180
Fix for android builds
2018-05-04 14:43:28 -07:00
Clement
b04c5bd0db
CR
2018-05-04 14:43:16 -07:00
Cristian Luis Duarte
9f5365a277
Merge remote-tracking branch 'hifi/master' into android_places_goto
2018-05-04 18:38:08 -03:00
Gabriel Calero
1330132a32
Merge remote-tracking branch 'upstream/master' into android_new_login
2018-05-04 18:35:51 -03:00
Liv Erickson
ee0af079cf
merge from upstream master and fix conflict
2018-05-04 14:34:38 -07:00
NissimHadar
2311fa33fb
Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester
2018-05-04 14:13:43 -07:00
Gabriel Calero
868b58e66d
Un-expose Application from javascript. Restore displayplugin deactivation when goes to background
2018-05-04 18:01:01 -03:00
vladest
9e5dbf9a99
Snapshot notification sound settings
2018-05-04 22:01:44 +02:00
NissimHadar
aef5ea0936
Correct usage of the test script URL.
2018-05-04 12:30:13 -07:00
Zach Fox
1da840984b
Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements
2018-05-04 10:24:28 -07:00
Clement
487a63025f
Fix warning
2018-05-03 18:19:52 -07:00
Clement
d87cd2af6e
Update avatar query names
2018-05-03 18:19:30 -07:00
Clement
27c471ee97
Move all wire frustums to conical frustums
2018-05-03 18:19:29 -07:00
Clement
e400eb4ed2
Rename ViewFrustum packets to AvatarQuery
2018-05-03 18:19:29 -07:00
Stephen Birarda
21396287a4
Merge pull request #12990 from Atlante45/fix/spec-cam-av
...
Add support for multifrustum avatar queries
2018-05-03 18:18:51 -07:00
Stephen Birarda
31d5633b4a
Merge pull request #12930 from Atlante45/fix/spec-cam
...
Add support for multifrustum entity queries
2018-05-03 18:13:51 -07:00
NissimHadar
2c6c0a25fc
Add testSnapshotLocation parameter to takeSnapshot.
2018-05-03 15:15:30 -07:00
NissimHadar
fe9c6052f7
Added quitWhenFinished parameter to the command line.
2018-05-03 15:02:11 -07:00
NissimHadar
3a5425122b
Shutdown interface when test script finishes.
2018-05-03 14:31:01 -07:00
Zach Fox
c3d3cdca3d
Add cubemap output format
2018-05-03 12:57:00 -07:00
NissimHadar
46f461dcdb
Don't display crash message if running from command line with a test script.
2018-05-03 11:20:37 -07:00
NissimHadar
8b3c451f91
Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester
2018-05-03 08:25:19 -07:00
samcake
1dc6988f41
Merge branch 'workload' of https://github.com/highfidelity/hifi into workload
2018-05-02 17:36:26 -07:00
Andrew Meadows
99a75c5a87
Merge 'master' into 'workload'
2018-05-02 17:28:36 -07:00
NissimHadar
5cbb8674ec
Use default parameter for saveSnapshot().
2018-05-02 14:45:28 -07:00
Gabriel Calero
88f0c2d700
Merge remote-tracking branch 'upstream/master' into android_new_login
2018-05-02 18:42:10 -03:00
John Conklin II
f43b9ee7e8
Merge pull request #12960 from hyperlogic/feature/bullet-debug-draw
...
Added items to the developer menu for debugging physics
2018-05-02 14:25:09 -07:00
NissimHadar
83846aec04
Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester
2018-05-02 14:17:22 -07:00
NissimHadar
e0b16dfe03
Allow use of --url command line argument in test mode.
2018-05-02 14:17:01 -07:00
Cristian Luis Duarte
843aa9e261
Merge remote-tracking branch 'hifi/master' into android_places_goto
2018-05-02 18:06:56 -03:00
Gabriel Calero
d0ab81d1f9
Merge remote-tracking branch 'upstream/master' into android_new_login
2018-05-02 17:00:32 -03:00
Cristian Luis Duarte
c460f8bf1e
Merge remote-tracking branch 'hifi/master' into android_places_goto
2018-05-02 16:35:13 -03:00
Gabriel Calero
4dce62cc2e
Merge remote-tracking branch 'upstream/master' into android_goto_splash
2018-05-02 16:27:41 -03:00
John Conklin II
7a5fce4315
Merge pull request #12991 from luiscuenca/avatarScript
...
Avatar Scripts
2018-05-02 12:23:13 -07:00
luiscuenca
689fbd2da0
added requested changes
2018-05-02 11:09:17 -07:00
Anthony J. Thibault
4fa9af5534
Added items to the developer menu for debugging physics
...
Hooked up Bullet's internal debug draw functionality to our client.
Under the Developer > Physics Menu there are five new items:
* Show Bullet Collision - will draw all collision shapes in wireframe. WARNING: can be slow on large scenes.
* Show Bullet Bounding Boxes - will draw axis aligned bounding boxes around all physics shapes.
* Show Bullet Contact Points - will draw all contact points where two or more objects are colliding.
* Show Bullet Constraints - will render wire frame axes for each constraint connecting bodies together.
* Show Bullet Constraint Limits - will render the joint limits for each constraint.
2018-05-02 10:51:00 -07:00
Gabriel Calero
c15ef56d90
Merge remote-tracking branch 'upstream/master' into android_goto_splash
2018-05-02 14:38:10 -03:00
Gabriel Calero
e83f1a8ec7
Merge branch 'android_new_login' of https://github.com/gcalero/hifi into android_new_login
2018-05-02 12:20:23 -03:00
Gabriel Calero
0f08bd8fa1
Use a single AccountManager for android.
2018-05-02 12:11:11 -03:00
Gabriel Calero
3a1bfefc22
Merge remote-tracking branch 'upstream/master' into android_new_login
2018-05-02 10:09:56 -03:00
Clement
a283d28686
Send number of frustums in packet
2018-05-01 18:03:21 -07:00
Clement
ddde0228ba
Fix AC not sending Avatar Mixer a frustum
2018-05-01 18:03:21 -07:00
Clement
1b2b70b769
Send both frustums to Avatar Mixer
2018-05-01 18:03:21 -07:00
Atlante45
0820ef3c95
Account for secondary view when deciding to query
2018-05-01 18:02:29 -07:00
Clement
4c90763236
Correctly update secondary camera frustum
2018-05-01 18:02:29 -07:00
Clement
fea49744ed
Add comment for future work
2018-05-01 18:02:29 -07:00
Clement
98cf48694e
Expose secondary camera to game logic
2018-05-01 18:02:29 -07:00
Clement
49fad3d868
EntityServer traversal aware of all ViewFrustums
2018-05-01 18:02:29 -07:00
Ryan Huffman
24ac342c6b
Add support for client texture selection
2018-05-01 14:11:31 -07:00
vladest
aef62d09c7
Merge branch 'master' into menu-updates
2018-05-01 21:47:46 +02:00
samcake
b3408ae4c0
Merge branch 'master' of https://github.com/highfidelity/hifi into upstream-workload
2018-05-01 11:39:54 -07:00
NissimHadar
6d8eee6b32
Merge branch 'commandLineParametersForAutotester' of github.com:NissimHadar/hifi into commandLineParametersForAutotester
2018-04-30 17:19:29 -07:00
luiscuenca
50ca09b3b4
minor fixes
2018-04-30 16:26:04 -07:00
Zach Fox
aafcf056c4
Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements
2018-04-30 12:36:00 -07:00
Zach Fox
a2b84c0fbb
It's working!!
2018-04-30 12:11:46 -07:00
luiscuenca
2de982a5a2
Added script types and better script reload
2018-04-30 12:04:35 -07:00
Liv Erickson
b994776ebd
do not open help on first run
2018-04-30 12:01:37 -07:00
Cristian Luis Duarte
401bf2f2a4
Merge remote-tracking branch 'hifi/master' into android_places_goto
2018-04-30 14:38:32 -03:00
John Conklin II
acf5ffc5ba
Merge pull request #12970 from sethalves/backtrace-annotations-1
...
Backtrace Attributes
2018-04-30 10:07:11 -07:00
vladest
be22f49c32
Merge branch 'master' into menu-updates
2018-04-28 20:22:28 +02:00
Zach Fox
1b29946a48
I feel so close; why isn't this variable capturing?
2018-04-27 17:26:05 -07:00
NissimHadar
cf9b089a3c
Added option to set snapshot location (for this execution only) from the command line.
2018-04-27 17:18:16 -07:00
samcake
023941a133
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-27 15:19:23 -07:00
John Conklin II
dd32ca33a5
Merge pull request #12957 from sethalves/quiet-logging
...
Quiet logging
2018-04-27 14:59:38 -07:00
Dante Ruiz
290c31d916
don't spam resetSensors
2018-04-27 11:33:45 -07:00
samcake
593c452671
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-27 09:33:06 -07:00
samcake
3ab0458d3a
Trying to expose an array to js
2018-04-26 17:45:48 -07:00
vladest
3296ae0db8
Merge branch 'master' into menu-updates
2018-04-26 22:21:40 +02:00
Stephen Birarda
bc4ce12e64
Merge pull request #13008 from huffman/fix/download-correct-installer
...
Fix update installer URLs and add installer info to user activity data
2018-04-26 11:32:22 -07:00
Seth Alves
5e790d4898
include machine_fingerprint
2018-04-26 09:49:20 -07:00
Seth Alves
64be0a547c
hook up several annotations for crash reporter
2018-04-26 08:49:45 -07:00
Ryan Huffman
4c8b8d8442
Improve installer campaign+type for updates and user activity data
2018-04-26 08:32:18 -07:00
luiscuenca
12f578c93c
More fixes
2018-04-25 19:46:31 -07:00
luiscuenca
e0770f06b1
Add scripts to Model Packager
2018-04-25 19:35:26 -07:00
luiscuenca
165c3214a7
Avatar Scripts
2018-04-24 18:43:53 -07:00
samcake
33bbbcef83
Merging with master
2018-04-24 11:49:34 -07:00
Gabriel Calero
55a946c6c7
Fix non-android builds(performHapticFeedback)
2018-04-24 14:48:41 -03:00
Gabriel Calero
51f9b763ff
Merge remote-tracking branch 'origin/android_goto_splash' into android_new_login
2018-04-24 13:18:28 -03:00
Gabriel Calero
103e9f92fa
Add haptic feedback to back, view and mic buttons
2018-04-24 11:56:01 -03:00
Brad Davis
861200db27
Attempt to shutdown web surfaces more consistently
2018-04-23 14:32:38 -07:00
Gabriel Calero
8923c16b08
Merge remote-tracking branch 'upstream/master' into android_new_login
2018-04-23 17:04:06 -03:00
Gabriel Calero
74e38882f7
Refactor using Android fragments. Complete drawer menu. Add Privacy Policy.
2018-04-23 17:01:34 -03:00
Gabriel Calero
ccb5e1e06c
Commenting out display plugin activation/desactivation
2018-04-23 15:29:51 -03:00
Cristian Luis Duarte
c33f1fbbb1
Merge remote-tracking branch 'hifi/master' into android_places_goto
2018-04-23 15:12:56 -03:00
Seth Alves
1dbcbbcced
cleanups
2018-04-23 11:05:06 -07:00
Gabriel Calero
001cd5e937
Merge remote-tracking branch 'upstream/master' into android_goto_splash
2018-04-23 14:25:26 -03:00
samcake
990ee83f04
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-23 10:07:58 -07:00
Sam Gateau
7842ee8eac
Merge pull request #12962 from SamGondelman/menu
...
Android: Hide menu and fix shader compilation
2018-04-23 09:51:20 -07:00
Cristian Luis Duarte
20d91b13dd
Merge remote-tracking branch 'hifi/master' into android_places_goto
2018-04-23 13:17:53 -03:00
Sam Gateau
99a0e42b5d
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-22 20:26:49 -07:00
vladest
4de9969f36
Merge branch 'master' into menu-updates
2018-04-21 20:22:48 +02:00
David Rowe
34d0a892a0
Point to example using Hardware.Application item
2018-04-21 15:01:46 +12:00
samcake
b554aec317
Trying more drastic changes and learnign to use std::chrono the right way
2018-04-20 17:53:24 -07:00
David Rowe
748052614f
Doc review
2018-04-21 12:45:00 +12:00
SamGondelman
d59f368ad6
hide menu, fix shaders
2018-04-20 17:38:38 -07:00
Seth Alves
6fc02638d7
control verbose logging with a menu-item in developer menu
2018-04-20 16:08:57 -07:00
Seth Alves
bec39369f7
remove some uncatagorized logging, suppress some categories by default
2018-04-20 16:08:57 -07:00
David Rowe
7087abd201
Merge branch 'master' into 21815
2018-04-21 10:49:56 +12:00
Cristian Luis Duarte
8235f999d8
Merge remote-tracking branch 'origin/master' into android_places_goto
2018-04-20 17:53:50 -03:00
samcake
3d651de797
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-20 13:20:19 -07:00
Seth Alves
c20346ca53
Merge pull request #12937 from SamGondelman/startup
...
Make Audio.cpp threadsafe
2018-04-20 11:36:08 -07:00
SamGondelman
3b4b43cf66
try to fix audio crash on startup
2018-04-20 10:23:47 -07:00
Cristian Luis Duarte
55e64ceb55
Merge branch 'mm_1e08633' into android_places_goto
2018-04-20 13:32:23 -03:00
Cristian Luis Duarte
77caa4d402
Merge branch 'mm_c8bef86' into android_places_goto
2018-04-20 12:26:38 -03:00
Sam Gateau
cfaf75e196
Using the std::chrono to measure the physics time
2018-04-19 23:28:32 -07:00
Gabriel Calero
adfbaac18f
Merge remote-tracking branch 'upstream/master' into android_goto_splash
2018-04-19 19:40:00 -03:00
Cristian Luis Duarte
dc321e4cd7
Merge remote-tracking branch 'gcgithub/android_goto_splash' into android_places_goto
2018-04-19 18:46:44 -03:00
Gabriel Calero
f2184bf456
Handle android back button. Remove unused resources. Fix compilation errors.
2018-04-19 17:31:25 -03:00
samcake
a6bd589f4f
Merging upstream
2018-04-19 12:20:10 -07:00
vladest
b191ad866f
Merge fixes
2018-04-19 21:04:11 +02:00
