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

61951 commits

This branch
This branch
All branches
Author SHA1 Message Date
Chris Collins
f41ca5ab6f Merge pull request #11277 from Atlante45/new-master 
Update master from stable
 2017-08-31 09:48:20 -07:00
Zach Fox
9bbcf3e1ae Merge pull request #11232 from zfox23/SelectionScriptingInterface 
Selection Scripting Interface
 2017-08-31 08:57:24 -07:00
vladest
d6a7e69275 Merge branch 'master' into webbrowser_updates 2017-08-31 15:50:04 +02:00
vladest
a80d9a22df Added option to disable flickable for web view 2017-08-31 12:20:20 +02:00
Hisham Qayum
a446851e90 Merge branch 'master' of https://github.com/highfidelity/hifi 2017-08-30 20:03:56 -08:00
David Rowe
8205b0d9d2 Merge branch 'master' into vr-edit-a 2017-08-31 15:45:15 +12:00
David Rowe
652fbaa9b7 Refactoring 2017-08-31 15:30:04 +12:00
David Rowe
3dacd1fcda Tidy options settings code 2017-08-31 13:55:00 +12:00
David Rowe
5299596254 Code tidying 2017-08-31 13:36:48 +12:00
Anthony J. Thibault
6e6687c3a6 Change tablet dimensions as sensorToWorldScale changes 2017-08-30 18:21:25 -07:00
David Rowe
3f0872465f Rename new code items 2017-08-31 13:20:37 +12:00
David Rowe
c6f987c00c Remove old code 2017-08-31 13:05:50 +12:00
Seth Alves
41b51804dc fix comment 2017-08-30 17:53:55 -07:00
Seth Alves
3f0a95d8db remove unneeded line 2017-08-30 17:53:20 -07:00
Seth Alves
ca86ce59c2 fix a bug that cuased dynamic children to wink in and out and then vanish 2017-08-30 17:44:42 -07:00
Stephen Birarda
84b5afaa4d mark task dispatcher as override 2017-08-30 17:28:17 -07:00
Ryan Huffman
2aa39e7da4 Fix baking library not automatically being built 2017-08-30 16:53:51 -07:00
Ryan Huffman
d68338f0b0 Add error handling to asset server baking 2017-08-30 16:53:31 -07:00
Dante Ruiz
47699d4439 fixed edit.js 2017-08-30 16:52:59 -07:00
Stephen Birarda
4e1e483e27 link DL libs with FBX SDK for baking 2017-08-30 16:50:20 -07:00
Stephen Birarda
81fdc27ca8 use 2017.1 FBX SDK on all platforms, change linux location 2017-08-30 16:46:43 -07:00
David Rowe
63074ad928 Fix button press distance 2017-08-31 11:44:52 +12:00
Zach Fox
913618ded5 Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface 2017-08-30 16:13:50 -07:00
David Kelly
84e13c84ae Merge pull request #11273 from howard-stearns/reset-wallet 
reset wallet
 2017-08-30 16:10:26 -07:00
David Rowe
e8af4bdb2d Fix up hover state of toggle button after pressing 2017-08-31 10:54:20 +12:00
Anthony J. Thibault
c9cdaadeb5 Better scale support in SpatiallyNestable class. 
Previously avatar used SpatiallyNestable scale to keep track of model rendering scale.
It now uses a new member variable _modelScale instead. This is important because the
notion of "Avatar" space does NOT include scale, so this is now reflected correctly in
the SpatiallyNestable class.

Similarly, EntityItems no longer stuff dimensions into the SpatiallyNestable scale
field.  a new _dimensions member variable is used instead.  The SpatiallyNestable scale
field for entities should always be one.

Parent joints can now have scale if getAbsoluteJointScaleInObjectFrame() returns a non-zero scale.
This is used in the case of the faux SENSOR_TO_WORLD_MATRIX_INDEX joint.

Overlays now ignore the SpatiallyNestable scale, and render using only orientation, position and dimensions.

Added qDebug stream support for Transform class.
 2017-08-30 15:46:36 -07:00
David Kelly
962d1fc81d Merge branch 'master' of https://github.com/highfidelity/hifi into reset-wallet 2017-08-30 15:30:29 -07:00
Zach Fox
dbb7023fc1 Fix warnings 2017-08-30 15:26:25 -07:00
David Kelly
988ee8c8d1 fix image provider, couple other things 2017-08-30 15:23:54 -07:00
Dante Ruiz
3960ec7d5a finish main handControllerGrab refactoring 2017-08-30 15:20:03 -07:00
Stephen Birarda
ed21ad11d2 add baking to default build, add default to baking status 2017-08-30 15:14:53 -07:00
Zach Fox
3f0d44990a Hook up bounding box rendering to Selection Scripting Interface 2017-08-30 14:54:23 -07:00
Ryan Huffman
70430c009d Fix ATP requests not keeping track of all mapping redirects 2017-08-30 14:35:12 -07:00
David Rowe
59505b4334 Fix up colors and highlighting of group/ungroup and toggle buttons 2017-08-31 09:30:11 +12:00
Stephen Birarda
3abca67f1a remove use of auto in TextureBaker for OS X compile 2017-08-30 14:30:11 -07:00
Stephen Birarda
f2997c0997 refuse to perform mapping operations in /.baked/ 2017-08-30 14:30:08 -07:00
vladest
46ce512e3d Merge branch 'master' into flickable_web_pages 2017-08-30 23:17:05 +02:00
vladest
b547b2573e Added logged in property 2017-08-30 23:15:39 +02:00
Zach Fox
fdcc149c34 Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface 2017-08-30 13:27:18 -07:00
Zach Fox
500427010d Merge pull request #11276 from zfox23/commerce_polishTxnHistory 
Polish transaction history and prepare for whatever new design
 2017-08-30 13:25:55 -07:00
Zach Fox
17d999e721 Fixes 2017-08-30 13:25:34 -07:00
David Rowe
db27b97ec7 Add zero indicators to Physics options' sliders 2017-08-31 08:24:38 +12:00
Ryan Huffman
31345e4264 Fix ATP requests not keeping track of all mapping redirects 2017-08-30 13:15:14 -07:00
vladest
903036a709 Merge branch 'master' into tablet_login_button 2017-08-30 22:12:03 +02:00
Atlante45
9de4c3d0af Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master 2017-08-30 13:10:48 -07:00
Zach Fox
580865fa5a Add skeleton for infinite scroll 2017-08-30 12:54:26 -07:00
Zach Fox
7a7d7f95d7 Polish transaction history and prepare for whatever new design 2017-08-30 12:45:13 -07:00
Zach Fox
6f6edf460e Merge pull request #11274 from zfox23/commerce_zachsPunchlist3 
Remove most dependencies on 'onVisibleChanged'
 2017-08-30 12:30:09 -07:00
Luis Cuenca
304c6451eb Update BUILD_LINUX.md 2017-08-30 11:56:49 -07:00
Zach Fox
fb4b0f60fa Remove most dependencies on 'onVisibleChanged' 2017-08-30 11:55:29 -07:00