Sam
a6cbc44885
Merged with zvork fix
2018-07-02 10:50:37 +02:00
Sam
c1856a5e36
Make shadows work with one cascade
2018-07-02 10:46:53 +02:00
Olivier Prat
933a2eb2cf
Merge branch 'master' of http://github.com/highfidelity/hifi into shadow
2018-07-02 10:01:13 +02:00
Wayne Chen
15bf2707fd
Merge branch 'master' of https://github.com/wayne-chen/hifi
2018-07-01 22:10:11 -07:00
vladest
0657992e9c
Tablet Asset Server dialog was instantiated twice
2018-07-01 19:56:51 +02:00
Simon Walton
abda0b2381
Use case-insensitive matching on friends lists in DomainGatekeeper
2018-06-29 18:25:06 -07:00
Anthony J. Thibault
fff4348a0f
Bug fix for poleVector smoothing
...
Needs to occur in sensor space rather then avatar space.
2018-06-29 17:54:21 -07:00
Stephen Birarda
bbc757a193
Merge pull request #13385 from marko8904/timestampServerUpdate
...
Updated time stamping server for authenticode signatures
2018-06-29 16:46:22 -07:00
Clement
ba53e7add8
Fix ACs startup crash
2018-06-29 16:29:32 -07:00
Wayne Chen
99a64f31d7
Adding Enter/Return for sign up dialog in pw field
2018-06-29 16:21:03 -07:00
r3tk0n
39f491d9d0
Update PreferencesDialog.cpp
...
Removing errant newline
2018-06-29 16:17:15 -07:00
Wayne Chen
2c32dc1cf5
adding enter key event for logging in in pw textfield
2018-06-29 16:13:02 -07:00
r3tk0n
4feba7e66e
Correction of string literals
...
Last update to string literals, miscommunication.
2018-06-29 16:12:31 -07:00
r3tk0n
5158a9c4fd
Update Mouse Sensitivity Settings Text
...
Changed text for clarity to new users.
2018-06-29 16:11:18 -07:00
Stephen Birarda
dce9cb0404
fix case where TCP Vegas would not re-send lost ACK
2018-06-29 15:42:59 -07:00
David Back
fd4a8fdd83
fix color NaN check
2018-06-29 15:33:55 -07:00
r3tk0n
9b59dc5809
Changed SpinnerSliderPreference.qml to general-case UI element as originally intended,
...
updated PreferencesDialog.cpp's Avatar Scale slider to hard-coded bounds [0.25, 4.0].
2018-06-29 15:22:57 -07:00
David Back
70dfb26418
Merge branch 'master' of https://github.com/highfidelity/hifi into particleExplorerOptionalPropFix
2018-06-29 15:16:37 -07:00
Wayne Chen
9e3626cca3
returning false if there is no entity to connect to
2018-06-29 14:42:33 -07:00
Wayne Chen
fa29bb537f
Merge branch 'master' of https://github.com/highfidelity/hifi
2018-06-29 13:17:20 -07:00
John Conklin II
d68815ba27
Merge pull request #13501 from danteruiz/fix-billboard-crash
...
Fix web entity crash
2018-06-29 12:02:31 -07:00
Wayne Chen
d430877c41
Merge branch 'master' of https://github.com/highfidelity/hifi
2018-06-29 10:58:06 -07:00
sabrina-shanman
e4377a6c95
Prevent type conversion in ~ResourceManager constant
2018-06-29 10:55:01 -07:00
sabrina-shanman
9dc03f5013
Destroy GeometryCache explicitly in Application destructor
2018-06-29 10:39:16 -07:00
David Back
328bf37f64
Merge branch 'master' of https://github.com/highfidelity/hifi into particleExplorerOptionalPropFix
2018-06-29 10:34:17 -07:00
sabrina-shanman
8cbe5e4541
Merge branch 'mac-shutdown-crash-frame-dtor' into fix-osx-crash-on-exit
2018-06-29 09:38:23 -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
3435e7ca87
Merge pull request #13499 from hyperlogic/bug-fix/space-process-resets-crash
...
Guard against memory corruption in Space::processResets()
2018-06-29 17:56:44 +02:00
Olivier Prat
de831ffea9
Switched shadow maps to sampler2DArrayShadow to try to fix on Mac
2018-06-29 16:55:33 +02: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
David Back
6f0ac32344
Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleToggleFix
2018-06-28 17:32:18 -07:00
Dante Ruiz
8c96597aba
Merge branch 'master' of github.com:highfidelity/hifi into fix-billboard-crash
2018-06-28 16:25:52 -07:00
Dante Ruiz
847cad46ca
fix billboard crash
2018-06-28 16:25:34 -07:00
Anthony J. Thibault
17f9a01fa2
Fix signed unsigned compare warning
2018-06-28 15:29:01 -07:00
Wayne Chen
d2dda64dad
Merge branch 'master' of https://github.com/highfidelity/hifi
2018-06-28 15:16:11 -07:00
Anthony Thibault
a5919ee3fa
Merge pull request #13497 from hyperlogic/bug-fix/script-engine-batchloader-memory-corruption-fix
...
Fix memory corruption when running scripts using Script.require().
2018-06-28 14:18:56 -07:00
Anthony J. Thibault
9772fc4e22
Guard against memory corruption in Space::processResets()
...
Check the proxyID before reading from the _proxies vector and writing into the _owners vector.
2018-06-28 14:04:59 -07:00
Zach Fox
73e45b5fdf
Merge pull request #13498 from zfox23/MS14743_snappyFloor
...
Fix MS14743: Change SNAP prints such that they don't fall through the floor
2018-06-28 13:33:37 -07:00
John Conklin II
0a0e1668d5
Merge pull request #13478 from amantley/glowingOrbMaster
...
The client should render "something" for an avatar even if mesh or identity is not available
2018-06-28 12:12:16 -07:00
David Back
7b9341954f
Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleToggleFix
2018-06-28 12:10:42 -07:00
Zach Fox
2d27de12bd
Fix MS14743: Change SNAP prints such that they don't fall through the floor
2018-06-28 12:06:31 -07:00
David Back
a8e231c5af
floats .0f
2018-06-28 11:33:38 -07:00
Anthony J. Thibault
ac6fcf092c
Fix memory corruption via lambdas that capture local variables by reference.
...
The lambdas in ScriptEngine::fetchModuleSource() were referencing local stack variables by reference.
This could lead to un-expected results including memory corruption.
To workaround this issue the QTimer and QEventLoop variables are allocated on the heap and held onto by a shared_ptr.
This shared_ptr is passed to the lambda.
This will not result in cycles and should result in the QTimer and QEventLoop being destroyed when the BatchLoader
object they are connected to is deleted.
2018-06-28 11:15:25 -07:00
David Back
f373880af7
Merge branch 'master' of https://github.com/highfidelity/hifi into zeroOutSpreads
2018-06-28 11:07:35 -07:00
John Conklin II
040978830a
Merge pull request #13413 from Atlante45/fix/audio-starve
...
Fix audio device sometimes being on the wrong thread
2018-06-28 09:59:00 -07:00
John Conklin II
b07d317f4c
Merge pull request #13488 from hyperlogic/bug-fix/qstring-from-script-engine
...
Fix for heap-corruption in Settings::saveAll due to implicitly shared QStrings
2018-06-28 09:56:51 -07:00
John Conklin II
af13196d3f
Merge pull request #13489 from r3tk0n/mouse_menu
...
Re-added mouse sensitivity settings to General Preferences dialog.
2018-06-28 09:43:55 -07:00
John Conklin II
138342ba91
Merge pull request #13485 from zfox23/MS16257_clearOverlay
...
Implement MS16257: Remove 'clear overlay when moving' setting and code
2018-06-28 09:31:04 -07: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
David Back
4f5a1bc340
zero out spread values for previous versions
2018-06-27 19:02:55 -07:00
