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

74308 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
NissimHadar
48fabf51f2 Corrected Linux compilation error. 2018-11-26 08:54:09 -08:00
NissimHadar
f4f1ac8f02 Merge branch '19991-MacAppData' of https://github.com/NissimHadar/hifi into 19991-MacAppData 2018-11-26 08:25:54 -08:00
NissimHadar
2913d4f984 Removed baaaaaad file. 2018-11-26 08:25:07 -08:00
Sam Gateau
f9fb4b61c1 Merge branch 'master' of https://github.com/highfidelity/hifi into one 2018-11-25 22:40:06 -08:00
SamGondelman
e282d51883 CR 2018-11-26 01:15:07 -05:00
NissimHadar
6313ab8ed7 Working on possible crash on Mac. 2018-11-25 20:10:01 -08:00
NissimHadar
e173b29687 Added warning 2018-11-24 20:43:13 -08:00
NissimHadar
26319e6d6f Remove all disk images 2018-11-24 20:37:21 -08:00
NissimHadar
bbbc358ccb Restore AppData folder on Mac 2018-11-24 20:31:19 -08:00
NissimHadar
f62fd97f09 Updated to v1.1 2018-11-24 09:49:13 -08:00
NissimHadar
b3f646e9dc Updated to v1.1 2018-11-24 09:44:46 -08:00