Commit graph

69466 commits

Author SHA1 Message Date
Cristian Luis Duarte
be8351dc0d Android - Rollback pause/resume mechanism. Stop server checkIns, reset nodeList before entering background 2018-07-06 20:43:52 -03:00
Cristian Luis Duarte
a878ad5a33 Android - remove logs from pause/resume and pending requests 2018-07-05 14:58:55 -03:00
Cristian Luis Duarte
736fc41bb9 Android - Remove resume code that tries the next pending download as entering domains asks for resources anyway 2018-07-04 19:37:12 -03:00
Cristian Luis Duarte
3c2d83f82b Merge remote-tracking branch 'cristo86/android_stop_downloads_bg' into android_stop_downloads_bg 2018-07-04 12:51:49 -03:00
Cristian Duarte
6b5e5702dd Android - implement pause-resume of requests chain in ResourceCache 2018-07-02 20:05:59 -03:00
Cristian Duarte
6b3a9def7a Merge branch 'hifi_master' into android_stop_downloads_bg 2018-07-02 17:37:40 -03:00
Stephen Birarda
cd3df3f1a7
Merge pull request #13509 from birarda/bug/stuck-udt-connection
fix case where vegas congestion control would not re-send lost ACK
2018-07-02 13:09:44 -07:00
Dante Ruiz
e2757e80ea
Merge pull request #13512 from wayne-chen/passwordFieldLoginFix-case-14261
Hitting Enter Key in Password Field To Login
2018-07-02 12:55:44 -07:00
John Conklin II
f7bc79729d
Merge pull request #13515 from Zvork/shadow
Shadow on Mac bug fix
2018-07-02 12:37:52 -07:00
John Conklin II
7834bca39a
Merge pull request #13508 from wayne-chen/crashEntityAppendPoint-case-12473
Fixing crash on appending a point to an entity
2018-07-02 12:36:51 -07:00
John Conklin II
844bd3f48d
Merge pull request #13518 from zfox23/MS16390_buyFail
Fix MS16390: Correctly update UI when Buy endpoint fails
2018-07-02 12:36:19 -07:00
John Conklin II
94ab0c71b2
Merge pull request #13040 from 1P-Cusack/BugFix_EntityListException_20180427
[BugFix] EntityList UncaughtException in that.sendUpdate
2018-07-02 12:35:20 -07:00
John Conklin II
58a9bdc86f
Merge pull request #13511 from r3tk0n/mouse_menu2
Fix SpinnerSliderPreference Class, Update Mouse Sensitivity Menu
2018-07-02 12:33:35 -07:00
John Conklin II
d9a3676c7c
Merge pull request #13493 from alexiamandeville/sittingUpdate
Resolving issue where VR input for movement stops emotes
2018-07-02 12:30:50 -07:00
David Back
54664855ac
Merge pull request #13494 from dback2/zeroOutSpreads
Particle spreads backwards compatibility
2018-07-02 10:43:34 -07:00
Zach Fox
c95b359aa7 Fix MS16390: Correctly update UI when Buy endpoint fails 2018-07-02 10:23:53 -07:00
David Back
3e2e9826e9
Merge pull request #13481 from dback2/particleExplorerOptionalPropFix
Optional particle explorer properties fixes
2018-07-02 09:29:19 -07:00
Olivier Prat
51fe60ec45 Fixed android compilation error and removed _glUniformi call 2018-07-02 14:59:09 +02:00
Olivier Prat
1a5c382d88 Fixed on Android 2018-07-02 12:41:24 +02:00
Olivier Prat
419e8e6eb9 Forgot to put back linear filtering on single shadow map 2018-07-02 11:32:33 +02:00
Sam
1f90e86b87 fix shader shadow bug on mac 2018-07-02 11:08:14 +02:00
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
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
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
David Back
328bf37f64 Merge branch 'master' of https://github.com/highfidelity/hifi into particleExplorerOptionalPropFix 2018-06-29 10:34:17 -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
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
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