Sam Gondelman
15cdfef16a
Merge branch 'master' into decals
2018-02-14 17:33:01 -08:00
SamGondelman
324eefc914
remove fresnel, add unlit, fix overlays, cleanup
2018-02-14 17:02:07 -08:00
John Conklin II
63f752e76f
Merge pull request #12366 from sethalves/fix-children-of-animated-entity-joints
...
fix -- get children of animated entity joints to follow along, again
2018-02-14 11:12:45 -08:00
SamGondelman
4500ed17e7
merge from master
2018-02-13 13:58:39 -08:00
Andrew Meadows
20c2a4470e
merge 'findByID' into 'workload-001'
2018-02-13 11:47:02 -08:00
Andrew Meadows
38bc312004
faster and const EntityTree::findByID()
2018-02-13 11:25:34 -08:00
Andrew Meadows
a1c540fc85
instantiate trace_workload logging category
2018-02-13 08:57:20 -08:00
Andrew Meadows
d59c3898dc
add 'workload' logging profile
2018-02-13 08:57:20 -08:00
Sam Gateau
714e3f445d
Merge pull request #11537 from jherico/threaded_qml
...
Migrating QML rendering off the main thread
2018-02-12 15:32:33 -08:00
John Conklin II
51bf3c1466
Merge pull request #12323 from Zvork/shadow
...
Shadow performance / acnee improvements
2018-02-12 14:41:13 -08:00
John Conklin II
d084e58f48
Merge pull request #12328 from Atlante45/fix/misc-bugs
...
Misc bug fixes
2018-02-12 14:31:38 -08:00
SamGondelman
9e8aa1898c
warnings, load material from URL, shapeID -> parentMaterialID
2018-02-12 12:50:09 -08:00
Sam Gateau
f3918ad216
Merge pull request #12367 from AndrewMeadows/fix-shared-unit-tests
...
Fix shared unit tests
2018-02-09 17:18:35 -08:00
SamGondelman
5337377ef5
Merge remote-tracking branch 'upstream/master' into decals
2018-02-09 14:40:20 -08:00
Bradley Austin Davis
dbc4b1533d
Fixing build warnings in minipromises
2018-02-09 10:12:32 -08:00
RebeccaStankus
14839bc5f4
Some improvements to the log window
...
-Renamed button "Clear Filters" to "All Messages"
-Changed search result matching text to a more visible color
-Made Date/Time text more visible
-Added count of current messages in window
-Set window to show all messages with no filtering upon first opening
2018-02-08 11:26:02 -08:00
Andrew Meadows
572edab79f
remove dupe const
2018-02-07 16:48:31 -08:00
Seth Alves
b6ac348428
get children of animated entity joints to follow along, again
2018-02-07 16:30:07 -08:00
Andrew Meadows
96c97547f9
Merge pull request #12205 from jherico/no_widgets
...
Remove some unneeded Qt dependencies
2018-02-05 15:32:54 -08:00
Olivier Prat
2940a67b3e
Merged with master
2018-02-03 16:55:25 +01:00
SamGondelman
4d4294dd6a
Merge remote-tracking branch 'upstream/master' into decals
2018-02-02 16:50:01 -08:00
SamGondelman
d7f4b033e8
wip finish adding material entity
2018-02-02 16:49:33 -08:00
Atlante45
8ebb3e52d8
Misc bug fixes
2018-02-02 13:10:49 -08:00
Olivier Prat
234cb1e3e6
Added anti frustum test to remove lower cascade objects from higher shadow cascades
2018-02-02 12:15:43 +01:00
Olivier Prat
3804917cf4
Orthographic octree selection seems to be working
2018-02-02 09:40:57 +01:00
Atlante45
bc819c698e
Merge branch 'stable' of https://github.com/highfidelity/hifi into merge-back
2018-01-30 16:09:30 -08:00
Atlante45
db08f1dda6
Move backtrace to interface
2018-01-30 11:39:48 -08:00
Atlante45
cb6bebd824
Fix Mac dev builds
2018-01-29 19:47:36 -08:00
MiladNazeri
3585bead96
Merge pull request #12037 from humbletim/Leopoly_Phase1_004_RayPick-Changes
...
Leopoly_Phase1_004_RayPick-Changes
2018-01-29 14:02:38 -08:00
Atlante45
061f9ea359
Don't run settings preroutine when not initialized
2018-01-29 12:09:16 -08:00
MiladNazeri
9baf02b7a1
Merge pull request #12036 from humbletim/Leopoly_Phase1_003_Asset-Request
...
Leopoly_Phase1_003_Asset-Request
2018-01-29 11:40:41 -08:00
Brad Davis
0781d8eaf0
Remove some unneeded Qt dependencies
2018-01-28 22:18:24 -08:00
Seth Alves
d73538f233
oops
2018-01-26 12:08:19 -08:00
Seth Alves
b7303414f2
unmangle merges
2018-01-26 11:57:30 -08:00
Seth Alves
dbe9fd290e
comment out code that would set annotations after StartHandler is called
2018-01-26 09:23:29 -08:00
Atlante45
df62ba88cb
Fix rebase error
2018-01-26 09:22:37 -08:00
Seth Alves
c02ab28c60
fix clang build
2018-01-26 09:22:28 -08:00
Atlante45
39f26e35f0
backtrace for rc-63
2018-01-26 09:22:14 -08:00
Seth Alves
6c04431636
call startCrashhandler from interface
2018-01-26 09:20:29 -08:00
Atlante45
ced5aad1d1
backtrace for rc-63
2018-01-26 09:20:07 -08:00
Brad Davis
3915a2d4ba
Fix resource loading from source tree
2018-01-25 11:07:39 -08:00
Anthony J. Thibault
58d3d8ef3d
Bug fix for incorrect positioned eyes on other peoples avatars
...
There was a bug in writeBitVector(), where the last byte was not consistantly written into the destination buffer.
A unit test was added to verify that writeBitVector() and readBitVector() are correct.
(cherry picked from commit a252e90f96
2018-01-24 21:14:29 -08:00
Anthony J. Thibault
a252e90f96
Bug fix for incorrect positioned eyes on other peoples avatars
...
There was a bug in writeBitVector(), where the last byte was not consistantly written into the destination buffer.
A unit test was added to verify that writeBitVector() and readBitVector() are correct.
2018-01-24 18:58:08 -08:00
humbletim
65455e7b50
Merge remote-tracking branch 'upstream/master' into Leopoly_Phase1_004_RayPick-Changes
2018-01-23 14:57:33 -05:00
humbletim
3a735c1fc7
CR feedback and code cleanup
2018-01-23 03:12:26 -05:00
Brad Davis
8ae0b09ea2
Merge remote-tracking branch 'upstream/master' into android
2018-01-22 15:07:30 -08:00
John Conklin II
4697c5f92c
Merge pull request #12225 from hyperlogic/bug-fix/sassy-avatar
...
Fix for avatars with crooked spine/head when exiting HMD mode
2018-01-22 11:50:44 -08:00
Brad Davis
d2fe9e2710
PR feedback
2018-01-19 20:24:34 -08:00
Anthony J. Thibault
cd4d9255bd
Added defaultPoseFlags to avatar protocol
...
Change rotationSet to rotationIsDefaultPose for JointData
Also for translation. Fixed all code to flip boolean value.
Created EntityJointData so that the ModelEntity stuff doesn't need to change.
2018-01-19 15:34:27 -08:00
Brad Davis
d53b8b38ac
Merge remote-tracking branch 'upstream/master' into android
2018-01-19 14:35:20 -08:00
