Stephen Birarda
|
aa7bd2066a
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings
|
2018-02-26 17:02:00 -08:00 |
|
Stephen Birarda
|
2872412f9c
|
fixes for comments from code reviews
|
2018-02-26 14:35:34 -08:00 |
|
Ryan Huffman
|
24da043937
|
Merge pull request #12437 from sethalves/fix-qt-5-10-udt
fix Qt 5.10 udt packet reading
|
2018-02-26 13:50:41 -08:00 |
|
Seth Alves
|
d60d8fe702
|
Merge pull request #12498 from vladest/fix_crash_startup
Search main window by checking object name
|
2018-02-26 13:06:10 -08:00 |
|
Sam Gondelman
|
d1d6adf447
|
Merge pull request #12493 from sethalves/fix-shadows-on-osx-1
fix osx shadows
|
2018-02-26 11:46:43 -08:00 |
|
John Conklin II
|
7d450daaa1
|
Merge pull request #12397 from hyperlogic/bug-fix/entity-mat-avatar-dual-quaternions
Bug fix/entity mat avatar dual quaternions
|
2018-02-26 11:37:33 -08:00 |
|
John Conklin II
|
4feea929ce
|
Merge pull request #12449 from misslivirose/fix/atp-collisions
change default add to world shape for asset browser
|
2018-02-26 11:15:01 -08:00 |
|
John Conklin II
|
6316f33282
|
Merge pull request #12485 from dback2/avatarMotors
Add dynamic mode for scripted avatar motor
|
2018-02-26 11:03:30 -08:00 |
|
Anthony J. Thibault
|
f5fcaae283
|
Merge branch 'master' into bug-fix/entity-mat-avatar-dual-quaternions
|
2018-02-26 10:55:44 -08:00 |
|
John Conklin II
|
e586a35d38
|
Merge pull request #12489 from vladest/fix_table_sort_indicator
Make sure sort indicator is attached to the right of title
|
2018-02-26 10:33:27 -08:00 |
|
John Conklin II
|
3201d2ba21
|
Merge pull request #12407 from NissimHadar/shadowControlsOffZvork
Shadow control for zones, models and shapes
|
2018-02-26 10:13:40 -08:00 |
|
Anthony J. Thibault
|
c8af9c6f04
|
Missing EPSILON
|
2018-02-26 10:05:15 -08:00 |
|
Anthony J. Thibault
|
0404b722e4
|
Code review feedback
|
2018-02-26 10:00:32 -08:00 |
|
NissimHadar
|
c0f20900a0
|
Merge pull request #12458 from NissimHadar/snapshotDefaultNameFix
Corrected edge case of creating a snapshot with "" as the filename.
|
2018-02-26 09:39:16 -08:00 |
|
John Conklin II
|
c227c11aa2
|
Merge pull request #12475 from ElderOrb/FB12518
fix for 'help icon in toolbar does not highlight when help window is open'
|
2018-02-26 09:35:56 -08:00 |
|
Zach Fox
|
b5c42bfeca
|
Merge pull request #12480 from zfox23/commerce_extendedCerts_apps
Commerce: Extended Certificates - Apps!
|
2018-02-26 08:24:53 -08:00 |
|
vladest
|
77ef0e05a1
|
Search main window by checking object name
|
2018-02-26 13:43:50 +01:00 |
|
vladest
|
62f2ba0dad
|
More intellectual calculation of title positions taking in account actual sort indicator glyph size
|
2018-02-24 09:32:08 +01:00 |
|
Seth Alves
|
9e156deaab
|
Merge pull request #12494 from druiz17/one-menu
Remove the avatarEntitiesBookmark menu option
|
2018-02-23 19:02:25 -08:00 |
|
Brad Hefta-Gaub
|
3d54f4d246
|
Merge pull request #12484 from ZappoMan/relaxDeadlockWatchdog
Relax deadlock watchdog
|
2018-02-23 17:09:30 -08:00 |
|
Sam Gondelman
|
e10af9b83d
|
Merge pull request #12462 from SamGondelman/entityDelete
Fix EntityItems not getting destroyed
|
2018-02-23 16:17:52 -08:00 |
|
David Back
|
283b5724ba
|
CR changes
|
2018-02-23 15:02:51 -08:00 |
|
David Back
|
da391564a8
|
CR changes
|
2018-02-23 15:01:29 -08:00 |
|
David Back
|
a418129bea
|
simplify to just changing timescales
|
2018-02-23 15:00:23 -08:00 |
|
Stephen Birarda
|
b18d5db062
|
Merge pull request #12495 from huffman/fix/baking-stuck
Fix/baking stuck
|
2018-02-23 15:19:29 -07:00 |
|
Ryan Huffman
|
c368c84f59
|
Make BakeAssetTask::abort thread-safe
|
2018-02-23 11:06:11 -08:00 |
|
Dante Ruiz
|
d0ec84b6c8
|
remove menu option for booking marking avatar entities
|
2018-02-23 10:45:59 -08:00 |
|
Stephen Birarda
|
85bd0442a7
|
Merge pull request #12488 from Atlante45/feat/backups-integration
Merge master into content archives PR
|
2018-02-23 11:19:42 -07:00 |
|
Zach Fox
|
5ee28297f3
|
Don't use eventLoop, since that will block the UI
|
2018-02-23 10:19:00 -08:00 |
|
Seth Alves
|
59bd05aa55
|
make shadow-related shader compile on osx
|
2018-02-23 09:22:34 -08:00 |
|
Dante Ruiz
|
d3be1a8a23
|
Merge branch 'master' of github.com:highfidelity/hifi
|
2018-02-23 09:20:03 -08:00 |
|
vladest
|
b8102cfbd7
|
Make sure sort indicator is attached to the right of title
|
2018-02-23 10:06:16 +01:00 |
|
Atlante45
|
c106fee659
|
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/backups-integration
|
2018-02-22 19:45:43 -08:00 |
|
Stephen Birarda
|
4c44bcfdba
|
Merge pull request #12487 from Atlante45/feat/backups-integration
Actually remove Backup from list during delete
|
2018-02-22 20:22:43 -07:00 |
|
Atlante45
|
eeda07bba6
|
Actually remove Backup from list during delete
|
2018-02-22 19:19:39 -08:00 |
|
Stephen Birarda
|
32830cbcd3
|
Merge pull request #12486 from Atlante45/feat/backups-integration
Never delete assets on load
|
2018-02-22 19:49:19 -07:00 |
|
Clément Brisset
|
0e5e63bf03
|
Merge pull request #12481 from birarda/feat/content-settings
immediately show restore, set restore filename, cleanup old AS baked content on start
|
2018-02-22 18:41:13 -08:00 |
|
Atlante45
|
cbabca5e3e
|
Add loadingComplete callback
|
2018-02-22 18:36:36 -08:00 |
|
Atlante45
|
e5c501a4cd
|
Never delete assets on load
|
2018-02-22 18:36:22 -08:00 |
|
Anthony J. Thibault
|
0469eafbe4
|
Switch between dualQuats and matrix skinning based on model entity scale factor.
|
2018-02-22 18:35:16 -08:00 |
|
Stephen Birarda
|
a0f7d4dd34
|
use const auto & where possible as per CR comments
|
2018-02-22 18:08:08 -08:00 |
|
David Back
|
ba0ba96d81
|
undo
|
2018-02-22 17:54:03 -08:00 |
|
Stephen Birarda
|
d69669512f
|
Merge pull request #12483 from Atlante45/feat/backups-integration
Remove deleted file from the _assetsOnDisk set
|
2018-02-22 18:46:25 -07:00 |
|
Atlante45
|
acf04830ee
|
Remove deleted file from the _assetsOnDisk set
|
2018-02-22 17:43:04 -08:00 |
|
ZappoMan
|
9f68accb30
|
add menu for testing unresponsive interface
|
2018-02-22 17:34:00 -08:00 |
|
David Back
|
083e461eb0
|
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMotors
|
2018-02-22 17:20:49 -08:00 |
|
David Back
|
902672f85e
|
add dynamic mode for scripted avatar motor
|
2018-02-22 17:20:36 -08:00 |
|
Zach Fox
|
249f0568a1
|
New loader
|
2018-02-22 17:14:23 -08:00 |
|
Stephen Birarda
|
d9d2b26519
|
delete baked content for unmapped files on AS startup
|
2018-02-22 16:55:35 -08:00 |
|
Stephen Birarda
|
3e4375b1e6
|
set recovery filename during domain content archive recovery
|
2018-02-22 16:54:56 -08:00 |
|