Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-19 05:56:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
74319 commits 69 branches 56 tags 1.2 GiB
Commit graph

74319 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dante Ruiz
8be775c2b7 don't save joint information for avatar entities 2018-11-28 10:54:39 -08:00
Zach Fox
022fea107f
Merge pull request #14476 from zfox23/payIn1 
Pay-In API Frontend, Part One
 2018-11-28 10:32:01 -08:00
Sam Gondelman
860d920368
more typos 2018-11-28 09:55:10 -08:00
Sam Gondelman
ecd936705b
typo 2018-11-28 09:54:20 -08:00
NissimHadar
59a030a16f Correct message to user. 2018-11-27 17:41:00 -08:00
NissimHadar
4effd365ed Change "Autotester" to "nitpick". 2018-11-27 17:34:17 -08:00
NissimHadar
57ba50fa96 Merge branch '19991-MacAppData' of https://github.com/NissimHadar/hifi into 19991-MacAppData 2018-11-27 17:17:50 -08:00
Seth Alves
fac27553d7 suppress 'No instance available' messages during shutdown. try a different way of shutting down AudioClient. 2018-11-27 17:02:48 -08:00
Sam Gondelman
4d621ba61c Merge branch 'master' into splash 2018-11-27 16:01:07 -08:00
amantley
ad777201f6 changed comment and cleaned up variable name in getJointName 2018-11-27 15:08:50 -08:00
SamGondelman
1f354f813c rework shader pre-compilation 2018-11-27 14:38:02 -08:00
Zach Fox
a4175b0428 Error handling in checkout 2018-11-27 14:17:28 -08:00
Jeff Clinton
fd87aad3c2
Merge pull request #14465 from sethalves/fix-up-disable-qml 
make cmake -DDISABLE_QML=1 work again
 2018-11-27 14:16:25 -08:00
amantley
579e2dd2ee removed unnecessary mirror joint code and cleaned up whitespace in rig.cpp 2018-11-27 14:10:20 -08:00
amantley
f2c5184c95 Merge remote-tracking branch 'upstream/master' into jointNameMapping 2018-11-27 13:57:00 -08:00
Seth Alves
8f21ade0c7 make cmake -DDISABLE_QML=1 work again 2018-11-27 12:41:40 -08:00
Shannon Romano
d6c7027fea
Merge pull request #14437 from sethalves/fix-asan-shared-lib-problem 
fix linux + clang build when memory debugging is enabled
 2018-11-27 12:25:13 -08:00
Dante Ruiz
29028386c8 Keyboard menu option in general settings 2018-11-27 11:56:07 -08:00
Sam Gondelman
f728a8ba5a
Update drawCellBounds.slv 2018-11-27 10:57:57 -08:00
Sam Gondelman
5ee803bf1d
Update parabola.slv 2018-11-27 10:54:56 -08:00
Sam Gateau
87730884ab
Merge pull request #14340 from Nex-Pro/patch-5 
Change to English spelling of 'declination'
 2018-11-27 10:53:28 -08:00
Sam Gondelman
3a4ec2cc27
Update glowLine.slv 2018-11-27 10:53:25 -08:00
Dante Ruiz
9cc896c4a8 fixing keyboard mallets dimensions 2018-11-27 10:34:34 -08:00
Zach Fox
67dfccafec Show item name when sending item 2018-11-27 10:19:14 -08:00
Ryan Huffman
ec19d2f119 Fix Create tooltips getting pushed down for tall rows 2018-11-27 19:07:04 +01:00
Thijs Wenker
e193dcbc60 - add missing start/middle/finish tooltips 
- style updates
 2018-11-27 19:07:04 +01:00
Dante Ruiz
c4a9ca3445 fix interface crashing when reloading scripts 2018-11-27 09:32:37 -08:00
NissimHadar
d6a4f89a08 Merge branch 'master' of https://github.com/highfidelity/hifi into 19991-MacAppData 2018-11-26 19:36:01 -08:00
Simon Walton
2bd66924ef Clear deleted avatar-entity list in mixer 2018-11-26 18:27:13 -08:00
Simon Walton
e10936ec34 Delete network query resources for failed queries 2018-11-26 18:26:25 -08:00
NissimHadar
4700b94f28 Merge branch 'master' of https://github.com/highfidelity/hifi into 19991-MacAppData 2018-11-26 18:11:20 -08:00
NissimHadar
aed947cb0a Minor cleanup. 2018-11-26 18:10:41 -08:00
NissimHadar
5da6ecad12 Compilation error. 2018-11-26 18:10:14 -08:00
NissimHadar
f9954990dd Merge branch '19991-MacAppData' of github.com:NissimHadar/hifi into 19991-MacAppData 2018-11-26 16:43:36 -08:00
NissimHadar
e7ab7094cd Kill Hifi processes after evaluation. 2018-11-26 16:42:48 -08:00
NissimHadar
e587820de3 Should be v1.0 2018-11-26 16:18:43 -08:00
NissimHadar
c211dc363b Updated README.md 2018-11-26 16:05:49 -08:00
NissimHadar
ebc7875f5e Updated README.md 2018-11-26 16:03:40 -08:00
Zach Fox
a9fd443f28 'improve' UI slightly 2018-11-26 16:03:07 -08:00
NissimHadar
2ade0078f4 Updated README.md 2018-11-26 16:02:22 -08:00
NissimHadar
e943504f60 Updated README.md 2018-11-26 15:59:08 -08:00
Zach Fox
31f7d747c8 Bugfixes; enable purchase asset from marketplace screen raise 2018-11-26 15:48:49 -08:00
Antonina Savinova
d547a29f94
Merge pull request #14438 from birarda/bug/update-wireshark-dissectors 
update wireshark dissector with correct control packet types
 2018-11-26 13:55:14 -08:00
amantley
19efa492b8 Merge remote-tracking branch 'upstream/master' into jointNameMapping 2018-11-26 13:48:43 -08:00
amantley
fb7b503ce9 removed unnecessary iteration of the joint name mapping in AnimSkeleton.cpp 2018-11-26 13:48:00 -08:00
Shannon Romano
422045861a
Merge pull request #14471 from jherico/fix/macbuild 
Make vcpkg build default to home directory on mac
 2018-11-26 13:30:06 -08:00
Zach Fox
8df5db4239 Allow scripts to open SendAsset screen with pre-filled info 2018-11-26 13:26:17 -08:00
Brad Davis
43b9aa29bc Make vcpkg build default to home directory on mac 2018-11-26 12:37:11 -08:00
Ryan Huffman
a6e203e3e5 Fix draggable inputs not being tabbable 2018-11-26 11:12:14 -08:00
amantley
26fc53ef78 cleaned up whitespace and removed debug prints 2018-11-26 11:08:59 -08:00