David Rowe
|
f02d057a83
|
Fix not kicking off physics if hand is inside entity
|
2017-09-15 13:43:53 +12:00 |
|
David Rowe
|
9da3ed0ceb
|
Emissive Create palette models
|
2017-09-15 11:24:33 +12:00 |
|
David Rowe
|
b0c951a2c4
|
Merge branch 'master' into vr-edit-a
|
2017-09-15 11:09:39 +12:00 |
|
Chris Collins
|
cfec2a29ae
|
Merge pull request #11314 from jherico/polyline_crash
Fix polyline crash and flicker
|
2017-09-14 15:42:49 -07:00 |
|
David Rowe
|
c6af82dedc
|
Increase maximum number of undo levels to 1000
|
2017-09-15 09:55:14 +12:00 |
|
David Rowe
|
f1572a165a
|
Fix history crash
|
2017-09-15 09:54:55 +12:00 |
|
David Rowe
|
378793d18e
|
Proper color circle
|
2017-09-15 08:48:47 +12: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
|
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 |
|
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 |
|
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 |
|
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 |
|
druiz17
|
1b288ef860
|
make garbbing radius the same as master
|
2017-09-13 16:15:36 -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 |
|
David Rowe
|
18ce5ba30f
|
Add undo/redo for physics
|
2017-09-14 08:53:20 +12: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 |
|
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 |
|
David Kelly
|
bce92a622e
|
cr feedback
|
2017-09-13 09:45:02 -07:00 |
|
Andrew Meadows
|
50b94887fa
|
Merge pull request #11339 from ElderOrb/case7469
7469 Mouse Pointer Depth is Incorrect in HMD Mode
|
2017-09-13 08:33:09 -07:00 |
|
Andrew Meadows
|
5741699bab
|
Merge pull request #11301 from Menithal/21484-Fix
WL21484 _- Hotfix - Solve Joint array issues with Similar, but not same Skeletons
|
2017-09-13 08:05:53 -07:00 |
|
David Kelly
|
7550374f8f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/oneFileWallet
|
2017-09-13 04:49:13 -07:00 |
|
David Rowe
|
709e7e7d90
|
Add undo/redo for clone
|
2017-09-13 15:25:40 +12:00 |
|
David Rowe
|
003c1c7bc5
|
Add undo/redo for group/ungroup
|
2017-09-13 15:16:16 +12:00 |
|
David Rowe
|
8c9026c892
|
Add undo/redo for scaling
|
2017-09-13 14:13:48 +12:00 |
|
David Rowe
|
97b2988005
|
Miscellaneous fixes
|
2017-09-13 14:13:23 +12:00 |
|
druiz17
|
b3ff5c86f7
|
fixed secondary triggers and chest lid
|
2017-09-12 14:43:06 -07:00 |
|
druiz17
|
0b360f455c
|
Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1
|
2017-09-12 14:38:07 -07:00 |
|
David Rowe
|
d718ea6928
|
Add undo/redo for move
|
2017-09-13 09:17:28 +12:00 |
|
Dante Ruiz
|
bf32f65efe
|
Merge pull request #11341 from vladest/flickable_off
Flickable off
|
2017-09-12 13:09:06 -07:00 |
|
Menithal
|
40beb4bca8
|
Some minor tweaks
|
2017-09-12 22:12:30 +03:00 |
|
Chris Collins
|
bb26cf2179
|
Merge pull request #11342 from Atlante45/RC-54
Fix RC-54 conflict with stable
|
2017-09-12 11:48:13 -07:00 |
|