Cristian Luis Duarte
8e7d14a8e3
Android - Search - Search icon and clear button + UI background matches design
2018-04-23 13:16:27 -03:00
Cristian Luis Duarte
5499787385
Android - TMP PATCH - Do not deactivate DisplayPlugin as it makes the black screen problem
2018-04-20 19:26:53 -03:00
Cristian Luis Duarte
8235f999d8
Merge remote-tracking branch 'origin/master' into android_places_goto
2018-04-20 17:53:50 -03:00
John Conklin II
4705472960
Merge pull request #12889 from Atlante45/fix/threaded-crashes
...
Fix threaded force crashes
2018-04-20 13:20:40 -07:00
Seth Alves
c20346ca53
Merge pull request #12937 from SamGondelman/startup
...
Make Audio.cpp threadsafe
2018-04-20 11:36:08 -07:00
Stephen Birarda
7d68d5fd17
Merge pull request #12779 from birarda/cve/brace-expansion
...
update to latest electron version for server console
2018-04-20 10:53:07 -07:00
Seth Alves
ba43640950
Merge pull request #12785 from birarda/bug/xcode-warnings
...
fix some xcode warnings for unnecessary captured this
2018-04-20 10:30:27 -07:00
Seth Alves
512b1911eb
Merge pull request #12858 from ctrlaltdavid/21836
...
Update location.hostname JSDoc per serverless domains
2018-04-20 10:27:09 -07:00
SamGondelman
3b4b43cf66
try to fix audio crash on startup
2018-04-20 10:23:47 -07:00
John Conklin II
7378c87ade
Merge pull request #12690 from SimonWalton-HiFi/hmac-auth
...
Change packet authentication to use HMAC
2018-04-20 09:54:25 -07:00
John Conklin II
92bf99f436
Merge pull request #12786 from huffman/fix/node-list-connections
...
Fix avatars not coming back when briefly disconnected from avatar mixer
2018-04-20 09:53:50 -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
Ken Cooke
a9c5edcb2f
Merge pull request #12942 from kencooke/audio-devices-crfix
...
Minor changes to meet coding standard
2018-04-20 08:20:32 -07:00
Simon Walton
377fc6d6c6
Revert to old packet version for ICE packets
...
Some ICE (& STUN) packets were using the default version,
which we bumped for the HMAC change. This commit breaks
out the switch for them and reverts to 17.
2018-04-19 16:55:32 -07:00
David Rowe
8ade4f34f4
Tweak wording
2018-04-20 10:11:01 +12:00
David Rowe
0552a7242a
Further JSDoc updates for serverless domains
2018-04-20 09:52:35 +12: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
David Rowe
08defea755
Merge branch 'master' into 21836
2018-04-20 09:20:56 +12:00
John Conklin II
11f509e57a
Merge pull request #12873 from Zvork/haze
...
Fix for weird color shifting of teleportation target in Rust domain
2018-04-19 14:11:47 -07:00
Ryan Huffman
bef4eb1d05
Increase packet version for Ping
2018-04-19 14:04:17 -07:00
MiladNazeri
6b5ed27559
Merge pull request #12926 from highfidelity/MiladNazeri-patch-1
...
Fix QT typo
2018-04-19 14:01:25 -07:00
MiladNazeri
7e780ed55a
Merge pull request #12915 from ctrlaltdavid/21849
...
Add Entities materialData JSDoc
2018-04-19 13:49:24 -07:00
Gabriel Calero
f2184bf456
Handle android back button. Remove unused resources. Fix compilation errors.
2018-04-19 17:31:25 -03:00
Cristian Luis Duarte
af785d6072
Android - Search - Cleanup tabs code and code in general. Show 'no places' message when no results from search.
2018-04-19 17:22:53 -03:00
Cristian Luis Duarte
8249d445c5
Android - Search - Remove unused buttons, add text background, search hint italic
2018-04-19 16:06:59 -03:00
Howard Stearns
6d151f022d
Merge pull request #12910 from zfox23/MS12217_letterboxMessageFix
...
Only dismiss letterbox when clicking on grey areas
2018-04-19 11:47:10 -07:00
Gabriel Calero
a0b5d9a78d
Rename openGotoActivity to openAndroidActivity
2018-04-19 14:33:38 -03:00
Seth Alves
6f420ffae2
Merge pull request #12936 from druiz17/more-tablet-changes
...
Change tablet model and spawn position
2018-04-19 10:25:34 -07:00
Sam Gateau
f87bfc14de
Merge pull request #12898 from kitely/emissivemap-relative-path
...
In Material resources, support relative paths for 'emissiveMap'
2018-04-19 10:25:02 -07:00
John Conklin II
5ef90b242e
Merge pull request #12925 from thoys/fix/create-errorOnShutdown
...
Create app: Save light selection menu option properly
2018-04-19 10:16:40 -07:00
John Conklin II
cad4d45941
Merge pull request #12871 from Atlante45/fix/dead-octree-code
...
Remove dead Octree code
2018-04-19 09:58:20 -07: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
Cristian Luis Duarte
c71fa6add5
Android - Use images in domains list
2018-04-19 11:47:11 -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
Ken Cooke
764aa00069
Coding standard fixes
2018-04-19 07:33:14 -07:00
Olivier Prat
c8bef8651f
Fixed weird specular on hair an teleportation target! Was a stupid mistake...
2018-04-19 10:04:38 +02:00
Cristian Luis Duarte
e784d45b24
Android Search - Enter goes to what was typed in the search field (uses it as an address)
2018-04-18 21:40:37 -03: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
0ae564b9b6
Android - Home screen has search. First implementation that retrieves 10 pages of concurrency from the user_stories API and allows filtering
2018-04-18 21:24:58 -03:00
Zach Fox
e01e7cc7bc
Be a bit more efficient
2018-04-18 16:34:02 -07:00
John Conklin II
e557e0ae52
Merge pull request #12844 from druiz17/feature-entity-highlighting
...
Highlight grabbable and equippable entities.
2018-04-18 15:35:46 -07:00
John Conklin II
51a98961a6
Merge pull request #12920 from thoys/fix/create-dontCloneOthersAvatarEntities
...
edit.js - remove ability to clone non-owned avatar-entities
2018-04-18 15:27:09 -07:00
Clement
a8d6a4e0b6
CR
2018-04-18 15:05:49 -07:00
John Conklin II
87f60e1e25
Merge pull request #12894 from sethalves/fix-tractor-action-crazy
...
fix bug that caused tractor action to go crazy
2018-04-18 14:13:56 -07:00
John Conklin II
eedc8a8c0a
Merge pull request #12929 from misslivirose/fix/misc-edit-bugs
...
Fix edit icon behavior
2018-04-18 13:46:38 -07:00
Zach Fox
e0012ed5dc
Merge pull request #12924 from zfox23/MS12292_snapshotResourcesPath
...
Fix paths to various Snapshot resource files
2018-04-18 13:44:53 -07:00
Clément Brisset
482f8ddbff
Merge pull request #12913 from birarda/bug/login-no-perms
...
delay NL reset on login until new username is known
2018-04-18 13:31:56 -07:00
Dante Ruiz
86d3ba658f
Merge branch 'master' of github.com:highfidelity/hifi into feature-entity-highlighting
2018-04-18 13:30:24 -07:00
