Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-20 22:21:04 +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
vladest
7233c47257 use selection model of TreeView 2017-09-14 15:36:12 +02:00
David Rowe
f22e2de525 Interim method for disabling controllerDispatcher lasers, grabbing, etc. 2017-09-14 17:21:45 +12:00
David Rowe
299a8078e3 Revert handControllerGrab.js related changes 2017-09-14 17:08:26 +12:00
Sam Gateau
a70f7dfc87 put updateCamera in its function 2017-09-13 22:05:20 -07:00
Sam Gateau
e4a5b7f250 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-13 19:28:56 -07: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
David Rowe
a4ecb69ea6 Merge branch 'master' into vr-edit-a 2017-09-14 12:26:20 +12:00
Brad Davis
e595541da0 Remove old versions of the VC Runtime from the installation directory 2017-09-13 17:21:54 -07:00
David Rowe
8e25ccac79 Tidying 2017-09-14 12:20:33 +12:00
anshuman64
d3dbd431d6 Merge pull request #11279 from druiz17/controller-dispatcher-1 
handControllerGrab Refactor -> controllerDispatcher
 2017-09-13 16:56:57 -07:00
David Rowe
6d42e82711 Condense create and clone to have one history entry 2017-09-14 11:52:36 +12:00
David Rowe
d501a8f7cc Fix scaling and changing hands history 2017-09-14 11:32:58 +12:00
Cain Kilgore
f741083352 Merge branch 'master' of https://github.com/highfidelity/hifi into 21542 2017-09-14 00:25:53 +01:00
Cain Kilgore
72ca62c4af Initial Commit - more to do. 2017-09-14 00:25:11 +01: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
David Rowe
1e2a3a13da Fix grip-delete entity history 2017-09-14 09:31:32 +12: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
David Rowe
18ce5ba30f Add undo/redo for physics 2017-09-14 08:53:20 +12: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
SamGondelman
f68a588323 rename isAA isAntiAliased 2017-09-13 10:24:10 -07:00
Olivier Prat
b8065d46ce Fixed bugs with conversion to packed floats 2017-09-13 19:15:51 +02: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
Atlante45
9f2b0258e9 Update baking status with the correct checkmark glyph 2017-09-13 09:54:55 -07:00
Atlante45
944a4fd49d Update hifi glyphs + font reference 2017-09-13 09:54:55 -07:00
Atlante45
7d9daea0f6 Transmit baking errors to interface for display. 2017-09-13 09:54:54 -07:00
Atlante45
48e58febc6 Remove deprecated AutoBaker 2017-09-13 09:54:54 -07:00
Anthony J. Thibault
9a1fa9b2f2 Fix for stylus intersection with tablet and home button for scaled tablets 2017-09-13 09:52:20 -07:00
David Kelly
bce92a622e cr feedback 2017-09-13 09:45:02 -07:00
Cain Kilgore
2427008ff3 Static 2017-09-13 17:40:04 +01:00
Stephen Birarda
dc86c6fe73 fixes for warnings in FBXReader/FBXWriter 2017-09-13 09:16:58 -07:00
Cain Kilgore
1c05311056 Some code cleanup 2017-09-13 16:48:18 +01:00