Nissim Hadar
|
adb02d69f9
|
WIP -adding canCastShadow flag.
|
2018-02-14 21:45:56 -08:00 |
|
Nissim Hadar
|
26e7a85a95
|
Fixed possible crash.
|
2018-02-14 21:15:29 -08:00 |
|
Nissim Hadar
|
12f4b8dbb1
|
Corrected event listener for canCastShadow - still bad.
|
2018-02-14 19:12:24 -08:00 |
|
Nissim Hadar
|
ef771b6db4
|
Minor indentation correction.
|
2018-02-14 19:11:13 -08:00 |
|
Nissim Hadar
|
a679b6f828
|
Fixed possible crash.
|
2018-02-14 18:55:04 -08:00 |
|
Nissim Hadar
|
be940493cc
|
Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
|
2018-02-14 18:29:58 -08:00 |
|
MiladNazeri
|
258133f1db
|
Merge pull request #12335 from ctrlaltdavid/21736
Update Overlays circle3d JSDoc per recent code changes
|
2018-02-14 17:17:04 -08:00 |
|
Nissim Hadar
|
054b2bf3e2
|
Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
# Conflicts:
# libraries/networking/src/udt/PacketHeaders.cpp
# scripts/system/html/js/entityProperties.js
|
2018-02-14 17:10:07 -08:00 |
|
Seth Alves
|
93d8a6f00d
|
Merge pull request #12402 from druiz17/fix-tablet-create-rotation
Fix tablet rotation when going into and out of create mode
|
2018-02-14 16:10:10 -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 |
|
Dante Ruiz
|
e14f46101b
|
fix tablet rotation when switching into and out of create mode
|
2018-02-14 13:49:43 -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 |
|
Nissim Hadar
|
a92765a83a
|
Adding can cast shadow property.
|
2018-02-14 12:01:30 -08:00 |
|
John Conklin II
|
6187731fdc
|
Merge pull request #12291 from 1P-Cusack/FogBugz/Case_10865
[Case 10865] Make Asset Browser multi-select work with Ctrl/Cmd/Shift+Click
|
2018-02-14 11:14:26 -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 |
|
Brad Davis
|
8853bd6388
|
Fix spectator camera crash
|
2018-02-14 11:11:28 -08:00 |
|
samcake
|
6357f36a97
|
Fixing names
|
2018-02-14 10:39:14 -08:00 |
|
Dante Ruiz
|
2a8101a944
|
Merge branch 'master' of github.com:highfidelity/hifi
|
2018-02-14 09:35:53 -08:00 |
|
Zach Fox
|
2f0c9e1acb
|
Merge pull request #12394 from zfox23/commerce_fixRecentActivityWrap
Commerce: Fix wrap mode for very long P2P memos
|
2018-02-14 09:14:21 -08:00 |
|
Nissim Hadar
|
1632ab9782
|
Changed flag to "cast shadow" instead of "don't cast shadow".
|
2018-02-13 18:27:36 -08:00 |
|
samcake
|
1d3ae1b187
|
Work in progress to get the render items beeing tagged correctly for groupCulled
|
2018-02-13 17:50:01 -08:00 |
|
Stephen Birarda
|
6ba2f4b279
|
Merge pull request #12286 from Atlante45/feat/asset-server-backup
Add asset server backups capabilities to the Domain Server
|
2018-02-13 17:40:11 -07:00 |
|
Nissim Hadar
|
23a29b8d4b
|
Added don't castr shadow flag to entity and shape classes.
|
2018-02-13 16:16:04 -08:00 |
|
John Conklin II
|
309c2ecba1
|
Merge pull request #12239 from druiz17/fix-camera-update
Do not override sensorToWorldMatrix if animGraph is loading or failed to load
|
2018-02-13 15:10:13 -08:00 |
|
Zach Fox
|
3e41229e8c
|
Commerce: Fix wrap mode for very long P2P memos
|
2018-02-13 13:30:17 -08:00 |
|
samcake
|
a98f55298b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
|
2018-02-13 13:06:58 -08:00 |
|
samcake
|
f64e5f2444
|
Introducing the cull group
|
2018-02-13 13:06:26 -08:00 |
|
Clément Brisset
|
593113c102
|
Merge pull request #12387 from Atlante45/new-master
Merge stable back into master
|
2018-02-13 12:59:59 -08:00 |
|
Andrew Meadows
|
b111e82763
|
Merge pull request #12365 from AndrewMeadows/workload-001
moving Job/Task framework out of 'render' library and into its own 'task' library
|
2018-02-13 12:26:32 -08:00 |
|
Andrew Meadows
|
20c2a4470e
|
merge 'findByID' into 'workload-001'
|
2018-02-13 11:47:02 -08:00 |
|
Elisa Lupin-Jimenez
|
a61021f46c
|
Merge pull request #12272 from elisa-lj11/2d-images
2d images (JPG and PNG) are now supported as (quasi) entities
|
2018-02-13 11:44:02 -08:00 |
|
Andrew Meadows
|
38bc312004
|
faster and const EntityTree::findByID()
|
2018-02-13 11:25:34 -08:00 |
|
Dante Ruiz
|
809a0e4c2c
|
Merge branch 'master' of github.com:highfidelity/hifi
|
2018-02-13 11:08:14 -08:00 |
|
Dante Ruiz
|
cf3d8e4463
|
remove cached file
|
2018-02-13 11:07:15 -08:00 |
|
John Conklin II
|
915870018a
|
Merge pull request #12359 from misslivirose/fix/collapse-headers
Fix collapse headers in edit.js
|
2018-02-13 10:34:30 -08:00 |
|
Dante Ruiz
|
45f09dde96
|
address tony's requests
|
2018-02-13 10:32:15 -08:00 |
|
Dante Ruiz
|
ddcee05b14
|
added control button for controller API
|
2018-02-13 09:41:00 -08:00 |
|
Sam Gateau
|
040710807d
|
Merge pull request #12346 from Zvork/scripts
Fix transition (ex-fade) debugging scripts
|
2018-02-13 09:08:35 -08:00 |
|
Andrew Meadows
|
01fb8f3369
|
remove cruft
|
2018-02-13 08:58:24 -08:00 |
|
Andrew Meadows
|
95b34cf112
|
remove cruft and extra whitespace
|
2018-02-13 08:58:24 -08:00 |
|
Andrew Meadows
|
f1495d27f6
|
try task link dependency rather than include
|
2018-02-13 08:58:24 -08:00 |
|
Andrew Meadows
|
b6f81a8131
|
android app depends on task lib
|
2018-02-13 08:58:24 -08:00 |
|
Andrew Meadows
|
a1c540fc85
|
instantiate trace_workload logging category
|
2018-02-13 08:57:20 -08:00 |
|
Andrew Meadows
|
2b1b75450d
|
fix assert
|
2018-02-13 08:57:20 -08:00 |
|
Andrew Meadows
|
d59c3898dc
|
add 'workload' logging profile
|
2018-02-13 08:57:20 -08:00 |
|
Andrew Meadows
|
cfb64ad693
|
add LoggingCategory data member to JobContext
|
2018-02-13 08:57:20 -08:00 |
|
Andrew Meadows
|
342ba5f8aa
|
add 'task' lib dependency to HMD plugins
|
2018-02-13 08:57:20 -08:00 |
|
Andrew Meadows
|
724e2f7e66
|
add CMakeLists.txt for new 'task' library
|
2018-02-13 08:56:11 -08:00 |
|
Andrew Meadows
|
8231a56b22
|
pull task out of render and into its own lib
|
2018-02-13 08:56:11 -08:00 |
|