Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 18:16:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
62935 commits 71 branches 56 tags 1.2 GiB
Commit graph

62935 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
95bfacb850
Merge pull request #11977 from ctrlaltdavid/21643 
Enable user connection with "x" key when capslock is on
 2017-12-15 15:22:00 -08:00
Brad Hefta-Gaub
6aebfd61c5
Merge pull request #11999 from luiscuenca/laserScaleFix 
Make lasers scale with avatar
 2017-12-15 15:21:01 -08:00
Nissim Hadar
8bf517b2f8 Merge branch 'master' into hazeOnTransparent 2017-12-15 13:45:31 -08:00
luiscuenca
53e1c57e3b Make lasers scale with avatar 2017-12-15 13:46:15 -07:00
Seth Alves
08af1b2894 Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3 2017-12-15 11:25:01 -08:00
Bradley Austin Davis
a3ef4ce976
Merge pull request #11946 from ElderOrb/FB8992_2 
8992 Login window is small in tablet
 2017-12-15 09:10:49 -08:00
Ryan Downe Karpf
11eaf435c9
Merge pull request #11996 from sethalves/pr-11946-for-rc-61 
8992 Login window is small in tablet
 2017-12-15 09:08:49 -08:00
Nissim Hadar
82b94eaacd Reduced size of parameters in (shader) function call. 2017-12-14 18:50:41 -08:00
Alexander Ivash
a4696cc2b3 8992 Login window is small in tablet 2017-12-14 16:57:17 -08:00
Stephen Birarda
a5c951a666 remove tracking of last receiver response from SendQueue 2017-12-14 16:41:20 -08:00
Stephen Birarda
75e56b5daa make the _lastMessageNumber in Connection default to 0 2017-12-14 16:41:20 -08:00
Stephen Birarda
8a2c31d342 only de-activate the SendQueue when it has nothing to send 2017-12-14 16:41:20 -08:00
Stephen Birarda
cf28fdf188 fix message erase in conn, SendQueue ctor order 2017-12-14 16:41:20 -08:00
Atlante45
34c1c27455 Keep track of message numbers 2017-12-14 16:41:20 -08:00
Atlante45
702d2c34a5 Reset ACK in ctor 2017-12-14 16:41:20 -08:00
Atlante45
b2beeae6b1 Keep connection alive as long as the node is connected 2017-12-14 16:41:20 -08:00
Stephen Birarda
6be7a3662c
Merge pull request #11992 from birarda/bug/fix-connection-reset 
Make udt::Connection live as long as node connection
 2017-12-14 16:34:51 -08:00
Nissim Hadar
76af59e331 Merge branch 'master' into hazeOnTransparent 2017-12-14 16:31:13 -08:00
Nissim Hadar
c352d5fc23 Passed light direction instead of light object into computeHazeColorKeyLightAttenuation. 2017-12-14 16:23:14 -08:00
Nissim Hadar
026b19d770 Set 4th position component from 0.0 to 1.0 2017-12-14 16:17:50 -08:00
Nissim Hadar
05e47ae668 Removed unneeded 'mix'. 
Defined EPSILON.
 2017-12-14 16:14:08 -08:00
Ryan Downe Karpf
d25dfbb957
Merge pull request #11994 from NissimHadar/crashFix10537OnRC61 
Fix for Haze crash (bug 10537)
 2017-12-14 16:08:17 -08:00
Nissim Hadar
d5d4c22a3d Removed dual calls to getViewInverse(). 2017-12-14 15:55:31 -08:00
Alexander Ivash
32acc8ad47 8992 Login window is small in tablet 2017-12-14 23:53:33 +00:00
Nissim Hadar
00a2013b60 Added missing space before { 2017-12-14 15:38:07 -08:00
Stephen Birarda
da56d47307 make the _lastMessageNumber in Connection default to 0 2017-12-14 15:30:51 -08:00
Stephen Birarda
8b5e8f8d08 only de-activate the SendQueue when it has nothing to send 2017-12-14 15:30:25 -08:00
Nissim Hadar
1d4801adf5 Fix for Haze crash (bug 10537) 2017-12-14 13:48:31 -08:00
Zach Fox
94bd8d8673
Merge pull request #11991 from zfox23/commerce_fixBrokenBuyButtons 
Fix broken Buy buttons on main Marketplace page
 2017-12-14 12:48:09 -08:00
Ryan Downe Karpf
cccd080727
Merge pull request #11990 from sethalves/pr-11971-for-rc-61-x 
possible fix for tablet freezing (#11971 for rc-61)
 2017-12-14 12:14:44 -08:00
Nissim Hadar
7b35d99a63 Merge branch 'RC-61' of https://github.com/highfidelity/hifi into hazeOnTransparent 2017-12-14 12:10:20 -08:00
Zach Fox
504949cd32 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_staticCertVersioning 2017-12-14 12:08:00 -08:00
Stephen Birarda
7f948586dd fix message erase in conn, SendQueue ctor order 2017-12-14 12:07:32 -08:00
Zach Fox
74a5f0881f Fix broken Buy buttons on Marketplace 2017-12-14 11:56:36 -08:00
NissimHadar
df34103895
Merge pull request #11980 from NissimHadar/crashFix10537 
Protect against use of null HazePointer.
 2017-12-14 11:45:49 -08:00
Nissim Hadar
409eade006 Merge branch 'master' into hazeOnTransparent 2017-12-14 11:41:53 -08:00
Seth Alves
9863458fef oops 2017-12-14 11:07:11 -08:00
Seth Alves
77b102669e try harder to keep setTimeout loop going in controller-dispatcher 2017-12-14 11:07:04 -08:00
David Kelly
a49ee46f54 Handle sold out items a bit better 2017-12-14 11:52:56 -07:00
Stephen Birarda
fa75320acf
Merge pull request #11984 from birarda/bug/macdeployqt-for-oven 
fix rpath for oven on OS X
 2017-12-14 10:26:13 -08:00
Ken Cooke
b6a88bbdda Invalid WAV files should always be logged and not played 2017-12-14 10:20:46 -08:00
Zach Fox
af346f2ced Protocol change 2017-12-14 10:09:10 -08:00
SamGondelman
4fbf5db697 Merge remote-tracking branch 'upstream/master' into hysteresis 2017-12-14 09:55:46 -08:00
Ryan Downe Karpf
68177c7e71
Merge pull request #11981 from sethalves/pr-11960-for-rc-61 
Pr 11960 for rc 61
 2017-12-14 09:11:34 -08:00
Atlante45
ad547f483d Keep track of message numbers 2017-12-13 19:25:24 -08:00
amantley
5bc113c818 deleted some debug print statements in ModelEntityItemcpp and deleted else statement that was superfluous 2017-12-13 19:07:23 -08:00
Stephen Birarda
88831ff08a don't trigger unix step on apple for oven 2017-12-13 18:39:19 -08:00
Stephen Birarda
0b598ea948 fix RPATH for oven so it loads things from macdeployqt 2017-12-13 18:39:19 -08:00
Stephen Birarda
1c83d7a1ef
Merge pull request #11983 from birarda/bug/macdeployqt-for-oven 
fix rpath for oven so it can load things placed by macdeployqt
 2017-12-13 18:36:16 -08:00
Stephen Birarda
1f57ac6081 don't trigger unix step on apple for oven 2017-12-13 18:08:39 -08:00