Commit graph

66000 commits

Author SHA1 Message Date
David Rowe
63e07f1a7f Fix typo in developer Messages test script 2018-03-15 15:23:46 +13:00
David Rowe
369970f120 Messages API JSDoc 2018-03-15 15:23:02 +13:00
Ken Cooke
b1dd63cfd3
Merge pull request #12619 from kencooke/audio-src-kernel-128
Improved audio quality for streaming music
2018-03-14 18:30:23 -07:00
Stephen Birarda
10dd16ae8d remove VS redist handling from NSIS template 2018-03-14 17:59:04 -07:00
Simon Walton
4fd6eb559b Remove dangling packet sender pointer before it's invalid. 2018-03-14 17:06:38 -07:00
Seth Alves
afcbb6751b disable loading of serverless-domains over http(s), for now 2018-03-14 15:53:35 -07:00
Sam Gondelman
46bbfc2680
Merge pull request #12643 from gcalero/keyboard_crashing
Possible fix for keyboard crash
2018-03-14 15:53:17 -07:00
Gabriel Calero
d0f1aa9020 Refactor fix for keyboard crash 2018-03-14 19:18:42 -03:00
Cristian Luis Duarte
379fa9783f No touch responsibility for KeyboardMouseDevice when TouchscreenVirtualPadDevice is initialized 2018-03-14 19:09:21 -03:00
Seth Alves
ee515a44e7 Merge branch 'master' of github.com:highfidelity/hifi into rename-getpos3 2018-03-14 14:56:50 -07:00
Seth Alves
e63558dc05 code review 2018-03-14 14:33:17 -07:00
Atlante45
2fe9f6df6f Add google analytics to installer 2018-03-14 14:17:38 -07:00
Gabriel Calero
e744edc6a0 Possible fix for keyboard crash 2018-03-14 18:11:23 -03:00
Stephen Birarda
0c0ce1d6b8
Merge pull request #12508 from SimonWalton-HiFi/server-script
Stop server-script URLs when deleted from entity properties (case 11244)
2018-03-14 14:01:01 -07:00
Seth Alves
93978209d8 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-14 13:49:46 -07:00
Sam Gondelman
815260933a
Merge pull request #12642 from gcalero/android_change_default_mode
Change default mode to My View in Android
2018-03-14 13:47:16 -07:00
Simon Walton
d67044f220 EntityScriptServer should wait for script engine to finish when stopping
Script engine will still running and using EntityEditPacketSender,
which is owned by EntityScriptServer, which was destroyed.
https://highfidelity.manuscript.com/f/cases/11071/
2018-03-14 13:32:48 -07:00
Gabriel Calero
04decfa89c Merge remote-tracking branch 'upstream/master' into android_change_default_mode 2018-03-14 16:49:41 -03:00
Sam Gondelman
ba0c273614
Merge pull request #12641 from SamGondelman/android
Update gpu-gles based on TAA PR
2018-03-14 12:41:24 -07:00
Cristian Luis Duarte
80abe1865a Remove unused variable thisPointConsumed 2018-03-14 16:22:24 -03:00
SamGondelman
e59af8892a make same changes to gles backend from taa pr 2018-03-14 12:09:59 -07:00
SamGondelman
21381a7295 fix building with gles on desktop (still crashes) 2018-03-14 11:44:00 -07:00
Brad Davis
baa4dc3383 Don't leave trash web processes when changing web entity urls 2018-03-14 11:38:46 -07:00
Gabriel Calero
884da98466 Change default mode to My View (android) 2018-03-14 14:50:44 -03:00
Seth Alves
2fd6bc4130 rename Mesh api getPos3 to getPos, deprecate but still support getPos3 2018-03-14 10:24:44 -07:00
Sam Gateau
2487e34ee8
Merge pull request #12633 from SamGondelman/aa
Fix HUD sphere rendering after TAA changes
2018-03-14 09:26:25 -07:00
Seth Alves
21088cfbcc Merge branch 'master' of github.com:highfidelity/hifi into overlay-visible-in-2nd-cam 2018-03-14 09:00:21 -07:00
Seth Alves
b55282e46a Merge branch 'master' of github.com:highfidelity/hifi into overlay-visible-in-2nd-cam 2018-03-14 08:51:17 -07:00
David Rowe
c1e256a4f3 Remove unused methods 2018-03-14 13:58:00 +13:00
David Rowe
966d711e56 Fix Window.raiseMainWindow() 2018-03-14 13:38:48 +13:00
David Rowe
025d2807f4 Fix Window.setFocus() JSDoc 2018-03-14 12:59:27 +13:00
David Rowe
c8b4217a96 Fix Window.hasFocus() 2018-03-14 12:57:23 +13:00
Seth Alves
602bc37b1a oops 2018-03-13 16:39:56 -07:00
Seth Alves
271badfa62 provide an overlay property to control if the overlay is visible in the secondary camera view 2018-03-13 16:33:32 -07:00
SamGondelman
3b877db992 fix hud sphere 2018-03-13 14:58:29 -07:00
Ryan Huffman
11a3a86af3 Merge branch 'master' of github.com:highfidelity/hifi into feat/obj-baker-update 2018-03-13 14:49:26 -07:00
Ryan Huffman
bcbe55d751 Fix OBJ support in DomainBaker 2018-03-13 14:30:42 -07:00
John Conklin II
a0e2fc3665
Merge pull request #12564 from SimonWalton-HiFi/record-avatar-pr
Fixes for missing avatar on record replays
2018-03-13 14:10:10 -07:00
Sam Gateau
2dde65d74f
Merge pull request #12631 from SamGondelman/aa
Apply TAA to text and web entities/overlays
2018-03-13 13:00:42 -07:00
SamGondelman
4adc357534 apply taa to text and web entities/overlays 2018-03-13 11:57:14 -07:00
Cristian Luis Duarte
a3811c2844 Coding style corrections 2018-03-13 15:56:13 -03:00
Seth Alves
3ee41c71e4
Merge pull request #12529 from Atlante45/fix/nvtt-mac
Fix NVTT for mac
2018-03-13 11:28:42 -07:00
Ryan Huffman
a5e491e29d Add OBJ support to domain baker 2018-03-13 10:38:21 -07:00
Seth Alves
b39c7eadd2 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-13 09:24:18 -07:00
John Conklin II
5be2f0acc7
Merge pull request #12490 from Zvork/taa
Temporal Anti-Aliasing
2018-03-13 09:03:50 -07:00
Cristian Luis Duarte
b8c0f4d686 Android joystick - Enforce validity of touches to the ones that start in their area of activation (Movement only from joystick area, View only from outside joystick area). 2018-03-13 12:52:26 -03:00
John Conklin II
615c98816f
Merge pull request #12620 from ctrlaltdavid/21778
Fix rotation and position of avatar meshes attached to eye joints
2018-03-13 08:17:50 -07:00
Ken Cooke
bcf893db18
Merge pull request #12586 from kencooke/audio-peakmeters-fix
Fix crash when closing the Audio menu
2018-03-13 07:52:37 -07:00
David Rowe
16aefea2e1 Merge branch 'master' into 21776 2018-03-13 14:46:07 +13:00
Sam Gondelman
db2b79f4fb
Merge pull request #12626 from gcalero/android_hifi_audio_codec
Android hifi audio codec
2018-03-12 16:21:21 -07:00