Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-10 07:13:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
57429 commits 21 branches 28 tags 1.2 GiB
Commit graph

57429 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zach Fox
e602d3610e Initial commit for HoverOverlayInterface 2017-07-14 17:26:53 -07:00
Andrew Meadows
5a4f56388b Merge pull request #10881 from hyperlogic/feature/smooth-ik-chains 
Smooth IK when trackers are disabled / enabled.
 2017-07-14 16:59:30 -07:00
druiz17
3b112450f0 Merge pull request #10959 from druiz17/bug/wrong-tablet-state 
Fix tablet scripting interface setting its internal state to home when switching between toolbar and tablet mode
 2017-07-14 14:31:04 -07:00
utkarshgautamnyu
fef375ef50 Merge pull request #10962 from highfidelity/clean_install 
Added option in the installer for a clean install
 2017-07-14 14:09:32 -07:00
Atlante45
2d246d2563 Implement shutdown with parent for Mac and Linux 2017-07-14 11:39:32 -07:00
Atlante45
366ce69e66 Add info on how the child AC finished 2017-07-14 11:39:32 -07:00
Dante Ruiz
93d1725b3c make cursor position change based on mouse click position 2017-07-14 19:30:35 +01:00
Seth Alves
806d9f1436 Merge pull request #10968 from druiz17/bug/load-priority 
Prioritize file:// requests over http://
 2017-07-14 11:13:35 -07:00
Zach Fox
a9197509d8 Merge pull request #10965 from CainFoool/avatar-scaler 
WL 21422 - Add a scale slider for avatar size
 2017-07-14 10:30:33 -07:00
Dante Ruiz
68fa426da9 set file url as higher priority 2017-07-14 18:17:13 +01:00
Andrew Meadows
9584035aa4 Merge pull request #10886 from 1P-Cusack/21420 
[Worklist #21420] Implement Create button disabled state (details below).
 2017-07-14 10:06:45 -07:00
Andrew Meadows
17f5c9099e Merge pull request #10944 from misslivirose/fix-chat-help-text 
String pass on Chat.js
 2017-07-14 09:58:35 -07:00
Anthony J. Thibault
de199bff9d code review feedback 2017-07-14 09:47:37 -07:00
Seth Alves
741feb7e54 Merge pull request #10951 from druiz17/tablet-modal-fixes 
Allow the tablet to be closed when a modal dialog is open.
 2017-07-14 09:40:58 -07:00
Seth Alves
ba76020617 Merge pull request #10967 from elmanytas/improve_build_linux_doc 
Create ubuntu specific documentation.
 2017-07-14 09:40:02 -07:00
Cain Kilgore
b7ed3ce659 Prettified the Comment 2017-07-14 17:33:17 +01:00
Cain Kilgore
ee1f371902 Fixed step counted not resetting to 1 properly 2017-07-14 16:29:19 +01:00
elmanytas
f692a2e4bf Create ubuntu specific documentation based on https://forums.highfidelity.com/t/how-to-compile-a-stable-build-of-the-linux-server-stack-on-ubuntu-16-04-lts/11528/16 and tested yesterday. 2017-07-14 08:44:59 +02:00
Cain Kilgore
c60c8c7b13 Missed two tabs.. 2017-07-14 00:59:25 +01:00
Cain Kilgore
4f8d958831 Some code cleaning, added comment for reasoning of specifying min and max in the qml 2017-07-14 00:56:42 +01:00
Brad Hefta-Gaub
b35d696077 Merge pull request #10966 from sethalves/fix-softattachment-crash 
avoid crash in soft-attachment code
 2017-07-13 15:48:23 -07:00
Cain Kilgore
72c3e789e9 More Spaces! 2017-07-13 23:42:20 +01:00
Cain Kilgore
d74c834f12 Fixed colour scheming and changed to a reload icon 2017-07-13 22:40:37 +01:00
Cain Kilgore
60300f5d7b changed to icon (hopefully) 2017-07-13 22:06:44 +01:00
Howard Stearns
17fcfad957 Merge pull request #10875 from highfidelity/spectator-camera 
Spectator Camera
 2017-07-13 13:57:18 -07:00
Andrew Meadows
de21391062 add script to measure cost of entity lookup by id 2017-07-13 13:30:57 -07:00
Andrew Meadows
c7ec82f98a use local copy of _element for thread safety 2017-07-13 13:30:57 -07:00
Andrew Meadows
8fc4d1f43e make UNEXPECTED logs warnings 2017-07-13 13:30:57 -07:00
Andrew Meadows
02bc9b9610 minimize the lock context 2017-07-13 13:30:57 -07:00
Andrew Meadows
f71ef554b7 use copy of _entityMap for debug logging 2017-07-13 13:30:57 -07:00
Andrew Meadows
fe79514b08 lock when changing EntityTree elements 2017-07-13 13:30:57 -07:00
Andrew Meadows
a0c6c49360 bump some "debug" messages to "warning" status 2017-07-13 13:30:57 -07:00
Andrew Meadows
39e5259e03 remove unused variable 2017-07-13 13:30:57 -07:00
Andrew Meadows
7ea1e7285f map EntityItemID to EntityItemPointer 2017-07-13 13:30:57 -07:00
Cain Kilgore
f91a8c0f53 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-scaler 2017-07-13 21:25:39 +01:00
Seth Alves
12f52e8f20 don't do SoftAttachmentModel::updateClusterMatrices if geometry isn't ready 2017-07-13 13:18:21 -07:00
Zach Fox
2c94917fb8 Add necessary button protection 2017-07-13 12:58:47 -07:00
Andrew Meadows
4f75558b49 Merge pull request #10963 from sethalves/fix-sort-joints 
put result of Avatar::getJointNames back in index-order
 2017-07-13 12:44:32 -07:00
Cain Kilgore
677b177dce Build error fix 2017-07-13 20:29:52 +01:00
Cain Kilgore
247e7b8bed indentation!!! 2017-07-13 19:25:31 +01:00
Cain Kilgore
092725ad1a a thing 2017-07-13 19:24:30 +01:00
Cain Kilgore
5329c1ce42 Fixed Indentation, removed old debug code 2017-07-13 19:23:28 +01:00
Cain Kilgore
521babb6bd Avatar Scaler - should be PR Ready. 2017-07-13 19:18:51 +01:00
Dante Ruiz
03fbd2a1e6 fixed another warning 2017-07-13 19:12:34 +01:00
Seth Alves
59d88cb564 Merge pull request #10941 from sethalves/audio-injector-smart-pointers 
Audio injector smart pointers
 2017-07-13 11:00:02 -07:00
utkarshgautamnyu
35f97837e7 ensured clean install state is not saved in the registry 2017-07-13 10:50:14 -07:00
Dante Ruiz
b46dc7d389 removed space 2017-07-13 18:42:26 +01:00
Dante Ruiz
3cbfd4c917 Merge branch 'master' of github.com:highfidelity/hifi into tablet-modal-fixes 2017-07-13 18:40:54 +01:00
Dante Ruiz
070db2922d fixed warning compile error 2017-07-13 18:40:38 +01:00
David Kelly
60751f07bd Merge pull request #10961 from davidkelly/dk/hmdPreviewFix 
hmd preview fix
 2017-07-13 10:32:33 -07:00