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

61024 commits

This branch
This branch
All branches
Author SHA1 Message Date
druiz17
36912f1cd4 fixed toolbar disapearing after reloading default scripts 2017-10-18 16:03:32 -07:00
Zach Fox
77f967c7e1 Merge pull request #11623 from zfox23/mergeRC57IntoMaster_20171018 
2017-10-18: Merge RC57 into Master
 2017-10-18 15:52:51 -07:00
Zach Fox
1b7b35fe91 What does Rez mean? 2017-10-18 15:44:06 -07:00
luiscuenca
6e8756e8af Debug mode has been turned off 2017-10-18 15:40:03 -07:00
Zach Fox
91ac2ab58c LowerKeyboard button changes 2017-10-18 15:31:12 -07:00
Bradley Austin Davis
aa6c841357 Merge pull request #11588 from jherico/future/qrc 
Package all UI resources into a QRC built into the application.
 2017-10-18 15:29:34 -07:00
Zach Fox
a993386613 Change color of 'Instructions Opened on Desktop' to disabled gray 2017-10-18 15:13:28 -07:00
Zach Fox
33508b6b2b Update help text 2017-10-18 14:55:45 -07:00
Zach Fox
6c7096b0d7 Fix login button injection on individual item page 2017-10-18 14:53:39 -07:00
Zach Fox
e829bd2919 Fix 'Recent Activity' indentation 2017-10-18 14:47:14 -07:00
Daniela
e9f3dd6e44 Merge BubbleScale for IPD with hifi master. 2017-10-18 22:29:12 +01:00
Zach Fox
6f5fafb62f Add 'showDebugButtons' switch on Help ta 2017-10-18 14:12:43 -07:00
Liv
2ab606a98b Merge pull request #11615 from sethalves/pr-11614-for-rc-57 
Pr 11614 for rc 57
 2017-10-18 14:09:11 -07:00
Zach Fox
876001146a Get categories from backend instead of site 2017-10-18 14:05:47 -07:00
Zach Fox
de50eef9c7 Fix rez certified... 2017-10-18 13:54:46 -07:00
Zach Fox
949da17046 Wear It button for items with category 'Wearables' 2017-10-18 13:51:58 -07:00
John Conklin II
38de88bb68 Merge pull request #11621 from sethalves/fix-avatar-entity-bandwidth 
don't send avatar-entity updates for queryCube-changes
 2017-10-18 10:55:46 -07:00
Alan Z
6a2ee8c632 Change tablet model's screen 
Changed the texture for the model's screen to say: "Loading... If nothing happens shortly, re-open tablet"
 2017-10-18 10:54:18 -07:00
Zach Fox
a669aff453 Merge branch 'RC-57' of https://github.com/highfidelity/hifi into mergeRC57IntoMaster_20171018 2017-10-18 10:45:30 -07:00
John Conklin II
08cfa32858 Merge pull request #11610 from ElderOrb/case8217_RC57 
8217 Search in tablet doesn't update (RC-57)
 2017-10-18 10:41:33 -07:00
Nissim
fe286aff83 Andrew's corrections (per coding standard). 2017-10-18 08:42:07 -07:00
Melissa Brown
8965f2aac3 Merge pull request #11620 from cain-kilgore/21571 
WL 21571 - Remove "common questions" button
 2017-10-18 08:38:20 -07:00
Thijs Wenker
7b2dbc34dc Merge pull request #11622 from ctrlaltdavid/21572 
Fix importing entities from URL
 2017-10-18 14:25:42 +01:00
David Rowe
fcc7a3e440 Code review 2017-10-18 21:08:10 +13:00
David Rowe
f31e014e8b Quat.ZERO --> Quat.IDENTITY 2017-10-18 20:34:55 +13:00
David Rowe
5b6d33bcb2 Missing semicolon 2017-10-18 20:29:34 +13:00
David Rowe
f74c33f597 Fix importing entities from URL 2017-10-18 17:44:36 +13:00
Seth Alves
f1abb0cd55 don't send avatar-entity updates for queryCube-changes, because avatar-entities don't use them 2017-10-17 19:01:24 -07:00
Cain Kilgore
16467128a2 WL 21571 2017-10-18 02:42:08 +01:00
SamGondelman
58172cfbd4 merge from master 2017-10-17 18:05:59 -07:00
beholder
e8589d53dd updated code based on code review 2017-10-18 03:45:50 +03:00
Andrew Meadows
52813d1abe Merge pull request #11607 from jherico/fix/cmake_command_line 
CMake tweaks
 2017-10-17 17:39:54 -07:00
Andrew Meadows
25818fc5e9 Merge pull request #11613 from jherico/feature/qml_whitelist 
Support for custom functionality for specific QML URLs
 2017-10-17 17:34:22 -07:00
Seth Alves
e9d4da5a01 Merge pull request #11619 from druiz17/fix-web-entity-and-overlay-keyboard 
Fix web3Doverlays and webEntities keyboard not showup
 2017-10-17 17:32:04 -07:00
Bradley Austin Davis
9e46e288b1 Merge pull request #11604 from SamGondelman/endSphere 
Scale LaserPointer end overlay in C++
 2017-10-17 16:37:35 -07:00
druiz17
9a881c5e57 fix keyboard 2017-10-17 15:43:23 -07:00
Nissim
5249e97fa0 Merge branch 'master' into hazeZone 2017-10-17 15:09:22 -07:00
Nissim
845f3e4bee Merge branch 'hazeZone' of https://github.com/NissimHadar/hifi into hazeZone 2017-10-17 15:03:57 -07:00
Nissim
935180bf09 Fixed my bloody stupid mistake... 2017-10-17 15:02:05 -07:00
Andrew Meadows
5225ca3ca7 Merge pull request #11448 from jherico/future/clang_format 
Use clang format to enforce coding standards
 2017-10-17 13:34:01 -07:00
SamGondelman
975a3e5bbb Merge branch 'pointers' of https://github.com/highfidelity/hifi into pointers 2017-10-17 13:23:08 -07:00
SamGondelman
315baeae1f threading fix 2017-10-17 13:22:40 -07:00
Seth Alves
5e6c0870e7 handle camera-relative controller joints for other avatars 2017-10-17 13:06:40 -07:00
Bradley Austin Davis
50929b780d Add constructor to suppress warning 2017-10-17 12:59:41 -07:00
Seth Alves
aaf3c24a44 handle camera-relative controller joints for other avatars 2017-10-17 12:36:15 -07:00
Nissim
d53aadc617 Merge branch 'master' into hazeZone 2017-10-17 12:13:40 -07:00
SamGondelman
ba4f41b59a fix warnings 2017-10-17 12:03:59 -07:00
Bradley Austin Davis
f53a74b515 Support for custom functionality for specific QML URLs 2017-10-17 11:53:30 -07:00
Sam Gondelman
2e69d2b1ad missed one scripting interface reference 2017-10-17 11:13:02 -07:00
Nissim
5a1c4d5a30 Fixed gcc warning. 2017-10-17 11:08:15 -07:00