Commit graph

64862 commits

Author SHA1 Message Date
Anthony J. Thibault
470aa53454 AnimTest now passes 2018-02-28 17:12:57 -08:00
Anthony J. Thibault
95dfee25b9 Relaxed tolerance on AnimIK test so it can pass... 2018-02-28 16:43:49 -08:00
Anthony J. Thibault
f291ddae97 Animation unit tests now compile.
not all of them pass tho...
2018-02-28 15:55:08 -08:00
Sam Gondelman
354fae5063
Merge pull request #12513 from SamGondelman/revertShadows
Revert can cast shadow work
2018-02-27 13:13:09 -08:00
SamGondelman
0fca56eef0 Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork"
This reverts commit 3201d2ba21, reversing
changes made to c0f20900a0.
2018-02-27 11:33:05 -08:00
John Conklin II
abe7c29b5e
Merge pull request #12492 from thoys/fix/exportBooleanPropertiesProperly
Export boolean entity properties properly
2018-02-27 09:18:46 -08:00
John Conklin II
48f0cded05
Merge pull request #12440 from humbletim/Leopoly_Phase1_010_graphics-scripting
Leopoly_Phase1_010 Graphics Scripting
2018-02-27 07:53:25 -08:00
John Conklin II
25144f0fec
Merge pull request #12456 from Atlante45/fix/min-spec-crash
Fix crash when passing --checkMinSpec flag
2018-02-26 17:35:46 -08:00
Clément Brisset
2a7a71db13
Merge pull request #12477 from Atlante45/new-master
Merge stable back into master
2018-02-26 17:18:24 -08:00
Atlante45
2a204533f4 Add comments to startup processes 2018-02-26 16:25:41 -08:00
humbletim
d3bae87066 * remove unneeded Q_DECLARE_METATYPEs
* CR feedback
2018-02-26 19:07:55 -05:00
humbletim
767569bc40 * changes per CR feedback
* make MeshPart.topology read-only
* JS Graphics API starter documentation
* remove redundant qscriptvalue sequence registrations
2018-02-26 18:00:22 -05: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
humbletim
3dbe5d79bb fix windows punctilious warnings 2018-02-26 06:01:16 -05:00
humbletim
54dc0240b0 remove bufferviewscripting refs; fix compiler warnings 2018-02-26 05:26:35 -05:00
humbletim
f824edd04e * remove Model_temporary_hack
* split gpuhelpers and mesh part
* fix objwriter
* more work on bufferview helpers
* cr cleanup
2018-02-26 04:58:22 -05: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
Atlante45
800d15b405 Make sure settings timer is running 2018-02-23 16:23:50 -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
Dante Ruiz
d0ec84b6c8 remove menu option for booking marking avatar entities 2018-02-23 10:45:59 -08: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
Thijs Wenker
a27a5a7e1f export boolean properties properly 2018-02-23 18:16:38 +01:00
humbletim
7c571cd431 cleanup / addition error message detail 2018-02-23 10:31:57 -05:00
humbletim
058e4d1926 CR feedback; whitespace / remove unnecessary diffs 2018-02-23 09:12:33 -05:00
humbletim
f8fe06213d CR feedback; whitespace / remove unnecessary diffs 2018-02-23 09:11:23 -05:00
humbletim
ebdb5b3c17 CR feedback; remove unrollVertices; update getFace; guard more debug logging 2018-02-23 08:57:48 -05:00
humbletim
6ea4b660b7 CR feedback; remove ok bool pointer and all metadata; cleanup 2018-02-23 07:47:39 -05:00
vladest
b8102cfbd7 Make sure sort indicator is attached to the right of title 2018-02-23 10:06:16 +01: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