Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 13:31:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
69511 commits 75 branches 59 tags 1.2 GiB
Commit graph

28673 commits

Author SHA1 Message Date
amantley
59dfe80940 Merge remote-tracking branch 'upstream/master' into integratedStepping 2018-07-03 11:47:09 -07:00
Sam Gondelman
5daf84d690
Merge pull request #13523 from SamGondelman/blur 
Fix blurry tablet if overlay is drawing
 2018-07-03 09:19:32 -07:00
amantley
7f5f762208 fixing merge conflict 2018-07-02 15:54:21 -07:00
amantley
096d0d2827 reorganized the step detection code, creating a shouldActivateHorizontalCG that calls all the step detection conditionals. The average rotation and the mode are now calculated in MyAvatar::update 2018-07-02 15:43:57 -07:00
John Conklin II
3f975cfa84
Merge pull request #13506 from sabrina-shanman/fix-osx-crash-on-exit 
Fix Mac Crashes On Shutdown
 2018-07-02 15:27:26 -07:00
SamGondelman
773efe8cf0 fix blurry tablet if overlay is drawing 2018-07-02 13:32:25 -07: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
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
David Back
54664855ac
Merge pull request #13494 from dback2/zeroOutSpreads 
Particle spreads backwards compatibility
 2018-07-02 10:43:34 -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
Clement
ba53e7add8 Fix ACs startup crash 2018-06-29 16:29:32 -07:00
Stephen Birarda
dce9cb0404 fix case where TCP Vegas would not re-send lost ACK 2018-06-29 15:42:59 -07:00
Wayne Chen
9e3626cca3 returning false if there is no entity to connect to 2018-06-29 14:42:33 -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
sabrina-shanman
e4377a6c95 Prevent type conversion in ~ResourceManager constant 2018-06-29 10:55:01 -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
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
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
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
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
David Back
4f5a1bc340 zero out spread values for previous versions 2018-06-27 19:02:55 -07:00
John Conklin II
3f6be6d259
Merge pull request #13476 from luiscuenca/avatarClusterScaleFix 
Fix scaling avatar points twice
 2018-06-27 16:03:46 -07:00
John Conklin II
8c516e1ca8
Merge pull request #13480 from birarda/bug/go-to-before-clear-master 
move AddressManager to NodeList thread, make AccountManager safer
 2018-06-27 15:58:56 -07:00
John Conklin II
1f4346d221
Merge pull request #13427 from ctrlaltdavid/21897 
Stop desktop app window's QML source from running when window is closed
 2018-06-27 13:46:50 -07:00
John Conklin II
b9439d1e6b
Merge pull request #13384 from ctrlaltdavid/21892 
Fix entity detaching from head joint not becoming visible
 2018-06-27 12:32:52 -07:00
John Conklin II
c1d949351e
Merge pull request #13399 from kitely/roll-log-on-startup 
Always roll hifi-log.txt when starting
 2018-06-27 12:32:20 -07:00
amantley
99ff5f9140 made the Avatar destructor virtual to ensure that MyAvatar and OtherAvatar cleanup correctly 2018-06-27 11:59:53 -07:00
Stephen Birarda
b5254f1ea5 cleanup race on deleteLater after callback processed 2018-06-27 11:41:37 -07:00
Stephen Birarda
70cab27c1a add a safeguard deleteLater for QNetworkReply 2018-06-27 11:41:37 -07:00
Stephen Birarda
24f92502b5 add warning output of error from AccountManager 2018-06-27 11:41:37 -07:00
Stephen Birarda
e90ea82ef5 move AddressManager to NodeList thread, fix AccountManager invokes 2018-06-27 11:41:37 -07:00
John Conklin II
e7d5ea561b
Merge pull request #13469 from hyperlogic/safeLandingFix4 
Fix for landing on the roof of some domains.
 2018-06-27 10:23:35 -07:00
sabrina-shanman
4afb19e091 Remove assert in ~Frame causing shutdown crash on Mac in dev build 2018-06-27 09:59:48 -07:00
Seth Alves
01632ddd29
Merge pull request #13345 from ctrlaltdavid/21890 
Fix memory leak when reloading scripts
 2018-06-27 09:39:53 -07:00
amantley
8b13905d6c final final final coding standards 2018-06-26 17:43:45 -07:00