Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-17 16:28:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
73234 commits 25 branches 0 tags 1.1 GiB
Commit graph

7623 commits

Author SHA1 Message Date
MuteTab
a99f9310da Add first-run checks for flying settings. 2018-07-19 12:41:24 -07:00
sabrina-shanman
f33ee55f9e Create CollisionPick API 2018-07-19 10:33:21 -07:00
David Rowe
5e624246a8 Fix HMD.mountedChanged() API signal 2018-07-19 13:00:57 +12:00
SamGondelman
845ddda695 parabola-overlay and -avatar intersection, handle case where acceleration == 0 2018-07-17 12:41:03 -07:00
Sam Gondelman
b53772f9ca
Merge pull request #13431 from Cristo86/android_stop_downloads_bg 
Android - Prevent pending downloads to happen when going back to home
 2018-07-12 15:22:56 -07:00
John Conklin II
b59e9f9899
Merge pull request #13582 from Zvork/scale 
Render Scale Resolution applied only to 3D rendering not HUD
 2018-07-12 10:56:03 -07:00
John Conklin II
7ea46e26cf
Merge pull request #13587 from wayne-chen/updateControlsReference-case-9539 
MS9539: Update Controls Reference pages
 2018-07-12 10:53:00 -07:00
John Conklin II
de33ca512f
Merge pull request #13553 from Atlante45/feat/crashpad-mac 
Add Crashpad to Mac
 2018-07-11 19:16:24 -07:00
Wayne Chen
179ba6506e Adding check for WindowsMR to the showHelp menu 2018-07-11 11:56:14 -07:00
Olivier Prat
703fc20856 Separate scale between 3D rendering and HUD 2018-07-11 12:17:36 +02:00
Olivier Prat
9f4fd47b85 Not using render resolution scale in application and display plugin 2018-07-11 10:11:49 +02:00
Wayne Chen
81aac274ed Updating controls reference page 2018-07-10 17:34:03 -07:00
SamGondelman
d2699e8e5b some more attempted cleanup 2018-07-10 10:50:01 -07:00
John Conklin II
81f5631ce9
Merge pull request #13386 from ElderOrb/FB13949 
AvatarApp
 2018-07-09 15:20:18 -07:00
John Conklin II
e6801c303a
Merge pull request #13432 from SimonWalton-HiFi/avatar-identity-request 
Implement AvatarRequestIdentity and use if interface gets unknown avatar data
 2018-07-09 10:07:19 -07:00
Cristian Luis Duarte
be8351dc0d Android - Rollback pause/resume mechanism. Stop server checkIns, reset nodeList before entering background 2018-07-06 20:43:52 -03:00
Clement
23e5dd0d2c annotate with fingerprint immidiately 2018-07-06 15:52:30 -07:00
John Conklin II
01610a1520
Merge pull request #13559 from wayne-chen/fixCopyAddress-case-16444 
Fix AddressManager copyAddress/copyPath functionality
 2018-07-06 14:11:08 -07:00
John Conklin II
6e13b0e141
Merge pull request #13453 from gcalero/web_overlay_android 
Support web3d overlays in android
 2018-07-06 13:02:56 -07:00
Wayne Chen
eb4704620c reverting unintended line from previous debug 2018-07-06 11:06:16 -07:00
Wayne Chen
0facbedbbc adding Q_INVOKABLE method for copying to Application clipboard 2018-07-06 11:03:58 -07:00
Alexander Ivash
929fec731c remove 'Avatar' top level menu & 'Avatar...' item in settings menu per request from Mukul 2018-07-06 21:00:54 +03:00
John Conklin II
7aaf17a3c8
Merge pull request #13496 from thoys/feat/interactive-window 
InteractiveWindow scripting API
 2018-07-06 10:58:12 -07:00
Thijs Wenker
1b63dfa20a - OSX fixes (right camera after coming from native window, disappearing content) 
- Fix show() to show the window after it was minimized
 2018-07-06 17:50:48 +02:00
Wayne Chen
3994ec4176 adding potential fix - moving methods to Application 2018-07-05 17:54:27 -07:00
SamGondelman
7954865141 trying to fix dependency shutdown 2018-07-05 14:34:37 -07:00
John Conklin II
65daee2353
Merge pull request #13513 from vladest/double_asset_server_fix 
Tablet Asset Server dialog was instantiated twice
 2018-07-03 13:14:12 -07:00
Thijs Wenker
d886bc2d9c Merge branch 'master' of github.com:highfidelity/hifi into feat/create/interactive-window 2018-07-03 18:19:48 +02:00
Sam Gateau
96b26c94eb Really add safe check for targetDisplayPLugin 2018-07-03 16:59:40 +02:00
Thijs Wenker
7390983721 introduce scriptable presentationMode instead of automatic mode switching windows 2018-07-03 16:49:49 +02:00
Cristian Duarte
6b5e5702dd Android - implement pause-resume of requests chain in ResourceCache 2018-07-02 20:05:59 -03:00
John Conklin II
3f975cfa84
Merge pull request #13506 from sabrina-shanman/fix-osx-crash-on-exit 
Fix Mac Crashes On Shutdown
 2018-07-02 15:27:26 -07:00
Cristian Duarte
6b3a9def7a Merge branch 'hifi_master' into android_stop_downloads_bg 2018-07-02 17:37:40 -03:00
vladest
0657992e9c Tablet Asset Server dialog was instantiated twice 2018-07-01 19:56:51 +02:00
Gabriel Calero
762e8f4bf0 Refactor WebViewActivity using fragment. Try SlidingDrawer. 2018-06-29 20:43:58 -03:00
sabrina-shanman
9dc03f5013 Destroy GeometryCache explicitly in Application destructor 2018-06-29 10:39:16 -07:00
sabrina-shanman
c849d8e2a8 Merge branch 'mac-shutdown-crash-on-present' into fix-osx-crash-on-exit 2018-06-29 09:37:54 -07:00
Sam Gateau
d543cd0766 Fixing a bug if the last session display pluginis an invalid name, resolve to default 2018-06-29 15:42:19 +02:00
Thijs Wenker
5029767493 InteractiveWindow scripting API 2018-06-28 19:04:08 +02:00
Sam Gondelman
736c56f5f4
Merge pull request #13487 from gcalero/single_account_manager_android 
Remove the duplicated AccountManager used for android
 2018-06-28 09:07:23 -07:00
Gabriel Calero
e15fc787d3 Remove the duplicated AccountManager used for android 2018-06-27 19:04:27 -03:00
Stephen Birarda
e90ea82ef5 move AddressManager to NodeList thread, fix AccountManager invokes 2018-06-27 11:41:37 -07:00
sabrina-shanman
18219464f1 Fix shutdown crash on Mac in Application::onPresent 2018-06-27 09:56:03 -07:00
Seth Alves
d9f8cd46ea
Merge pull request #13415 from ctrlaltdavid/21896 
Zero avatar velocity if protocol version mismatch so that overlays show
 2018-06-27 09:35:15 -07:00
Seth Alves
dcebbada28 fix various crashes-upon-exits 2018-06-26 10:08:44 -07:00
Simon Walton
0dca842102 Add avatar identity requests to analytics 2018-06-22 17:06:33 -07:00
Andrew Meadows
4424a8df11
Merge pull request #13303 from highfidelity/workload 
workload project part 1
 2018-06-20 15:39:01 -07:00
Cristian Luis Duarte
3837952418 Android - Add a clear method on pending downloads and use it when going background 2018-06-20 18:29:04 -03:00
Brad Davis
787fb1b9bd Fix crash in display plugin caused by audio device changed 2018-06-19 16:13:57 -07:00
David Rowe
0e1e44a3f5 Zero avatar velocity if protocol version mismatch so that overlays show 2018-06-19 20:44:53 +12:00
Andrew Meadows
44c3620b6e remove cruft 2018-06-18 17:45:58 -07:00
John Conklin II
a47038d81f
Merge pull request #13381 from hyperlogic/feature/crashpad-thread-id 
Add main & render thread ids to crashpad annotations
 2018-06-18 15:21:04 -07:00
Andrew Meadows
a18ba36dd2 merge 'master' into 'workload' 2018-06-18 13:40:08 -07:00
Andrew Meadows
6d422e4678 Merge 'master' into 'workload' 2018-06-18 10:30:13 -07:00
Gabriel Calero
583c46b3a0 Merge remote-tracking branch 'upstream/master' into breakpad_android 2018-06-15 21:21:03 -03:00
Gabriel Calero
20727378e2 Rename crash handler files 2018-06-15 20:32:10 -03:00
Anthony J. Thibault
2feecf6db8 removed unnecessary setting of 'username' annotation. 2018-06-15 14:56:10 -07:00
Anthony J. Thibault
8ddcff6070 Set username annotation more reliably. 2018-06-15 14:47:02 -07:00
John Conklin II
2483c45f40
Merge pull request #13350 from sabrina-shanman/bulletcollisionrenderonly 
Remove functionality for rendering collision models directly in the Model class
 2018-06-15 14:46:40 -07:00
Anthony J. Thibault
24689224ce removed redundant machine_fingerprent crashpad annotation. 2018-06-15 11:40:45 -07:00
Thijs Wenker
05bc32b3ad Merge branch 'master' of github.com:highfidelity/hifi into merge/triplelexx-21883 
# Conflicts:
#	interface/src/Application.cpp
#	interface/src/scripting/LimitlessVoiceRecognitionScriptingInterface.cpp
 2018-06-15 02:34:29 +02:00
Anthony J. Thibault
84601446bf Add main thread id & machine fingerprint to crashpad annotations 2018-06-14 12:57:30 -07:00
John Conklin II
99b5835098
Merge pull request #13344 from birarda/feat/new-version-numbers 
handle semantic version numbers in interface/sandbox update
 2018-06-13 11:16:56 -07:00
Clement
920263ef49 Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master 2018-06-12 17:00:25 -07:00
Anthony Thibault
027c4f6b9e
Merge pull request #13332 from hyperlogic/bug-fix/large-avatar-little-domain-rc68 
Large avatars should instantly shrink when entering small height domains
 2018-06-12 14:57:07 -07:00
Sam Gateau
f769b63c3d
Merge pull request #13308 from jherico/fix/13677 
Fix for black text rendering white in web elements
 2018-06-11 16:17:31 -07:00
Anthony J. Thibault
f773aef053 Merge branch 'master' into bug-fix/large-avatar-little-domain-rc68 2018-06-11 11:06:21 -07:00
sabrina-shanman
4c39d08358 Remove "Draw Collision Shapes" option from developer physics menu 2018-06-11 11:03:57 -07:00
Stephen Birarda
9506e7edbe check for update for dev-builds, handle semantic version 2018-06-08 17:20:57 -07:00
Stephen Birarda
112abc9d7e
Merge pull request #13148 from birarda/feat/new-version-numbers 
add SHA to PR/master version, add build_type (stable/master/pr/dev)
 2018-06-08 14:44:22 -07:00
Atlante45
83e1db14cf Set UAL default value earlier to be caught by crashpad 2018-06-07 19:40:30 -07:00
Anthony J. Thibault
608575cf17 Large avatars should instantly shrink when entering small height domains 
Also reduce the fudge factor for safeLanding from an additional 50% of avatar's height to 25%.
 2018-06-07 15:31:40 -07:00
John Conklin II
1646f543cd
Merge pull request #13273 from danteruiz/fix-show-overlays-menu 
fixing show overlays menu item on start up
 2018-06-07 11:34:30 -07:00
John Conklin II
3b413d0f72
Merge pull request #13272 from zfox23/MS14615_memoryUsageMinimized 
MS14615: Prevent memory overuse when minimized
 2018-06-07 11:16:56 -07:00
Sam Gateau
146732a20f
Merge pull request #13317 from jherico/feature/mac_resources 
Use binary resources on OSX
 2018-06-07 09:38:00 -07:00
Zach Fox
7f04506020
Merge pull request #13318 from zfox23/MS14925_doubleCallingDisplayChanged 
Fix MS14925: Don't double-emit signal for display plugin change
 2018-06-07 09:32:50 -07:00
Bradley Austin Davis
fa51c15849 Use binary resources on OSX 2018-06-06 15:10:52 -07:00
Zach Fox
6869718025 Fix MS14925: Don't double-call signal for display plugin change 2018-06-06 14:41:33 -07:00
Seth Alves
6c8e514367
Merge pull request #13224 from danteruiz/fix-key-conflicts 
Allow using the key 1,2,3 to swicth views and also to enter text in web entity or overlay
 2018-06-06 11:08:04 -07:00
Bradley Austin Davis
e7e9ca4b2b Disable chromium distance field text rendering on ATI GPUs 2018-06-05 14:16:03 -07:00
Ken Cooke
83dda420ba
Merge pull request #13256 from danteruiz/remove-dead-code 
remove dead code in Application::keyPressEvent
 2018-06-05 09:16:28 -07:00
Andrew Meadows
4329ea5240 Merge master' into 'workload' 2018-06-04 16:11:25 -07:00
Sam Gondelman
38e7b31c32
Merge pull request #13176 from SimonWalton-HiFi/low-connectivity 
Try reducing concurrent downloads
 2018-06-04 14:48:46 -07:00
John Conklin II
378e84b7ce
Merge pull request #13257 from danteruiz/rc68-reload-scripts 
adding back reload scripts shortcut and clean up AboutUtil(RC68)
 2018-06-01 15:10:28 -07:00
Zach Fox
96858c9586 MS15529: Add secondary camera snapshot notification flag 2018-06-01 13:38:41 -07:00
John Conklin II
194c33bf19
Merge pull request #13254 from danteruiz/add-back-reload-scripts 
adding back reload scripts shortcut and clean up AboutUtil
 2018-06-01 09:31:13 -07:00
Dante Ruiz
caa7f64865 fixing show overlays menu item 2018-05-31 10:58:04 -07:00
Zach Fox
259803f856 MS14615: Prevent memory overuse when minimized 2018-05-31 10:30:25 -07:00
Andrew Meadows
003e444246 Merge branch 'master' into 'workload' 2018-05-30 16:04:13 -07:00
John Conklin II
6095a3b319
Merge pull request #13082 from jherico/feature/shader_cache 
Shader load time performance optimiziations
 2018-05-30 13:55:34 -07:00
Gabriel
6fa58fce1f Update Application.cpp 
Remove the mic bar for android
 2018-05-30 15:40:05 -03:00
Dante Ruiz
3942f397d0 adding back reload scripts 2018-05-30 11:15:47 -07:00
Dante Ruiz
c4358aad81 remove dead code in Application::keyPressEvent 2018-05-30 07:33:32 -07:00
Dante Ruiz
ea10dc176a adding back reload scripts 2018-05-29 17:38:02 -07:00
Gabriel
cf499ca047
Update Application.cpp 
Remove the mic bar for android
 2018-05-29 16:42:09 -03:00
NissimHadar
9ed8c04097 Merge branch 'master' of github.com:highfidelity/hifi into fixCameraMode 2018-05-24 17:40:21 -07:00
Anthony Thibault
eae5215d94
Merge pull request #13206 from ctrlaltdavid/21872-c 
JSDoc fixes
 2018-05-24 16:44:55 -07:00
Bradley Austin Davis
3beb77694f Cached shader binaries and uniform data for shaders 2018-05-24 12:42:33 -07:00
Stephen Birarda
2cb7c9cc62 add a BUILD_TYPE to BuildInfo, fix conditional 2018-05-24 12:04:32 -07:00
Stephen Birarda
55bf70991b cleanup wording and formatting for version in window title 2018-05-24 12:03:03 -07:00
Stephen Birarda
c3595a3216 pass STABLE_BUILD instead of BUILD_BRANCH through cmake 2018-05-24 12:03:03 -07:00
samcake
40370f860a Merge branch 'workload' of https://github.com/highfidelity/hifi into workload 2018-05-23 17:26:08 -07:00
Andrew Meadows
d50da2babc Merge 'master' into 'workload' 2018-05-23 14:51:05 -07:00
Dante Ruiz
c2ceb48a28 fixing key conflicts 2018-05-23 14:16:05 -07:00
NissimHadar
06203d44d8 Correct Camera.mode command. 2018-05-22 17:08:28 -07:00
Simon Walton
f702374db3 Just have one const for concurrent downloads 2018-05-22 10:16:44 -07:00
Dante Ruiz
249d22b4b4 Merge branch 'master' of github.com:highfidelity/hifi into menu-updates 2018-05-21 10:31:24 -07:00
Sam Gondelman
6eb6a5b767
Merge pull request #13197 from gcalero/your_last_location 
Add "Your Last Location" to Android Home
 2018-05-21 09:28:56 -07:00
David Rowe
6d4f704279 Regularize some JSDoc usage 2018-05-21 09:32:10 +12:00
druiz17
f2807e38f9 fix goto shortcut 2018-05-19 17:36:46 -07:00
Dante Ruiz
3b59af3ed7 Merge branch 'master' of github.com:highfidelity/hifi into menu-updates 2018-05-18 16:42:31 -07:00
Sam Gateau
07f1ab8c98
Merge pull request #13194 from SamGondelman/resolution 
Fix Scale Resolution option
 2018-05-18 15:23:01 -07:00
Gabriel Calero
7a6b7b8ba3 Add Your Last Location in Android Home 2018-05-18 12:26:41 -03:00
Andrew Meadows
a23126a6b2 Merge 'master' into 'workload' 2018-05-18 07:38:02 -07:00
SamGondelman
c57c15f22c fix resolution option 2018-05-17 16:58:35 -07:00
Sam Gondelman
74840d2130
Merge pull request #12935 from gcalero/android_new_login 
Android new login
 2018-05-17 15:53:25 -07:00
vladest
eb25601856 Return back LOD tools 2018-05-17 20:41:50 +02:00
Gabriel Calero
5a73da6fdf Bugfix: stop audio when app starts 2018-05-17 14:05:49 -03:00
Gabriel Calero
8741c5e6a4 Make haptic pulse duration configurable in VirtualPadDevice 2018-05-17 11:37:13 -03:00
Dante Ruiz
f8e9afb115 fixing damn build issues 2018-05-16 15:08:09 -07:00
Dante Ruiz
3be4b01d2c move overlays menu back 2018-05-16 14:36:55 -07:00
Zach Fox
486f33b4bd Merge branch 'master' of github.com:highfidelity/hifi into MS15103_snapFolderCrash 2018-05-16 14:14:35 -07:00
Dante Ruiz
fbc3d97af3 adding back overlay menu and avatar size 2018-05-16 13:48:29 -07:00
Zach Fox
585957409d
Merge pull request #13141 from zfox23/spectatorCameraImprovements 
Spectator Camera V2
 2018-05-16 13:38:07 -07:00
Zach Fox
f8215b5999 Fix final? crash 2018-05-16 11:05:21 -07:00
Zach Fox
c34605f686 GIF snapshots using the Snap app are still weird, but the bug is fixed 2018-05-16 10:15:51 -07:00
Zach Fox
012ae741a5 Fix MS15103: Interface crashes on snap if snap dir is deleted 2018-05-16 09:52:19 -07:00
Simon Walton
b43cb5b86f Take out VS's auto reformatting 2018-05-16 09:36:55 -07:00
Gabriel Calero
5afc9c6df3 Merge remote-tracking branch 'upstream/master' into android_new_login 2018-05-16 12:45:17 -03:00
vladest
5127cb0ea6 Merge branch 'master' into menu-updates 2018-05-16 14:37:00 +02:00
John Conklin II
aca261af3e
Merge pull request #12939 from Cristo86/android_places_goto 
Android Search & Go To
 2018-05-15 16:43:38 -07:00
Simon Walton
f4d24a3d0e Quiet MacOS warning 2018-05-15 16:40:21 -07:00
Simon Walton
2b30c1389e Try reducing concurrent downloads for Android 2018-05-15 14:30:08 -07:00
vladest
7ea6181520 Merge branch 'master' into menu-updates 2018-05-15 21:54:45 +02:00
Gabriel Calero
b80597a436 Restore display plugin activation/deactivation 2018-05-15 15:51:11 -03:00
Zach Fox
bccaa2dbe5 Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements 2018-05-15 11:50:38 -07:00
Gabriel Calero
306b8cc68a Set HomeActivity transparent to avoid texture corruption (black and white) 2018-05-15 15:14:17 -03:00
Andrew Meadows
c7c4324b3c Merge 'master' into 'workload' 2018-05-15 10:22:50 -07:00
vladest
fee3cc0aca Implemented backend for About dialog 2018-05-15 15:49:20 +02:00
Zach Fox
a54ce96ac2 Clement's CR 2018-05-14 17:46:58 -07:00
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
vladest
ab1a89a6f9 Merge branch 'master' into menu-updates 2018-04-19 21:02:30 +02:00
Sam Gateau
1e086332cc
Merge pull request #12911 from jherico/feature/splash 
Pre-requisite changes for splash screen rendering
 2018-04-19 09:19:05 -07:00
Cristian Luis Duarte
5be9959424 Merge remote-tracking branch 'gcgithub/android_goto_splash' into android_places_goto 2018-04-19 12:11:29 -03:00
Gabriel Calero
c8fe45eb8f Remove debug statements and unused code. Put JNI code in a separated file. 2018-04-19 11:41:59 -03:00
vladest
3d8d0bfa07 Added hot keys enumeration for display menu 2018-04-19 12:31:14 +02:00
vladest
ba4ef74313 Remove View->Overlays menu 2018-04-19 12:01:58 +02:00
Stephen Birarda
c4ad93bafb
Merge pull request #12782 from SimonWalton-HiFi/qregexp 
Replace LogHandler repeated regex scheme with assigned ID tracking scheme
 2018-04-18 17:28:48 -07:00
Cristian Luis Duarte
9c44be3557 Merge remote-tracking branch 'gcgithub/android_new_login' into android_places_goto 2018-04-18 16:55:08 -03:00
vladest
b5071d28e8 Merge branch 'master' into menu-updates 2018-04-18 21:10:57 +02:00
Gabriel Calero
120de92c9e Add login activity 2018-04-18 15:52:02 -03:00