Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-21 02:40:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
61951 commits 72 branches 59 tags 1.2 GiB
Commit graph

61951 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Rowe
18f4a3bf35 Fix hiding UI when hand is inside entity that camera isn't 2017-09-11 15:43:19 +12:00
David Rowe
ce15d0ecd0 Fix color picker circle and slider images clipping at oblique angles 2017-09-11 15:18:42 +12:00
vladest
dfaa8761e5 Make sure root item is created before lambda gets called for desktop loader 2017-09-10 20:08:40 +02:00
Nick Shaffner
d5381a810e brew tap homebrew/versions no longer works. (or is needed) 
The command now outputs:

> brew tap homebrew/versions
Warning: homebrew/versions was deprecated. This tap is now empty as all its formulae were migrated.

nonetheless: 

>   brew install cmake openssl

still works.
 2017-09-09 12:55:28 -07:00
Cain Kilgore
b69bd0ef49 Removed old Disconnect 2017-09-09 17:23:18 +01:00
Cain Kilgore
f6e22b0733 Changes 
The ID no longer relies on the Avatar Session ID as this changed per domain switch. The intention of this PR is to be able to group the log files easier, hence why it now relies on Interface ID instead. Additionally, when no ID is found when the interface is first launched, the ID doesn't appear in the rolled over log file. It will just appear blank.
 2017-09-09 17:21:42 +01:00
David Rowe
bd95274a72 Merge branch 'master' into vr-edit-a 2017-09-09 20:16:09 +12:00
David Rowe
6f4f8e583b Don't kick off physics for Text and Web entities 2017-09-09 20:15:15 +12:00
David Rowe
a7e04fcba6 Don't color particle effects 2017-09-09 20:14:09 +12:00
David Rowe
6ba6c6ee35 Reduce entity fade-in time 2017-09-09 18:00:21 +12:00
David Rowe
561c3e4653 Make polylines and polyvoxes able to be colored 2017-09-09 17:24:07 +12:00
Dante Ruiz
eb3b61ceed Merge pull request #7 from sethalves/controller-dispatcher-1 
Controller dispatcher 1
 2017-09-08 17:13:17 -07:00
Seth Alves
9c098f1a0c Merge branch 'controller-dispatcher-1' of github.com:druiz17/hifi into controller-dispatcher-1 2017-09-08 17:10:02 -07:00
druiz17
bf1b5bd061 Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-09-08 17:07:47 -07:00
druiz17
405d8c3afc fixing cloning and laser 2017-09-08 17:07:27 -07:00
Seth Alves
a1ffc7abd0 distance from controller to object is sometimes decided by pickray 2017-09-08 17:04:09 -07:00
Seth Alves
56d5f587b6 Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-09-08 17:03:29 -07:00
Ryan Huffman
3d6d383a15 Clean up duplicate list code in encodeFBXProperty 2017-09-08 16:58:57 -07:00
Ryan Huffman
9b462171f6 Add draco support to FBXBaker 2017-09-08 16:58:29 -07:00
David Kelly
1903f65e45 oops 2017-09-08 16:58:12 -07:00
Seth Alves
f5d77104c3 Merge pull request #11332 from sethalves/squelch-cannot-render 
suppress repeated 'item could not be rendered' messages
 2017-09-08 16:23:22 -07:00
David Kelly
0a3958f743 cr feedback 2017-09-08 16:06:30 -07:00
Cain Kilgore
0820eadc5b Fixed a thing 2017-09-08 23:52:04 +01:00
Cain Kilgore
387e474889 WIP 2017-09-08 23:48:09 +01:00
Seth Alves
eddf1efb6f Merge branch 'squelch-cannot-render' of github.com:sethalves/hifi into controller-dispatcher-1 2017-09-08 15:32:54 -07:00
Anthony Thibault
3de518a843 Merge pull request #11331 from hyperlogic/bug-fix/unexpected-t-pose 
Fix MyAvatar getting stuck in T-pose on loading
 2017-09-08 15:18:57 -07:00
druiz17
42ef397b5e fixed include path 2017-09-08 15:13:19 -07:00
Cain Kilgore
f109a86b23 Fixed small crash bug on exit 2017-09-08 23:05:22 +01:00
Seth Alves
967d3f69d3 suppress repeated 'item could not be rendered' messages 2017-09-08 14:13:58 -07:00
Anthony J. Thibault
72e0c844e4 Merge branch 'master' into feature/ant-man 2017-09-08 14:08:26 -07:00
David Kelly
99cdbbe306 and lets fix the purchases flow too 2017-09-08 14:00:09 -07:00
druiz17
5d1a5eea4c added test file 2017-09-08 13:45:45 -07:00
Cain Kilgore
7b39cb7791 Should work now 2017-09-08 21:44:38 +01:00
samcake
94a2cb90da Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-08 13:34:46 -07:00
druiz17
b3e2c7ac56 Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-09-08 13:30:48 -07:00
druiz17
e33012e522 laser on tablet update 2017-09-08 13:30:30 -07:00
David Kelly
c142215935 oops -- this is a windows-only thing (like so many other problems) 2017-09-08 12:52:12 -07:00
Cain Kilgore
dfbd25fd77 Now pls 2017-09-08 20:51:41 +01:00
Sam Gateau
ed8aa8b74d Merge pull request #11160 from Zvork/outline 
Outline effect
 2017-09-08 12:32:01 -07:00
Cain Kilgore
7f4cc0ed2a Should fix the Mac Build 2017-09-08 20:21:17 +01:00
druiz17
dbb91e5953 Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-09-08 11:50:43 -07:00
druiz17
f0c12e50dd some small bug fixes 2017-09-08 11:50:19 -07:00
David Kelly
3e0b222ec4 fix wallet for new openssl 2017-09-08 11:44:19 -07:00
Anthony J. Thibault
559ac6786d Fix MyAvatar getting stuck in T-pose on loading 
Before this change, there was a race condition between the main thread calling Model::initWhenReady,
and the render thread calling Avatar::fixupModelsInScene().  They both would end up setting the
Model::_addedToScene flag.  This race caused Model::initWhenReady() to never return true, which
resulted in the MyAvatar class never initializing the animation system.
 2017-09-08 11:44:06 -07:00
Bradley Austin Davis
48b6586d01 Modifying SDL initialization due to crash on OSX 2017-09-08 11:36:32 -07:00
Daniela
e453bf8d55 Refactoring. 2017-09-08 17:58:16 +01:00
Daniela
08688dc9ed Refactoring. 2017-09-08 17:56:11 +01:00
Stephen Birarda
09d18b5ba9 handle special include path for Draco on WIN 2017-09-08 09:47:16 -07:00
Stephen Birarda
91f4551598 add draco to the oven tool 2017-09-08 09:46:55 -07:00
Stephen Birarda
0d7b50cfb6 remove old texture type method 2017-09-08 09:44:19 -07:00