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 |
|