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

59301 commits

This branch
This branch
All branches
Author SHA1 Message Date
Chris Collins
cfec2a29ae Merge pull request #11314 from jherico/polyline_crash 
Fix polyline crash and flicker
 2017-09-14 15:42:49 -07:00
Clément Brisset
9816070e70 Merge pull request #11366 from Atlante45/feat/auto-bake 
Update feat/auto-bake with master
 2017-09-14 15:36:32 -07:00
Atlante45
ae14f1f88e Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake 2017-09-14 15:34:20 -07:00
Clément Brisset
cbe61871dc Merge pull request #11346 from birarda/feat/draco-in-baking 
Add mesh compression to baking library and FBXReader
 2017-09-14 15:32:58 -07:00
Stephen Birarda
43196cd0a6 fix buffer resizing to only occur when attribute is present 2017-09-14 14:46:48 -07:00
Stephen Birarda
bb98df38d4 remove re-grabbing of draco faces 2017-09-14 14:42:40 -07:00
Thijs Wenker
af4bc59307 clone local avatar entities 2017-09-14 23:31:51 +02:00
Stephen Birarda
9cb4e2c5f2 address code review comments 2017-09-14 13:58:48 -07:00
Brad Davis
688ee68cf9 Ensure thread-safety for model pointer access 2017-09-14 12:29:23 -07:00
LaShonda Hopper
24b6cd71fc [Case 6107] Fixes Tablet import sorting (details below). 
This ports the fix from FileDialog to TabletFileDialog.

* There appears to be 2 versions of this file:
    * qml/dialogs/TabletFileDialog.qml
    * qml/hifi/tablet/tabletWindows/TabletFileDialog.qml

Testing the tablet within desktop mode works without this fix most
likely because it uses qml/hifi/tablet/tabletWindows/TabletFileDialog.qml
which didn't receive the same refactor pass via d3282a4e.

Tested on Vive:  Menu -> Edit -> Import Entities

Changes Committed:
	modified:   interface/resources/qml/dialogs/TabletFileDialog.qml
 2017-09-14 14:49:49 -04:00
Seth Alves
10494cf3e0 Merge pull request #11359 from vladest/fix_runningscripts_selection 
use selection model of TreeView
 2017-09-14 11:22:08 -07:00
Seth Alves
11df5a447e Merge pull request #11310 from ElderOrb/case6718 
6718 PR11082: Help text cannot be dismissed by clicking on the text i…
 2017-09-14 11:17:48 -07:00
Brad Davis
aef85eb69d Fix polyline rendering using default texture 2017-09-14 10:48:14 -07:00
Seth Alves
cf2979dc78 Merge branch 'master' of github.com:highfidelity/hifi into rework-scriptengine-lifetime 2017-09-14 10:42:26 -07:00
Seth Alves
d89f2b77da rework ScriptEngine lifetimes using 'smart' pointers 2017-09-14 10:42:21 -07:00
Anthony J. Thibault
7959988622 Merge branch 'master' into feature/ant-man 2017-09-14 10:37:45 -07:00
Anthony J. Thibault
7c725756f1 IPD Fixes for controllerDispatcher and controllerModules 2017-09-14 10:36:05 -07:00
Seth Alves
dbaf60a957 Merge pull request #11363 from ElderOrb/lint-fix 
add missing comma
 2017-09-14 09:10:14 -07:00
beholder
61c5395f44 add missing comma 2017-09-14 18:48:43 +03:00
Brad Davis
501eee8b10 Fix transform of polylines with high update rates 2017-09-14 08:45:37 -07:00
Brad Davis
75e7146c5b Fix polyline crash and flicker 2017-09-14 08:45:36 -07:00
Thijs Wenker
523d099f70 Merge pull request #11355 from jherico/crash/zone-keylight 
Fix race condition accessing QString sub-properties in zones
 2017-09-14 16:03:05 +02:00
Thijs Wenker
ddb4b2d2be Merge pull request #11354 from hyperlogic/bug-fix/good-riddance 
Remove handControllerGrab.js, see controllerDispatcher.js instead.
 2017-09-14 15:42:30 +02:00
vladest
7233c47257 use selection model of TreeView 2017-09-14 15:36:12 +02:00
Anthony J. Thibault
9a9f4a0d24 Fix controllerModules with appropriate IPD scale changes 2017-09-13 18:23:54 -07:00
Anthony J. Thibault
8fb69a9867 Merge branch 'master' into feature/ant-man 2017-09-13 18:23:11 -07:00
Brad Davis
f4d8216501 Fix race condition accessing QString sub-properties in zones 2017-09-13 18:06:21 -07:00
Anthony J. Thibault
745d2ff395 Remove handControllerGrab.js, see controllerDispatcher.js instead. 2017-09-13 17:36:56 -07:00
Brad Davis
e595541da0 Remove old versions of the VC Runtime from the installation directory 2017-09-13 17:21:54 -07:00
anshuman64
d3dbd431d6 Merge pull request #11279 from druiz17/controller-dispatcher-1 
handControllerGrab Refactor -> controllerDispatcher
 2017-09-13 16:56:57 -07:00
druiz17
1b288ef860 make garbbing radius the same as master 2017-09-13 16:15:36 -07:00
Stephen Birarda
7b36105793 Merge pull request #11347 from Atlante45/feat/auto-bake 
Finalize auto baking UI
 2017-09-13 16:05:38 -07:00
druiz17
310dbce65d fixed merge conflict 2017-09-13 15:55:04 -07:00
Chris Collins
84998a3360 Merge pull request #11351 from Atlante45/new-master 
Update master from stable
 2017-09-13 14:28:44 -07:00
Anthony J. Thibault
a505a16232 Don't rescale tablet, in desktop mode, when sensorToWorldScale changes. 2017-09-13 14:22:49 -07:00
Anthony J. Thibault
ae2d0e89b4 Fixes for desktop tablet 2017-09-13 14:18:00 -07:00
Stephen Birarda
bfb4dd0cdb disable warning c4267 when including draco 2017-09-13 14:00:41 -07:00
Stephen Birarda
c365e1718e set include dir for draco the same across the board 2017-09-13 13:51:26 -07:00
Stephen Birarda
1e6154fbc8 make draco compile flags OS X only 2017-09-13 13:45:26 -07:00
Stephen Birarda
4066c9392d output from oven into folder with model name 2017-09-13 13:34:15 -07:00
LaShonda Hopper
33c8e90e34 [QML] Fixes FogBugz Case 6107: Can't sort on import menu (details below). 
Looking through the log revealed the following warning:
".../qml/dialogs/FileDialog.qml:489: Error: Cannot assign to non-existent property 'sortOrder'"

There was some refactoring to address some HMD functionality in 51b44d90
which resulted in an update to fileTableView's model.  This appears to be the point
at which sorting stopped working.

This updates the fileTableView's sorting methods to use fileTableModel as opposed
to fileTableView's model(filesModel).  This appears safe given fileTableModel internally wraps
around filesModel and is responsible for updating its value.  I'm relatively new
to QML/Qt; any comments or suggestions are welcome.

Tagging @vladest since they may want to be aware given 51b44d90.

Case Link:
https://highfidelity.fogbugz.com/f/cases/6107

Reviewed-by: Leander Hasty <leander@1stplayable.com>

Changes Committed:
	modified:   interface/resources/qml/dialogs/FileDialog.qml
 2017-09-13 16:25:36 -04:00
Atlante45
d3966ce8c2 Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master 2017-09-13 13:14:25 -07:00
Melissa Brown
49ab8af428 Merge pull request #11344 from Menithal/21536 
21536: Clap App!
 2017-09-13 12:54:31 -07:00
Anthony J. Thibault
de5f0ad987 WebTablet.js: calcSpawnInfo works more consistently. 2017-09-13 12:01:41 -07:00
Menithal
59746c564b 21536: Applied forgotten beutify to file 2017-09-13 21:24:24 +03:00
David Kelly
030b39050a Merge pull request #11343 from davidkelly/dk/oneFileWallet 
Wallet updates
 2017-09-13 11:15:03 -07:00
Chris Collins
1b608a7d35 Merge pull request #11315 from highfidelity/RC-54 
Beta Release 54 - Includes up to Developer Release 7078
 2017-09-13 10:36:28 -07:00
Atlante45
c04a6b5b88 Add error tooltip 2017-09-13 09:54:56 -07:00
Atlante45
9e11ae311e Fix error reporting 2017-09-13 09:54:55 -07:00
Atlante45
2e84f48539 Fix QML errors 2017-09-13 09:54:55 -07:00