Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-25 06:58:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
75648 commits 25 branches 0 tags 1.1 GiB
Commit graph

3825 commits

Author SHA1 Message Date
Sam Gondelman
faeb5b36dc
Merge pull request #14764 from SamGondelman/NOverlays12 
Case 20722: Ring Gizmo Entities to replace Circle Overlays
 2019-01-28 18:09:23 -08:00
Shannon Romano
607ce00713
Merge pull request #14766 from AndrewMeadows/grab-it 
case 20701: fixes for grab
 2019-01-28 15:57:36 -08:00
SamGondelman
13cb70a6a5 Merge remote-tracking branch 'upstream/master' into NOverlays12 2019-01-28 11:37:15 -08:00
SamGondelman
a10f52c66d merge with master 2019-01-25 14:16:07 -08:00
Jeff Clinton
d92d256cfc
Merge pull request #14656 from SamGondelman/matFallthrough 
Case 20241: Material entity fallthrough
 2019-01-25 14:01:27 -08:00
Adam Smith
f651ad2f67
Merge pull request #14711 from SamGondelman/NOverlays10 
Case 20585: Add missing Web Overlay functionality to Web Entities
 2019-01-25 14:00:52 -08:00
Andrew Meadows
c9ef439a7f fix more grab bugs 2019-01-25 08:46:24 -08:00
Shannon Romano
66d5b16a5d
Merge pull request #14744 from dback2/shapeTypeFix 
Shape type and compound shape property fixes
 2019-01-24 16:18:34 -08:00
Adam Smith
dadd49f535
Merge pull request #14667 from SamGondelman/NOverlays9 
Case 20535: renderLayer, primitiveMode, groupCulled Entity properties
 2019-01-24 14:36:27 -08:00
Andrew Meadows
965d0ccf60 reduced priority for AvatarEntities 2019-01-23 21:29:49 -08:00
Andrew Meadows
de68f6ca49 use Hold action 
use Hold action for any non-dynamic Entity with Body in phys simulation
also set DIRTY_MOTION_TYPE bit, add to changed list on add/remove grab
 2019-01-23 21:26:57 -08:00
SamGondelman
9a734b2011 merge with master 2019-01-23 17:48:24 -08:00
SamGondelman
ac513df103 ring gizmo entities 2019-01-23 17:46:04 -08:00
Sam Gateau
3ec9290dca
Merge pull request #14619 from SamGondelman/matTarget 
Case 20240: Better material entity targeting
 2019-01-23 15:47:22 -08:00
David Back
ea5705907b fix shape type and compound shape URL properties/tooltips 2019-01-22 18:22:13 -08:00
Andrew Meadows
9a854291af supress spurious not important AvatarEntity updates 2019-01-18 15:36:38 -08:00
Sam Gondelman
17ac4138b6
typos 2019-01-18 13:43:56 -08:00
Shannon Romano
11b8ae6d44
Merge pull request #14710 from sethalves/mouse-grab-with-traits 
case 15962: case 20481: Mouse grab with traits
 2019-01-18 11:56:41 -08:00
John Conklin II
45ec44423b
Merge pull request #14694 from danteruiz/delete-only-domain-entities 
case 20595: case 20563: Do not delete local entities when switching domains.
 2019-01-17 11:25:58 -08:00
Adam Smith
f955313afc
Merge pull request #14687 from SamGondelman/cancel 
Case 20580: Trying to fix wearables and avatar app
 2019-01-17 11:25:30 -08:00
SamGondelman
8d2e81a13b Merge remote-tracking branch 'upstream/master' into matFallthrough 2019-01-17 10:27:43 -08:00
SamGondelman
62b853816a deprecate the new property so that people hopefully don't use it 2019-01-16 19:35:15 -08:00
SamGondelman
3835796419 deprecate the new property so that people hopefully don't use it 2019-01-16 14:01:05 -08:00
SamGondelman
611998f799 add pulse group properties to shapes, particles, text, web, image, and grid 2019-01-16 13:34:10 -08:00
SamGondelman
1d2270e9c7 web entity fixes 2019-01-15 16:51:36 -08:00
Seth Alves
c4fc884bce ignore position edits from server when grabs are in effect 2019-01-15 16:35:20 -08:00
Seth Alves
b1c34eb9ec update queryAACube during grab rather than only when grab is released 2019-01-15 16:01:44 -08:00
Seth Alves
174c79d66d use new-style far-grabbing code for mouse grabs 2019-01-15 13:43:51 -08:00
Shannon Romano
4b34465113
Merge pull request #12899 from kitely/warn-property-too-large 
Log a warning if an entity's property is too large
 2019-01-15 12:00:04 -08:00
Dante Ruiz
4ab7308669 addressing code review requests 2019-01-14 14:04:01 -08:00
SamGondelman
68e15c6c07 fixes from 78 2019-01-14 13:36:21 -08:00
Dante Ruiz
e7d3844620 making pre review requests 2019-01-14 11:14:57 -08:00
Dante Ruiz
8252481ce7 Delete domain entities only 2019-01-11 16:00:10 -08:00
SamGondelman
4b67a79561 more web entity wip 2019-01-11 09:57:42 -08:00
Andrew Meadows
bc19689910 remove unnecessary culling of properties 2019-01-10 17:32:52 -08:00
Andrew Meadows
0098dedcbb don't update server for AvatarEntity queryAACube 2019-01-09 18:25:12 -08:00
Andrew Meadows
b9667a0679 fix merge conflict after rebase 2019-01-09 17:28:00 -08:00
Andrew Meadows
9d6acf007a fix build after rebase 2019-01-09 17:28:00 -08:00
Andrew Meadows
c998ddbb9e ScriptableAvatar::setAvatarEntityData() works 2019-01-09 17:28:00 -08:00
Andrew Meadows
63ed0a3a98 move blob conversion recipes to EntityItemProperties 2019-01-09 17:28:00 -08:00
Andrew Meadows
4dd6e23fef fix typo in comment 2019-01-09 17:28:00 -08:00
Andrew Meadows
9f404ef006 Agent bots can manipulate AvatarEntities again 2019-01-09 17:28:00 -08:00
Andrew Meadows
09f3b8f485 add bit of sanity checking for incomming AvatarEntities data 2019-01-09 17:27:14 -08:00
Andrew Meadows
0083c77280 add EntityTypes::extractEntityTypeAndID(), remove one spaghetti 2019-01-09 17:27:14 -08:00
Andrew Meadows
1815d71158 fix data corruption bug 2019-01-09 17:27:14 -08:00
Andrew Meadows
ce660bee9b fix compile errors after rebase 2019-01-09 17:27:14 -08:00
Andrew Meadows
6c81e8845b cleanup 2019-01-09 17:27:14 -08:00
Andrew Meadows
fe2ee68b79 add EntityItemProperties::copyFromJSONString() 2019-01-09 17:27:14 -08:00
Andrew Meadows
026c6301a6 correctly load AvatarEntities from settings 2019-01-09 17:27:14 -08:00
Andrew Meadows
263d6cb7ad only change parentID=AVATAR_SELF_ID for non-clientOnly case 2019-01-09 17:27:14 -08:00