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
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
humbletim
0dd3672162
CR feedback / cleanup
2018-02-22 21:20:56 -05:00
humbletim
d1c4bde677
revert OBJWriter.cpp
2018-02-22 20:53:27 -05:00
humbletim
dd90c8c515
fix ubuntu compile warnings
2018-02-22 10:16:34 -05:00
humbletim
010c714abc
restore original Entities.getMeshes
2018-02-22 08:51:54 -05:00
humbletim
4d43e54346
use shared buffer_helpers::clone
2018-02-22 08:41:15 -05:00
humbletim
b0f444e179
remove dead code
2018-02-22 08:36:37 -05:00
humbletim
ec4f9fdc11
fix displayName
2018-02-22 08:31:05 -05:00
humbletim
d52dce8e09
restore code for debugging
2018-02-22 08:24:56 -05:00
humbletim
e3c269d582
remove debug string
2018-02-22 08:22:13 -05:00
humbletim
4fd3d9bf7b
cleanup; formalize data structures
2018-02-22 08:18:38 -05:00
humbletim
e4a2a589a5
CR fedback and cleanup
2018-02-22 07:56:09 -05:00
humbletim
72fca7e57e
Merge remote-tracking branch 'samuel/scriptableMaterials' into Leopoly_Phase1_010_graphics-scripting-merge
2018-02-22 05:18:05 -05:00
humbletim
be8d79f53f
CR fedback and cleanup
2018-02-22 05:15:01 -05:00
SamGondelman
4c6169ec78
merge and a little cleanup
2018-02-20 15:45:34 -08:00
SamGondelman
4f0f6709c1
fix build errors
2018-02-20 13:56:06 -08:00
humbletim
5791ca4c51
interim checkin
2018-02-20 12:22:04 -05:00
ZappoMan
76d611d563
Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters
2018-02-19 19:15:33 -08:00
Sam Gateau
fd49c0d100
Merge pull request #12401 from SamGondelman/decals
...
Material Entities
2018-02-19 10:58:02 -08:00
Brad Hefta-Gaub
a4783ded15
Merge pull request #12414 from hyperlogic/bug-fix/scramlbed-avaatrs
...
Bug fix for Scrambled Avatars
2018-02-18 19:06:53 -08:00
John Conklin II
24a3eb6e80
Merge pull request #12419 from druiz17/fix-edit-avatar-entities
...
Don't update avatar entities of the avatars ID is AVATAR_SELF_ID
2018-02-16 09:48:19 -08:00
MiladNazeri
331b253ba0
Merge pull request #12386 from cain-kilgore/21668
...
WL 21668 - Make sure all Prompts are correctly emitting a signal on cancel and that cancellations return null
2018-02-16 06:57:03 -08:00
SamGondelman
2d0b85af72
workaround bug
2018-02-15 17:28:59 -08:00
Sam Gateau
f809862870
Merge pull request #12412 from samcake/blue
...
Introduce task abort feature for early exit of task branch
2018-02-15 15:50:43 -08:00
SamGondelman
b189433855
merge
2018-02-15 15:50:36 -08:00
SamGondelman
2d754edf74
CR
2018-02-15 15:48:41 -08:00
Dante Ruiz
bbcf865db3
Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-avatar-entities
2018-02-15 15:03:12 -08:00
Dante Ruiz
e4db09fef8
don't update avatar entities if the avatars ID is AVATAR_SELF_ID
2018-02-15 15:02:45 -08:00
samcake
c70b655fbc
A bit more explanations to the Task Flow class
2018-02-15 11:55:16 -08:00
Anthony J. Thibault
f07b1fa4c5
Revert "FBX node IDs aren't alphanumerically ordered per logical structure"
...
This reverts commit a7ec4501e6http://doc.qt.io/qt-5/qset.html
This was bug was causing scrambled avatars, because both the transmitter and receiver of the AvatarData packets
make the strong assumption that the joint orders are same. When they are not the avatar's appear scrambled.
2018-02-15 11:32:29 -08:00
samcake
b21b98c810
Add a way to early abort a task from a Job, apply that to the highlight effect to shave unecessary work
2018-02-15 11:24:20 -08:00
humbletim
145a0df082
interim checkin
2018-02-15 14:14:07 -05:00
Sam Gondelman
36a74eaeee
Merge branch 'master' into decals
2018-02-15 11:02:49 -08:00
Clément Brisset
c62f68264f
Merge pull request #12295 from birarda/feat/content-split-from-settings
...
initial separation of DS into domain settings and content settings
2018-02-15 10:04:36 -08:00
samcake
246ac25d0a
Introducing a way to abort a task from one of its job, using it to skip highlight tasks if nothing to highlight
2018-02-14 17:36:46 -08:00
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
David Back
e4263100b4
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarInRange
2018-02-14 16:40:11 -08:00
Bradley Austin Davis
33690e09b7
Merge pull request #12399 from samcake/blue
...
Introducing group culling to avoid the avatar model to be partially culled
2018-02-14 15:38:52 -08:00
Seth Alves
d1c0f0a40f
Merge pull request #12390 from druiz17/add-control-mapping
...
add control button mapping for controller API
2018-02-14 15:02:28 -08:00
John Conklin II
9ba29028e3
Merge pull request #12398 from jherico/fix/spectator_cam
...
Fix spectator camera crash
2018-02-14 13:15:42 -08:00
Stephen Birarda
6240181474
initial separation of content settings and domain settings
2018-02-14 12:09:56 -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
