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 |
|
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 |
|
Gabriel Calero
|
3117ec9015
|
Merge remote-tracking branch 'upstream/master' into android_hifi_audio_codec
|
2018-03-12 19:44:24 -03:00 |
|
Bradley Austin Davis
|
f48db825c3
|
Merge pull request #12615 from jherico/fix/ktx_loading
Fix local KTX files never being removed from pending downloads
|
2018-03-12 15:04:40 -07:00 |
|
Sam Gondelman
|
c59d29f4ee
|
Merge pull request #12623 from SamGondelman/android
Android: Fix corruption on startup
|
2018-03-12 15:03:07 -07:00 |
|
John Conklin II
|
7f7d20738a
|
Merge pull request #12553 from vladest/mac_combobox_misplaced
Fix CheckBox on Mac
|
2018-03-12 14:47:39 -07:00 |
|
Ken Cooke
|
c9e253ab14
|
Merge pull request #12621 from ctrlaltdavid/21791
Fix CPU and GPU not throttling when Interface minimized from maximized
|
2018-03-12 14:43:47 -07:00 |
|
MiladNazeri
|
e054f16c46
|
Merge pull request #12526 from ctrlaltdavid/21709
Entities API JSDoc
|
2018-03-12 14:40:09 -07:00 |
|
Gabriel Calero
|
7778ddfdcb
|
Merge remote-tracking branch 'upstream/master' into android_hifi_audio_codec
|
2018-03-12 18:33:05 -03:00 |
|
Gabriel Calero
|
25f207a6db
|
Add hifi audio codec in Android build
|
2018-03-12 18:29:57 -03:00 |
|
SamGondelman
|
19807676fa
|
whoops
|
2018-03-12 14:19:34 -07:00 |
|
SamGondelman
|
9953e7051f
|
Merge remote-tracking branch 'upstream/master' into android
|
2018-03-12 14:15:31 -07:00 |
|
SamGondelman
|
4bef033d6f
|
cleanup, don't compress rcc file to fix corruption
|
2018-03-12 13:05:03 -07:00 |
|
John Conklin II
|
1c403b7532
|
Merge pull request #12616 from NissimHadar/bug12435
Mitigation of Manuscript issue 12435
|
2018-03-12 12:01:42 -07:00 |
|
Sam Gondelman
|
3c88ae692c
|
Merge pull request #12608 from jherico/fix/android_hifi_icon
Update Hifi icon for android
|
2018-03-12 11:26:57 -07:00 |
|
John Conklin II
|
5bd49ce9dc
|
Merge pull request #12617 from samcake/punk
Fix shadow: other avatars casting shadow, graphics settings checkboxes & menu layout
|
2018-03-12 10:49:48 -07:00 |
|
John Conklin II
|
8b05973939
|
Merge pull request #12613 from NissimHadar/fixShadowUI
Correct can cast shadow flag being visible on entities that can't cast shadows
|
2018-03-12 10:45:33 -07:00 |
|
Sam Gateau
|
a6a43b90ee
|
Merge pull request #12554 from NissimHadar/addRecursionToAutotester
Pull test images from GitHub
|
2018-03-12 08:59:07 -07:00 |
|
David Rowe
|
3001225cb7
|
Fix CPU and GPU not throttling when Interface minimized from maximized
|
2018-03-12 15:49:20 +13:00 |
|
Bradley Austin Davis
|
e33539f575
|
Remove unused variable
|
2018-03-10 18:44:24 -08:00 |
|
NissimHadar
|
cb24fe6166
|
Merge branch 'master' of github.com:highfidelity/hifi into addRecursionToAutotester
|
2018-03-09 18:15:03 -08:00 |
|
NissimHadar
|
84cc4c18a4
|
Added date/time to testResultsFolder.
|
2018-03-09 18:13:26 -08:00 |
|
SimonWalton-HiFi
|
e95afe78a2
|
Merge pull request #12614 from SimonWalton-HiFi/loghandler
Loghandler
|
2018-03-09 17:42:23 -08:00 |
|
samcake
|
10016756b7
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2018-03-09 16:32:37 -08:00 |
|
Brad Davis
|
7d267bb709
|
Fix local KTX files never being removed from pending downloads
|
2018-03-09 16:01:45 -08:00 |
|
Simon Walton
|
cc166dbece
|
LogHandler regexps - use vector of values
|
2018-03-09 15:44:56 -08:00 |
|
samcake
|
c78df4d967
|
Setting the correct Job config for ssao check box and fixing typo
|
2018-03-09 15:41:56 -08:00 |
|
Simon Walton
|
d4cf22fbaf
|
LogHandler class stores regexps - code tweaks
Code standard changes from review.
|
2018-03-09 15:29:10 -08:00 |
|
Simon Walton
|
4b27cd73ff
|
LogHandler class stores regexps rather than always recreating
General efficiency tweaks; move to C++11.
|
2018-03-09 15:29:09 -08:00 |
|
NissimHadar
|
9b9b62d0e4
|
Transition to hover if falling and height above ground is greater than the threshold.
|
2018-03-09 15:20:51 -08:00 |
|
samcake
|
fec30b8363
|
Fixing the menu for Shadow and AO to do the correct path to engine config
|
2018-03-09 15:04:14 -08:00 |
|
John Conklin II
|
42a686ad93
|
Merge pull request #12578 from druiz17/use-correct-audio-api
use correct scripting api for audio in Audio.qml
|
2018-03-09 13:41:20 -08:00 |
|
samcake
|
10447bf10e
|
Fix the fact that all avatars should cast shadows, not just MyAvatar. since this is always a SkeletonMOdel class let s just turn it on by default there
|
2018-03-09 13:04:04 -08:00 |
|
Sam Gateau
|
d0de5b2d96
|
Merge pull request #12496 from AndrewMeadows/faster-raypick
faster per-entity raypick culling and time-boxed picks
|
2018-03-09 13:01:52 -08:00 |
|
NissimHadar
|
317d9a8dbc
|
Correct can cast shadow flag being visible on entities that can't cast shadows.
|
2018-03-09 11:45:39 -08:00 |
|
John Conklin II
|
9044c9b472
|
Merge pull request #12600 from zfox23/preventSendingEmptyKeys
Don't hit certain Commerce backend endpoints when wallet isn't yet auth'd
|
2018-03-09 11:38:59 -08:00 |
|
Zach Fox
|
8d047184bb
|
Merge pull request #12592 from zfox23/fixUncertifiedPurchases
Don't default unknown Marketplace item types to 'Entity'
|
2018-03-09 11:11:12 -08:00 |
|
Dante Ruiz
|
e21c4988fb
|
stereo checkbox text change
|
2018-03-09 10:11:25 -08:00 |
|
Dante Ruiz
|
3a39fca268
|
made requested changes
|
2018-03-09 10:09:51 -08:00 |
|
John Conklin II
|
6969f014fc
|
Merge pull request #12601 from howard-stearns/clear-wallet-when-picking-a-new-one
clear wallet when picking a new one
|
2018-03-09 10:09:41 -08:00 |
|
Zach Fox
|
2b137f94a6
|
Merge pull request #12596 from zfox23/fixFontsAgain
Fix font loading for MacOS via completely different font loading method
|
2018-03-09 09:49:56 -08:00 |
|
Dante Ruiz
|
c49d0557fc
|
fixing check box issues
|
2018-03-09 09:29:37 -08:00 |
|
Brad Hefta-Gaub
|
6b55fa1fcd
|
Merge pull request #12539 from ctrlaltdavid/21702
Remove deprecated Window.location.protocolVersion() function from API
|
2018-03-09 08:52:55 -08:00 |
|
Brad Hefta-Gaub
|
8e44b429d8
|
Merge pull request #12472 from 1P-Cusack/FogBugz/Case_4315_VFXTabSupport
[Case 4315] Resolves Particle Tab Color Picker visual inconstency
|
2018-03-09 08:49:07 -08:00 |
|
Brad Hefta-Gaub
|
5437ffb2c8
|
Merge pull request #12536 from ctrlaltdavid/21700
Remove deprecated Window.openFileChanged() signal from API
|
2018-03-09 08:47:57 -08:00 |
|
Brad Hefta-Gaub
|
806e077387
|
Merge pull request #12609 from Atlante45/new-master
Merge RC65 back into master
|
2018-03-09 08:47:12 -08:00 |
|
Dante Ruiz
|
8703e9e002
|
Merge branch 'master' of github.com:highfidelity/hifi into use-correct-audio-api
|
2018-03-09 08:42:50 -08:00 |
|
Andrew Meadows
|
858b02f29d
|
more readable code
|
2018-03-09 08:35:18 -08:00 |
|
Andrew Meadows
|
3f1944eb8a
|
fix variable name typo
|
2018-03-09 08:35:18 -08:00 |
|
Andrew Meadows
|
9eecd3cb80
|
update styluses first: they are cheap
|
2018-03-09 08:35:18 -08:00 |
|