Thijs Wenker
80beb6c444
addressed CR feedback
2018-09-25 22:43:58 +02:00
John Conklin II
55848e6959
Merge pull request #14008 from sethalves/fix-local-angular-velocity
...
fix bug that caused localAngularVelocity to get zeroed out
2018-09-24 14:32:57 -07:00
luiscuenca
012cd207b3
No data sent during basic transit
2018-09-24 11:39:10 -07:00
Seth Alves
f6e57f54b0
don't call enterEntity until script preload has finished
2018-09-21 10:26:55 -07:00
Thijs Wenker
1094b6722f
self-CR
2018-09-20 23:36:53 +02:00
Thijs Wenker
e2cb96193d
JSDocs
2018-09-20 22:47:14 +02:00
Thijs Wenker
6d72881f3f
remove commented out test code
2018-09-20 21:14:30 +02:00
Thijs Wenker
06491ef12f
API function for retrieving multiple entity properties with better performance
2018-09-20 19:34:00 +02:00
Seth Alves
1a44054c49
attempt fix for fb-17131
2018-09-15 09:15:43 -07:00
SamGondelman
c522d1bc93
merge with master
2018-09-14 00:57:13 -07:00
Sam Gondelman
42ded53b5f
Merge branch 'master' into modelBugs
2018-09-12 14:35:46 -07:00
Wayne Chen
63ad85215b
Merge branch 'master' into interstitalMerged
2018-09-11 17:17:33 -07:00
SamGondelman
9a2bdda365
make animation properties threadsafe
2018-09-10 11:58:45 -07:00
John Conklin II
405e2da91e
Merge pull request #13949 from sabrina-shanman/stt_parenting_scale
...
Scale Collision Pick to match parent
2018-09-07 11:54:02 -07:00
sabrina-shanman
8d4c47cf8e
Make template specialization of BaseNestableTransformNode explicit
2018-09-07 08:49:44 -07:00
sabrina-shanman
836f810c41
Have OverlayTransformNode and similar define scale relative to nestable scale on creation time, and refactor code
2018-09-06 16:33:29 -07:00
sabrina-shanman
3f7a7fb11a
Return early from AvatarTransformNode and similar when getTransform fails
2018-09-06 10:29:01 -07:00
sabrina-shanman
f7226757ad
Just import TransformNode in AvatarTransformNode.h and similar
2018-09-06 10:03:05 -07:00
sabrina-shanman
e8ce152687
Scale collision picks relative to parent by adding and using more
...
specialized transform nodes.
2018-09-05 16:51:28 -07:00
Wayne Chen
c47788efe4
merging with dante's PR
2018-09-04 18:00:06 -07:00
SamGondelman
589e88af4a
Merge remote-tracking branch 'upstream/master' into scriptvec3
2018-09-04 17:54:45 -07:00
SamGondelman
9b75c7e07f
trying to separate colors and vectors
2018-09-04 17:20:05 -07:00
SamGondelman
0c8a4cc81e
merge with master
2018-08-28 17:31:51 -07:00
SamGondelman
aae06e8f49
faster aabox ray intersection and pre-computed inverse direction
2018-08-27 15:40:33 -07:00
Sam Gondelman
6730635931
Merge branch 'master' into scriptvec3
2018-08-27 10:43:52 -07:00
Dante Ruiz
af19849a75
fixing merge conflict
2018-08-24 15:48:42 -07:00
Dante Ruiz
3796675123
script update and visuallyReady entities
2018-08-24 15:46:39 -07:00
John Conklin II
fcdbc6c6d2
Merge pull request #13778 from SamGondelman/bloom
...
Enable bloom in zone properties
2018-08-24 14:46:31 -07:00
SamGondelman
b5b7167644
add to stats
2018-08-23 17:56:24 -07:00
SamGondelman
283c0c0311
s i m p l i f y
2018-08-23 11:47:56 -07:00
SamGondelman
5c0b12abf6
ordered ray/parabola intersection code
2018-08-22 16:29:17 -07:00
Stephen Birarda
99f532a20e
always check added avatar entities once in updateAvatarEntities
2018-08-21 10:32:05 -07:00
Stephen Birarda
e33f349d53
fix flagging for avatar entity update/delete
2018-08-21 10:32:05 -07:00
Sam Gondelman
f0986a7f5a
Merge branch 'master' into scriptvec3
2018-08-20 10:56:45 -07:00
John Conklin II
1edf1b4337
Merge pull request #13555 from SamGondelman/destroy
...
Trying to fix dependency shutdown
2018-08-16 13:14:58 -07:00
John Conklin II
02f53c4ee5
Merge pull request #13808 from dback2/createEntitiesGrabbable
...
Use Create Entities as Grabbable option when adding asset to world
2018-08-16 09:22:23 -07:00
Andrew Meadows
fd9876cb63
don't attempt physics with invalid modelURL
2018-08-13 13:30:30 -07:00
unknown
5641c59f5f
Merge branch 'master' of https://github.com/highfidelity/hifi into createEntitiesGrabbable
2018-08-10 09:49:37 -07:00
David Back
8db0711b5b
set grabbable user data in addModelEntity, pass grabbable from asset browser
2018-08-08 16:33:47 -07:00
SamGondelman
fb75b42059
working on enabling bloom
2018-08-07 22:26:30 -07:00
Sam Gondelman
7772e8adf2
Merge branch 'master' into scriptvec3
2018-08-03 14:57:49 -07:00
SamGondelman
1ba28de5b6
try to fix nodelist not getting destroyed
2018-08-01 17:52:27 -07:00
David Back
0b9e520b53
fix grab cloning parented entitiy
2018-08-01 16:00:25 -07:00
John Conklin II
7a635b6a57
Merge pull request #13709 from thoys/fix/require-load-queue
...
MS17041: Fix for require fail when the same script loaded simultaneously from another entity script
2018-08-01 11:15:32 -07:00
Thijs Wenker
003e826d60
move over definition so it could be linked in the assignment-client too
2018-08-01 00:23:34 +02:00
SamGondelman
7c8d080050
Merge remote-tracking branch 'upstream/master' into scriptvec3
2018-07-31 14:04:23 -07:00
Thijs Wenker
74343c71d8
CR fixes
2018-07-31 22:29:53 +02:00
SamGondelman
2ca217eb4a
merge with master
2018-07-30 17:43:15 -07:00
David Rowe
b36b981b55
Merge branch 'master' into M19690
...
# Conflicts:
# libraries/entities/src/EntityItemProperties.cpp
2018-07-31 08:41:32 +12:00
Sam Gondelman
8201997a16
Merge pull request #13660 from SamGondelman/parabolic
...
Parabolic Picking + Pointers
2018-07-30 10:49:02 -07:00
John Conklin II
fc88165e23
Merge pull request #13696 from SamGondelman/particleRot
...
Particles don't spin with head roll, new spin + rotateWithEntity properties
2018-07-27 14:54:48 -07:00
Sam Gateau
a95ddb0492
Merge pull request #13616 from AndrewMeadows/remove-cruft-001
...
remove cruft for rendering collision shapes
2018-07-27 19:19:44 +02:00
SamGondelman
6a52b7b8f3
CR improvements
2018-07-26 12:15:12 -07:00
SamGondelman
1c1b68ee66
emitterShouldTrail fix, review comments, rotateWithEntity
2018-07-26 11:41:16 -07:00
David Rowe
51865294ac
Fix radius and alpha start/finish values
2018-07-26 09:54:42 +12:00
John Conklin II
21d043d179
Merge pull request #13534 from huffman/fix/ess-avatar-entities
...
Fix crash when editing avatar entities with no myAvatar
2018-07-25 14:21:12 -07:00
Sam Gondelman
d29332595b
jsdoc fixes
2018-07-25 09:54:14 -07:00
SamGondelman
4750611af9
particles don't spin with head roll, add particle spin properties, negative emitSpeed
2018-07-24 23:47:58 -07:00
David Rowe
1ac6845899
Fix ParticleEffect entity JSDoc
2018-07-25 09:16:46 +12:00
SamGondelman
645f905239
cleanup, model performance improvements
2018-07-24 13:25:49 -07:00
SamGondelman
318ef907b8
parabola/polyvox, fixing some bugs
2018-07-24 10:08:35 -07:00
SamGondelman
956c1511b6
Merge remote-tracking branch 'upstream/master' into parabolic
2018-07-19 15:23:25 -07:00
SamGondelman
845ddda695
parabola-overlay and -avatar intersection, handle case where acceleration == 0
2018-07-17 12:41:03 -07:00
Andrew Meadows
207aea8712
remove cruft from rendering collision shapes
2018-07-16 10:29:34 -07:00
SamGondelman
f9cdfbad7c
cleanup
2018-07-12 17:59:57 -07:00
John Conklin II
a8c2f9c861
Merge pull request #13585 from thoys/fix/animationFPSChanging
...
MS14979: Fix Animation FPS changeability
2018-07-12 11:23:54 -07:00
SamGondelman
16ad9cb5d3
xcolor/rgbcolor conversion
2018-07-11 18:06:06 -07:00
SamGondelman
9929529f30
vec3 conversion
2018-07-11 14:18:22 -07:00
Thijs Wenker
e7345c5a27
fix changing allowTranslation / fps for entity model animation without having to change any other animation property value
2018-07-11 19:15:08 +02:00
SamGondelman
5bbd5b9e52
vec2 conversion
2018-07-10 16:32:49 -07:00
Andrew Meadows
0b87df45b5
cleanup return statement
2018-07-10 11:16:56 -07:00
SamGondelman
fcc523fbef
parabola sphere intersection
2018-07-09 15:15:36 -07:00
SamGondelman
bbe9a0005d
parabola vs. web and text
2018-07-05 17:02:55 -07:00
SamGondelman
7130b5aa7f
fixing findRayIntersection bugs
2018-07-05 10:27:12 -07:00
Ryan Huffman
a5a7f56a32
Fix crash when editing clientOnly entity with no myAvatar
2018-07-03 10:25:52 -07:00
SamGondelman
90091d11e4
parabola picks, started implementing math
2018-07-03 09:47:31 -07:00
Andrew Meadows
5b4b0a7c25
fix server-side bug in kinematics
2018-07-02 15:04:11 -07:00
John Conklin II
7834bca39a
Merge pull request #13508 from wayne-chen/crashEntityAppendPoint-case-12473
...
Fixing crash on appending a point to an entity
2018-07-02 12:36:51 -07:00
Wayne Chen
9e3626cca3
returning false if there is no entity to connect to
2018-06-29 14:42:33 -07:00
David Back
a8e231c5af
floats .0f
2018-06-28 11:33:38 -07:00
David Back
4f5a1bc340
zero out spread values for previous versions
2018-06-27 19:02:55 -07:00
Sam Gondelman
fbe54437b8
Merge pull request #13409 from humbletim/add-raypick-shapeID
...
Include shapeID in RayPick results
2018-06-26 10:25:39 -07:00
SamGondelman
d37a8bcd72
more jsdoc updates
2018-06-22 10:13:18 -07:00
Sam Gondelman
850e2d5cf5
Merge branch 'master' into particleFix
2018-06-21 17:32:24 -07:00
SamGondelman
8f411ad6c8
CR
2018-06-20 16:13:10 -07:00
SamGondelman
de5fcccc7b
proper reporting of nan values in get
2018-06-19 14:22:24 -07:00
SamGondelman
12a5d8b550
quiet ubuntu warnings, particle properties show radians
2018-06-19 12:51:35 -07:00
Andrew Meadows
44c3620b6e
remove cruft
2018-06-18 17:45:58 -07:00
humbletim
dc5c5c20df
raypick partIndex commit
...
include shapeID for accessing proper material index
add raypick shapeID test script
2018-06-18 18:22:30 -04:00
SamGondelman
0d34689320
spread variables jsdoc
2018-06-18 12:33:36 -07:00
SamGondelman
93fe0c60fa
correctly update bounding box based on radius and other properties
2018-06-18 11:26:09 -07:00
Andrew Meadows
6d422e4678
Merge 'master' into 'workload'
2018-06-18 10:30:13 -07:00
SamGondelman
7771661948
fix particle spread properties
2018-06-15 17:35:49 -07:00
SamGondelman
9ea65950d5
particles: threadsafe, cleanup, rework initialized logic
2018-06-15 15:45:06 -07:00
Andrew Meadows
be0899c41d
remove unnecessary writes to appease Xcode's static analyzer
2018-06-15 11:44:22 -07:00
Andrew Meadows
d0baa2d2a1
fix typos in simulation ownership documentation
2018-06-15 10:28:00 -07:00
Andrew Meadows
4329ea5240
Merge master' into 'workload'
2018-06-04 16:11:25 -07:00
David Rowe
b5028a9626
Merge branch 'master' into 21880
...
# Conflicts:
# interface./src/scripting/WindowScriptingInterface.h
2018-06-05 09:13:54 +12:00
John Conklin II
08fcad1932
Merge pull request #13227 from SamGondelman/entityMirror
...
Add local-only isVisibleInSecondaryCamera flag to entities
2018-06-04 11:06:00 -07:00
Seth Alves
97b3fdfe68
make legacy collisionless property work right
2018-06-01 09:34:34 -07:00
SamGondelman
86ee5c12d8
merge and update based on sam's changes
2018-05-31 17:53:36 -07:00
John Conklin II
ec3f9549f1
Merge pull request #13172 from wayne-chen/getChildrenIDs-issue-1934
...
Fix EntityScriptingInterface::getChildrenIDs function
2018-05-31 14:27:25 -07:00
Andrew Meadows
addbb597fc
move setSpaceIndex() to cpp file for easier debugging in future
2018-05-31 10:22:39 -07:00
Andrew Meadows
003e444246
Merge branch 'master' into 'workload'
2018-05-30 16:04:13 -07:00
Oren Hurvitz
b9306a35cc
Fixed formatting
2018-05-30 11:01:07 +03:00
David Rowe
ac0607b5ae
Review Entites.cloneEntity() JSDoc and add JSDoc for new properties
2018-05-30 10:02:10 +12:00
samcake
559d436dfa
Fixing the merge conflicts
2018-05-24 16:57:10 -07:00
Anthony Thibault
eae5215d94
Merge pull request #13206 from ctrlaltdavid/21872-c
...
JSDoc fixes
2018-05-24 16:44:55 -07:00
Andrew Meadows
d42375e4fe
finish uint8_t to uint16_t conversion
2018-05-24 11:28:52 -07:00
Andrew Meadows
31dd59d212
double bits in collision groups
2018-05-24 11:28:52 -07:00
SamGondelman
e6741a363e
add local-only isVisibleInSecondaryCamera flag to entities
2018-05-23 16:35:21 -07:00
Andrew Meadows
d50da2babc
Merge 'master' into 'workload'
2018-05-23 14:51:05 -07:00
Liv Erickson
56493346c1
fix permissions check
2018-05-22 15:41:48 -07:00
Liv Erickson
0ebd13b3e6
cannot edit origin from client / fix ICE issue
2018-05-22 13:17:23 -07:00
David Rowe
6a75e7acb6
Fix canCastShadow property JSDoc
2018-05-23 07:11:23 +12:00
Liv Erickson
7efcc135e4
reorder flags
2018-05-22 11:03:41 -07:00
Liv Erickson
e273a0c1a6
fix define properties
2018-05-22 09:10:50 -07:00
Liv Erickson
27c2bb9046
add properties group where missing
2018-05-21 17:39:08 -07:00
Liv Erickson
a1e7f648bc
add debug properties
2018-05-21 17:14:36 -07:00
Liv Erickson
e76829bb1d
change to DEFINE_PROPERTY_REF
2018-05-21 16:51:23 -07:00
Liv Erickson
604b3cac1c
check for null entities in grab, add conversion for old userdata cloneable
2018-05-21 16:19:43 -07:00
Thijs Wenker
7f4e9a0089
style
2018-05-21 06:17:08 +02:00
Thijs Wenker
f4df75d016
CR feedback
2018-05-21 06:04:05 +02:00
Livi Erickson
70bbac5c83
update with lastEditedCheck
2018-05-20 18:49:41 -07:00
Livi Erickson
9f7b383757
address CR feedback
2018-05-20 18:22:17 -07:00
Livi Erickson
9c0084209b
fix style error, start lifetime properly for cloned entities
2018-05-20 16:41:14 -07:00
David Rowe
6d4f704279
Regularize some JSDoc usage
2018-05-21 09:32:10 +12:00
Liv Erickson
6c8d68afc6
add extra cleanup in delete messages and simulation, as a fall back
2018-05-18 18:18:42 -07:00
Liv Erickson
29b11b9101
some fixes to server cloneables
2018-05-18 17:12:41 -07:00
Andrew Meadows
c8b8d0f1c4
remove commented out cruft
2018-05-18 10:31:08 -07:00
Andrew Meadows
063c2564d1
only clear bid state when ownership actually changed
2018-05-18 10:28:45 -07:00
Andrew Meadows
a9c193b672
merge 'workload-014' into 'workload'
2018-05-18 10:12:04 -07:00
Andrew Meadows
00e360aff0
reduce sim ownership priority when releasing grab
2018-05-17 17:25:07 -07:00
Andrew Meadows
926014b43f
entity-server always promotes VOLUNTEER to RECRUIT
2018-05-17 17:24:24 -07:00
David Back
4e14eb37e3
update comment
2018-05-17 16:34:19 -07:00
David Back
30855f94eb
set last edited to 0 to ensure server update
2018-05-17 16:02:58 -07:00
David Back
26b6b851f5
Merge branch 'cloneables' of github.com:dback2/hifi into cloneables
2018-05-17 14:50:39 -07:00
David Back
b8ce07744d
initialize prop defaults, no bool returns
2018-05-17 14:50:14 -07:00
Liv Erickson
ec8aa71dc4
Add JSDoc header to new clone function in Entity API
2018-05-17 11:25:20 -07:00
David Back
42d8492427
no clock skew
2018-05-17 11:17:04 -07:00
David Back
3730cbe36c
reconstruct cloneIDs lists on start, read/write locks on clone ID functions, fix removing last cloneable
2018-05-17 10:28:48 -07:00
David Back
1e2d2819d5
tweaks
2018-05-15 17:36:39 -07:00
David Back
f74e219029
rename properties, add clone avatar entity, remove worldEntityProps arg, fix clone ID cleanup on delete
2018-05-15 17:24:14 -07:00
Wayne Chen
92e9a8e064
fixing typo in documentation.
2018-05-15 16:32:01 -07:00
Andrew Meadows
c7c4324b3c
Merge 'master' into 'workload'
2018-05-15 10:22:50 -07:00
Wayne Chen
f82e597ac7
Updating documentation for getChildrenIDs + fixing issue #1934
2018-05-15 09:34:07 -07:00
Wayne Chen
bd6905b3d2
Adding possible solution to issue#1934.
2018-05-14 18:25:39 -07:00
David Back
3031bb05be
Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables
2018-05-11 17:54:20 -07:00
David Back
a57c280813
convertToCloneProperties
2018-05-11 17:54:08 -07:00
MiladNazeri
ea26512793
Merge pull request #13147 from ctrlaltdavid/21872-a
...
Fix JSDoc function definitions specifying properties instead of params
2018-05-11 16:20:06 -07:00
David Back
65bda27ae3
Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables
2018-05-11 13:03:27 -07:00
John Conklin II
4129664368
Merge pull request #13145 from highfidelity/stable
...
Merge RC67 stable into master
2018-05-10 17:07:20 -07:00
David Rowe
fab85c3f6d
Fix JSDoc function definitions specifying properties instead of params
2018-05-11 09:52:48 +12:00
David Back
7738a2bcdd
Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables
2018-05-09 18:12:46 -07:00
David Back
dea588ae4a
remove prints
2018-05-09 18:12:04 -07:00
David Back
3241c18271
first pass cloneables WIP
2018-05-09 18:10:40 -07:00
Seth Alves
7466d08f1f
more suppression of logging
2018-05-09 13:01:49 -07:00
Seth Alves
db03265a6b
when in serverless mode, short-circuit simulation ownership bids
2018-05-09 10:53:46 -07:00
Clement
5a3773ba72
Fix compile error on linux/windows
2018-05-04 18:18:46 -07:00
Clement
da9fb9c751
Fix non self-sufficient headers
2018-05-04 16:26:41 -07:00
Clement
b04c5bd0db
CR
2018-05-04 14:43:16 -07:00
Clement
d774dc2060
WIP Only use conical frustums on the server
2018-05-03 18:19:29 -07:00
Stephen Birarda
21396287a4
Merge pull request #12990 from Atlante45/fix/spec-cam-av
...
Add support for multifrustum avatar queries
2018-05-03 18:18:51 -07:00
Stephen Birarda
31d5633b4a
Merge pull request #12930 from Atlante45/fix/spec-cam
...
Add support for multifrustum entity queries
2018-05-03 18:13:51 -07:00
Andrew Meadows
3d16c9014f
remove unowned 'dynamic' objects from kinematic integration
2018-05-03 16:22:36 -07:00
MiladNazeri
8e214d8ee8
Merge pull request #13049 from ctrlaltdavid/21856-d
...
List which contexts each namespace and class is available in
2018-05-03 01:29:14 -07:00
Andrew Meadows
99a75c5a87
Merge 'master' into 'workload'
2018-05-02 17:28:36 -07:00
Andrew Meadows
af85642ad4
editorial pass on simulation ownership overview
2018-05-02 09:10:10 -07:00
Ken Cooke
a4105f1081
Merge pull request #13052 from kitely/fix-gcc-warnings
...
Eliminated warnings in gcc
2018-05-02 06:43:32 -07:00
Oren Hurvitz
26ffb3213c
Changed "[[gnu::fallthrough]]" to "// FALLTHRU"
2018-05-02 07:06:47 +01:00
Clement
538f24162f
Define ViewFrustums type alias
2018-05-01 18:03:21 -07:00
Clement
d47ddbd6e4
CR
2018-05-01 18:02:29 -07:00
Atlante45
7a710093ac
Fix build error
2018-05-01 18:02:29 -07:00
Clement
3862a02cee
DRY traversal scan callbacks
2018-05-01 18:02:29 -07:00
Clement
49fad3d868
EntityServer traversal aware of all ViewFrustums
2018-05-01 18:02:29 -07:00
Andrew Meadows
26db9ec09e
yield ownership outside workload R1
2018-05-01 13:15:37 -07:00
David Rowe
1aa28b7f54
Merge remote-tracking branch 'upstream/master' into 21856-d
...
# Conflicts:
# interface/src/LODManager.h
2018-05-02 07:50:55 +12:00
samcake
b3408ae4c0
Merge branch 'master' of https://github.com/highfidelity/hifi into upstream-workload
2018-05-01 11:39:54 -07:00
Oren Hurvitz
a226790295
Eliminated warnings in gcc
...
Note that the call to encodeNode() in FBXWriter.cpp can never be reached, so it's safe to remove it.
2018-04-30 15:05:27 +03:00
David Rowe
2cc3ed6287
List which contexts each namespace and object is available in
2018-04-28 20:00:28 +12:00
David Rowe
8d71d72258
Fix JSDoc for Entities.findEntitiesByName
2018-04-28 13:16:26 +12:00
Zach Fox
c163ae63b8
Allow gifting of Pending items; remove PoP verification rescheduling on Pending items
2018-04-27 10:28:59 -07:00
Zach Fox
0f36fb113d
Allow gifting of Pending items; remove PoP verification rescheduling on Pending items
2018-04-27 10:20:55 -07:00
David Rowe
08dc9b133f
Docs to JSDoc review
2018-04-26 21:10:28 +12:00
samcake
5db3eee4ad
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-25 15:21:43 -07:00
John Conklin II
cb7b03652b
Merge pull request #12796 from MiladNazeri/feature/add-findByName
...
added Entities.findbyName
2018-04-25 14:00:10 -07:00
samcake
5b5cad38e8
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-25 10:03:42 -07:00
Oren Hurvitz
c0052004de
Explained an edge case that can cause us to fail to send some entity properties
2018-04-25 13:38:32 +03:00
Atlante45
d82333534c
Ensure the tree lock is always taken before the simulation lock
2018-04-24 13:46:05 -07:00
samcake
adfc935fdb
Merge with master
2018-04-24 13:04:16 -07:00
samcake
33bbbcef83
Merging with master
2018-04-24 11:49:34 -07:00
Sam Gateau
2cae294ab4
Merge pull request #12904 from AndrewMeadows/lhf-needsToCallUpdate
...
LHF optimiaztion: only call ModelEntityItem::update() on instances that actually need it
2018-04-24 11:22:48 -07:00
samcake
f686ef1f25
Exposing more uniforms to ui for refining the controller
2018-04-23 18:02:09 -07:00
Sam Gateau
d3fccc4104
Merge pull request #12881 from SamGondelman/scaleAssert
...
Minimum entity dimension (1mm)
2018-04-23 13:40:53 -07:00
Andrew Meadows
577f9a03e6
fix bug: animation reset on 'hold'
2018-04-23 12:08:40 -07:00
Andrew Meadows
748af5a65f
worry about multi-threads when updating animation props
2018-04-23 12:08:40 -07:00
Andrew Meadows
8e51d66092
fix bug: animation should reset on start running
2018-04-23 12:08:40 -07:00
Andrew Meadows
b48e9495a5
rollback change to MaterialEntityItem, we'll fix later
2018-04-23 12:08:40 -07:00
Andrew Meadows
75508385cf
more correct needsToCallUpdate() implementations
2018-04-23 12:08:40 -07:00
Sam Gateau
99a0e42b5d
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-22 20:26:49 -07:00
Seth Alves
9e1bd69af3
Merge pull request #12918 from kitely/fix-addentity-failure
...
Fixed null pointer exception if importing an entity from JSON fails
2018-04-21 18:12:48 -07:00
David Rowe
7087abd201
Merge branch 'master' into 21815
2018-04-21 10:49:56 +12:00
samcake
0f4aa7e27e
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-20 09:31:36 -07:00
MiladNazeri
7e780ed55a
Merge pull request #12915 from ctrlaltdavid/21849
...
Add Entities materialData JSDoc
2018-04-19 13:49:24 -07:00
samcake
a6bd589f4f
Merging upstream
2018-04-19 12:20:10 -07:00
John Conklin II
cad4d45941
Merge pull request #12871 from Atlante45/fix/dead-octree-code
...
Remove dead Octree code
2018-04-19 09:58:20 -07:00
Stephen Birarda
c4ad93bafb
Merge pull request #12782 from SimonWalton-HiFi/qregexp
...
Replace LogHandler repeated regex scheme with assigned ID tracking scheme
2018-04-18 17:28:48 -07:00
John Conklin II
db99d12736
Merge pull request #12919 from kitely/fix-import-entities-distance
...
Fixed crash when importing entities from JSON multiple times
2018-04-18 11:52:46 -07:00
Clement
2e8a6e1961
Remove more dead octree code
2018-04-17 18:21:51 -07:00
samcake
d6b6645630
exposing feedback of timing
2018-04-17 18:03:45 -07:00
Stephen Birarda
95c172f418
Merge branch 'stable' of github.com:highfidelity/hifi into merge-back-stable-66
2018-04-17 15:34:46 -07:00
Zach Fox
3b8e52ea41
Merge pull request #12862 from zfox23/discovery_April2018
...
Discovery: April 2018 (Huge PR; see description)
2018-04-17 15:11:50 -07:00
SamGondelman
527d71c379
CR
2018-04-17 10:58:54 -07:00
Oren Hurvitz
3ae65bba15
Fixed crash when importing entities from JSON multiple times
...
This happened because the Clipboard wasn't being completely cleared between uses.
This bug can also manifest in another way (if Interface doesn't crash): the imported entities appear very far away, instead of right in front of the user. This happens for the same reason as the crash: the Clipboard still contains some previously-imported entities. That causes us to calculate the wrong dimensions for the newly-imported entities which is why they are added to the domain far away.
2018-04-17 15:51:41 +03:00
Oren Hurvitz
91e27db9b0
When importing entities from JSON: fixed a null pointer exception if addEntity() failed on any of the entities
2018-04-17 12:32:28 +03:00
David Rowe
f36a5289c9
Add Entities materialData JSDoc
2018-04-17 14:33:11 +12:00
milad
988dca437d
added case-sensitive search
2018-04-16 18:30:00 -07:00
David Rowe
c1ede6ef58
Merge branch 'master' into 21815
...
# Conflicts:
# tools/jsdoc/plugins/hifi.js
2018-04-17 11:54:56 +12:00
David Rowe
9f83c606e9
Controller API JSDoc
2018-04-17 11:46:40 +12:00
samcake
b32be91bb1
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-16 13:22:58 -07:00
John Conklin II
5705bac87f
Merge pull request #12723 from ctrlaltdavid/21801
...
HMD API JSDoc
2018-04-16 11:12:26 -07:00
Zach Fox
071bf35683
Merge branch 'master' of github.com:highfidelity/hifi into discovery_April2018
2018-04-16 10:11:44 -07:00
samcake
5d34329873
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-16 09:21:26 -07:00
Oren Hurvitz
9a324379e7
Added a warning if we can't send some of an entity's properties to the entity server.
...
This can happen if a property is too large to be sent in a single UDP packet. This commit doesn't fix the underlying problem, but it makes it possible to see that the problem happened.
See: Large 'userData' can't be sent to the entity server
https://github.com/highfidelity/hifi/issues/12794
2018-04-16 14:59:53 +03:00
Seth Alves
7f285c5f90
Merge pull request #12571 from Atlante45/fix/es-concurrent-traversal
...
Fix unprotected tree traversals
2018-04-14 14:33:25 -07:00
SamGondelman
c8afaf27e5
Merge remote-tracking branch 'upstream/master' into scaleAssert
2018-04-13 17:30:03 -07:00
SamGondelman
b71a06a18e
min dim = 1 mm
2018-04-13 15:26:37 -07:00
Seth Alves
0e081a3944
code review
2018-04-13 10:42:22 -07:00
Sam Gateau
79e92a52ea
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-12 23:51:23 -07:00
John Conklin II
98f6899c3d
Merge pull request #12839 from SamGondelman/matMigrate
...
Migrate materials from userData to materialData
2018-04-12 18:24:33 -07:00
Sam Gateau
27e728ff67
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-12 18:11:18 -07:00
John Conklin II
ec10fcb7b7
Merge pull request #12868 from SamGondelman/missingAlpha
...
Fix for missing alpha on server restart
2018-04-12 16:42:34 -07:00
samcake
bfdde6513f
Mergin with master
2018-04-12 15:45:27 -07:00
John Conklin II
67a8e6c82e
Merge pull request #12824 from SamGondelman/matFix
...
Fix non-client-only material entities applied to avatar by session ID not being removed on domain switch
2018-04-12 15:30:11 -07:00
John Conklin II
40ae2913eb
Merge pull request #12847 from SamGondelman/clientMat
...
Fix client-only materials on non-avatars
2018-04-12 14:53:34 -07:00
SamGondelman
284364683d
Merge remote-tracking branch 'upstream/master' into scaleAssert
2018-04-12 14:46:40 -07:00
SamGondelman
9f3a431c5d
minimum entity dimension
2018-04-12 14:12:52 -07:00
John Conklin II
1834325970
Merge pull request #12788 from sethalves/fix-immediate-last-edited-by
...
set lastEditedBy in local tree whenever a script adds or edits an entity
2018-04-12 13:02:05 -07:00
samcake
e2f9eef5e2
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-12 12:27:27 -07:00
John Conklin II
e47dca77ec
Merge pull request #12773 from AndrewMeadows/expire-simulation-ownership
...
entity-server will expire stale simulation ownership
2018-04-12 12:04:52 -07:00
Sam Gateau
6a7ae55d9c
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-11 19:08:57 -07:00
John Conklin II
5c26166bd6
Merge pull request #12841 from SamGondelman/simAssert
...
Fix asserts on domain switch
2018-04-11 16:02:45 -07:00
David Rowe
7a9e3388fa
Merge branch 'master' into 21801
2018-04-12 09:48:51 +12:00
SamGondelman
3270409b7b
possible fix for missing alpha on server restart
2018-04-11 14:06:30 -07:00
John Conklin II
88a151481d
Merge pull request #12763 from sethalves/ess-can-edit-localX
...
allow ESS to make relative-to-parent edits when entity is not in ESS's octree
2018-04-11 12:08:35 -07:00
Andrew Meadows
a0f3e3a031
add simulation ownership expiry
2018-04-11 09:40:32 -07:00
Zach Fox
a9b9a1cb10
Commerce: Gifts
2018-04-10 15:54:19 -07:00
Seth Alves
f81836c830
support specification of named landing-points in serverless-domain json files
2018-04-10 14:25:59 -07:00
SamGondelman
bba47ba2b4
materials on client only entities
2018-04-10 11:35:24 -07:00
SamGondelman
8f65813924
fix asserts on domain switch
2018-04-09 17:10:49 -07:00
SamGondelman
9b07880aab
migrate materials from userData to materialData
2018-04-09 12:49:03 -07:00
Sam Gateau
476b75488c
Merge pull request #12827 from AndrewMeadows/lhf-needsToCallUpdate
...
Workload: low hanging fruit optimization: don't unneccessarily update() entities
2018-04-06 17:38:54 -07:00
Andrew Meadows
9c84f05275
rollback change to MaterialEntityItem, we'll fix later
2018-04-06 17:32:57 -07:00
Andrew Meadows
353afb47b3
more correct needsToCallUpdate() implementations
2018-04-06 16:53:08 -07:00
SamGondelman
5503c7909a
fix materials not disappearing on deletion in certain cases
2018-04-06 15:18:21 -07:00
Andrew Meadows
299f2a92e0
merge 'master' into 'workload'
2018-04-05 12:01:19 -07:00
John Conklin II
9e21bab67e
Merge pull request #12748 from AndrewMeadows/untangle-003
...
cleanup around simulation-ownership
2018-04-05 10:58:45 -07:00
milad
4adc8928f0
added Entities.findbyName
2018-04-05 09:58:54 -07:00
Atlante45
895023ca4b
Fix unprotected tree traversals
2018-04-04 14:54:21 -07:00
Seth Alves
2545e67b14
set lastEditedBy in local tree whenever a script adds or edits an entity
2018-04-04 12:27:41 -07:00
Simon Walton
692ccfc09b
Create HIFI_FCDEBUG(_ID) variants that require a category
...
Original macros use default settings.
2018-04-04 09:49:15 -07:00
Seth Alves
db82c464eb
Merge pull request #12741 from ctrlaltdavid/21816
...
Remove Entities.currentAvatarEnergy and related from the API
2018-04-04 08:07:46 -07:00
Andrew Meadows
d57cb0b5d7
use list.empty() instead of comparing list.size()
2018-04-03 22:15:57 -07:00
Andrew Meadows
6d7574cab9
use std::numeric_limtis<uint64_t>::max() instead of -1
2018-04-03 22:13:25 -07:00
Andrew Meadows
70d6aa99e8
more 'const uint64_t&' purges
2018-04-03 21:55:31 -07:00
samcake
fa35d659dc
Merge branch 'master' of https://github.com/highfidelity/hifi into upstream-workload
2018-04-03 17:56:41 -07:00
Simon Walton
7d16ca9c1c
Remove uses of addRepeatedMessageRegex() and its implementation
...
Change to new log-message ID scheme.
2018-04-03 17:54:01 -07:00
Seth Alves
71d6dbf9bf
allow ESS to edit local version of properties even if the entity isn't in the ESS's local octree
2018-04-02 15:52:28 -07:00
samcake
59a081bcdb
merge with upstream
2018-03-30 18:08:38 -07:00
Andrew Meadows
5a5376c3d5
untangle 'bidding' from 'owned'
2018-03-30 13:18:32 -07:00
Andrew Meadows
dcf5110caa
clarify hardcoded constant
2018-03-30 13:18:32 -07:00
Andrew Meadows
4e0f307dc0
quint8 --> uint8_t
2018-03-30 13:18:32 -07:00
Andrew Meadows
d6ac294f39
use uint8_t instead of quint8
2018-03-30 13:18:32 -07:00
Andrew Meadows
4501033861
add description of simulation ownership rules
2018-03-30 13:18:32 -07:00
Andrew Meadows
6746e08206
faster EntitySimulation::takeDeadEntities()
2018-03-30 13:18:32 -07:00
Andrew Meadows
e1d2a5e5f3
more cleanup for deleting entities
2018-03-30 13:18:32 -07:00
Andrew Meadows
5854a36ff7
more correct handling of simulated entity
2018-03-30 13:18:32 -07:00
Andrew Meadows
a05c753e03
only process changed entities when simulated
2018-03-30 13:18:32 -07:00
Andrew Meadows
738e1267ab
small optimization in EntitySimulation::changeEntity()
2018-03-30 13:18:32 -07:00
Andrew Meadows
f20c9d3c5b
EntitySimulation::removeEntityInternal isn't pure virtual
2018-03-30 13:18:32 -07:00
Andrew Meadows
5649748b17
make EntitySimulation::changeEntityInternal() pure virtual
2018-03-30 13:18:32 -07:00
Andrew Meadows
bd434e3f18
make EntitySimulation::addEntityInternal() pure virtual
2018-03-30 13:18:32 -07:00
Andrew Meadows
6837d042ad
move entityCollisionWithEntity to PhysicalEntitySimulation
2018-03-30 13:18:32 -07:00
David Rowe
7027ccb6d8
Remove unused code
2018-03-30 09:35:25 +13:00
David Rowe
3b90078097
Remove Entities.currentAvatarEnergy and related from the API
2018-03-30 08:36:18 +13:00
SamGondelman
afe39aba46
fix octal code char issue
2018-03-29 10:05:08 -07:00
David Rowe
1bcb9738f0
Miscellaneous fixes noticed in passing
2018-03-28 12:26:08 +13:00
David Rowe
b35ee5ce8a
Fix JSDoc links to Vec3 constants
2018-03-28 12:25:49 +13:00
John Conklin II
0bc23456c3
Merge pull request #12682 from ctrlaltdavid/21807
...
JSDoc that an entity's clientOnly property can be set at entity creation
2018-03-22 17:55:45 -07:00
Seth Alves
4033af9b11
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-21 11:11:43 -07:00
David Rowe
541d798a6b
Update code comment
2018-03-20 09:53:57 +13:00
David Rowe
4b52c21d1c
JSDoc that an entity's clientOnly property can be set at entity creation
2018-03-20 09:51:10 +13:00
SamGondelman
8ddf360c79
support relative paths for material images
2018-03-19 09:59:11 -07:00
Seth Alves
98e9f1168a
allow href to be set to a serverless domain
2018-03-16 10:50:03 -07:00
Seth Alves
e3022da787
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-16 09:34:38 -07:00
Stephen Birarda
0c0ce1d6b8
Merge pull request #12508 from SimonWalton-HiFi/server-script
...
Stop server-script URLs when deleted from entity properties (case 11244)
2018-03-14 14:01:01 -07:00
samcake
f8acca76e2
Merge branch 'master' of https://github.com/highfidelity/hifi into workload-master
2018-03-13 09:31:50 -07:00
Seth Alves
b39c7eadd2
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-13 09:24:18 -07:00
MiladNazeri
e054f16c46
Merge pull request #12526 from ctrlaltdavid/21709
...
Entities API JSDoc
2018-03-12 14:40:09 -07:00
samcake
9bec8cdd0b
Merge branch 'master' of https://github.com/highfidelity/hifi into workload-master
2018-03-12 12:01:00 -07:00
Seth Alves
c781f88239
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-09 15:43:14 -08:00
Seth Alves
58bc42990c
merge from upstream
2018-03-09 12:03:26 -08:00
Andrew Meadows
858b02f29d
more readable code
2018-03-09 08:35:18 -08:00
Andrew Meadows
9fbe7ec194
time-box Picks and solve in round-robin sequence
2018-03-09 08:35:18 -08:00
Andrew Meadows
7a19f48b9c
move rayHitsSphere logic to AABox method
2018-03-09 08:35:18 -08:00
Andrew Meadows
2750f3ee71
remove unused cruft and avoid useless work
2018-03-09 08:35:18 -08:00
Andrew Meadows
6ab85d5800
cleanup and a few small optimizations
2018-03-09 08:35:18 -08:00
Andrew Meadows
81de668c1e
faster per-entity raypick culling
2018-03-09 08:35:18 -08:00
David Rowe
f1ef085b4b
Add canCastShadows and castShadows properties
2018-03-09 15:34:56 +13:00
David Rowe
b461a422c6
Merge branch 'master' into 21709
2018-03-09 14:18:42 +13:00
samcake
a0db5c6135
Merge with master
2018-03-08 15:35:58 -08:00
David Rowe
d4487e92b8
Further JSDoc tweaks
2018-03-08 12:23:13 +13:00
David Rowe
e2bf84224a
Add further examples.
2018-03-08 10:59:12 +13:00
Dante Ruiz
8382d842e1
changing to resources path
2018-03-07 12:51:26 -08:00
David Rowe
dba0c1046e
Fix typo
2018-03-08 08:17:26 +13:00
David Rowe
a62b6b7150
Merge branch 'master' into 21709
2018-03-07 17:34:53 +13:00
David Rowe
eeb7f5ca8d
Doc review
2018-03-07 17:29:39 +13:00
Seth Alves
bdd926f89e
cleanups
2018-03-02 10:38:35 -08:00
Seth Alves
45157a16f2
merge from upstream
2018-03-02 09:57:27 -08:00
samcake
d4d5f3a7f0
Merge branch 'master' of https://github.com/highfidelity/hifi into master-workload
2018-03-02 08:50:47 -08:00
NissimHadar
000b08f7c0
Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork
2018-03-02 08:07:01 -08:00
Brad Hefta-Gaub
d24cea2f07
Merge pull request #12521 from sethalves/no-prelocked-for-non-lockers
...
if a node can't change locks, don't allow it to create an already-locked entity
2018-03-01 14:56:29 -08:00
NissimHadar
0f2cf8ea85
Re-implemented shadow controls.
2018-03-01 14:24:20 -08:00
David Rowe
5e311a86ee
Document the "Image" pseudo-entity type
2018-03-02 10:20:13 +13:00
Andrew Meadows
1e1d9907a4
also clear _staleProxies when clearing all else
2018-03-01 12:22:42 -08:00
Seth Alves
2d374583b4
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-01 11:07:50 -08:00
Seth Alves
33065fb51c
more consistent variable names. rework DomainManager and AddressManager methods to take a url rather than host and port
2018-03-01 11:07:37 -08:00
Andrew Meadows
67c78a2df1
remember list of stale proxies
2018-03-01 10:21:25 -08:00
Andrew Meadows
f9db9e999e
Merge 'master' into 'workload'
2018-03-01 10:19:06 -08:00
John Conklin II
1e1836c009
Merge pull request #12502 from elisa-lj11/2dimages-update
...
Image entity has correct orientation and is collisionless
2018-03-01 09:57:08 -08:00
David Rowe
f9086e31de
Deprecate Entities.getMeshes() in favor of using the new Graphics API
2018-03-01 10:08:50 +13:00
David Rowe
d82a300f5f
Miscellaneous JSDoc improvements
2018-03-01 09:58:35 +13:00
David Rowe
3275846882
Material entity JSDoc
2018-03-01 09:57:42 +13:00
Andrew Meadows
3ca21dda67
Merge hifi/master of into hifi/workload
2018-02-28 10:28:31 -08:00
Seth Alves
31115b3cb6
make sure rezzer doesn't ignore adjustment
2018-02-27 20:14:00 -08:00
Seth Alves
9d131a6547
if a node can't change locks, don't allow them to create an already-locked entity
2018-02-27 19:53:54 -08:00
David Rowe
1bb8a0fb18
Fix up entity script calling JSDoc
2018-02-28 12:54:49 +13:00
David Rowe
a782b6779a
Merge branch 'master' into 21709
...
# Conflicts:
# interface/src/ui/overlays/Overlays.h
# interface/src/ui/overlays/Shape3DOverlay.cpp
# libraries/entities/src/EntityItemProperties.cpp
# libraries/entities/src/EntityScriptingInterface.h
2018-02-28 12:42:05 +13:00
Elisa Lupin-Jimenez
17ddf21028
fixed line length
2018-02-27 15:05:51 -08:00
David Rowe
9c1fa7a8d2
Miscellaneous JSDoc tidying and fixes
2018-02-28 11:44:03 +13:00
Seth Alves
a44ddbbc26
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-02-27 14:09:05 -08:00
David Rowe
9f6f6a9b0d
Entities scripts JSDoc
2018-02-28 10:31:34 +13:00
John Conklin II
b4000c04bc
Merge pull request #12432 from highfidelity/feat/content-settings
...
Add content archives to domain server web interface
2018-02-27 13:30:53 -08:00
David Rowe
483688a6e1
Web entity EventBridge functions JSDoc
2018-02-28 08:40:36 +13: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
Stephen Birarda
9cc348ef27
Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings
2018-02-27 09:59:37 -08:00
Simon Walton
051d4c0d35
Merge branch 'master' into server-script
2018-02-27 09:57:58 -08:00
Seth Alves
636c271dc3
merge from upstream
2018-02-27 09:21:08 -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
David Rowe
1fb02d15d7
Entities actions JSDoc
2018-02-27 14:12:20 +13:00
Stephen Birarda
aa7bd2066a
Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings
2018-02-26 17:02:00 -08:00
Simon Walton
40f0e63af0
Merge branch 'master' into server-script
2018-02-26 16:39:03 -08:00
Dante Ruiz
ced500f23e
Merge branch 'serverless-domains' of github.com:sethalves/hifi into serverless-domains
2018-02-26 15:41:51 -08:00
Dante Ruiz
be52b66874
be able to delete entities in serverless domain
2018-02-26 15:41:35 -08:00
Seth Alves
642e7b7c37
Merge pull request #24 from druiz17/serverless-domains
...
Some bug fixes
2018-02-26 15:25:59 -08:00
Dante Ruiz
c83a8e9a25
minimize diff
2018-02-26 14:51:36 -08:00
Dante Ruiz
5031d94c6d
small changes
2018-02-26 14:50:34 -08:00
Elisa Lupin-Jimenez
b56c78d36c
image has correct orientation and is collisionless
2018-02-26 14:44:46 -08:00
Dante Ruiz
a23c425f5e
actions and serverless status fixes
2018-02-26 14:24:51 -08:00
Seth Alves
666fa77be2
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-02-26 13:53:20 -08:00
Seth Alves
eed388e7c9
avoid a crash if entityTree is null
2018-02-26 13:53:14 -08:00
Simon Walton
e81fba22ed
EntityServer should update a previously matched entity.
...
EntityServer currently keeps a per-Node set of entities that matched
the JSON filter. This commit will send an update for an entity that
no longer matches then remove it from the set.
https://highfidelity.fogbugz.com/f/cases/11244/
2018-02-26 13:43:35 -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
David Rowe
c2d8c96463
Entities collisions JSDoc
2018-02-26 14:10:33 +13:00
David Rowe
2d9d6035fc
Entities mouse and controller events JSDoc
2018-02-26 10:20:31 +13:00
Seth Alves
f946ce48d6
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-02-23 16:46:55 -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
Dante Ruiz
07b0431215
fix merge conflict
2018-02-23 14:00:36 -08:00
Seth Alves
3ee979fc34
don't send entity-edits to a server when in a serverless domain
2018-02-23 12:09:35 -08:00
Thijs Wenker
a27a5a7e1f
export boolean properties properly
2018-02-23 18:16:38 +01:00
Seth Alves
99893d81e2
merge from upstream
2018-02-23 09:14:48 -08:00
David Rowe
895c354257
Entities properties JSDoc fixes
2018-02-23 19:27:40 +13:00
David Rowe
26404a6ce8
Entities functions JSDoc bulk
2018-02-23 19:27:13 +13:00
Atlante45
c106fee659
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/backups-integration
2018-02-22 19:45:43 -08:00
NissimHadar
bb04f3f533
CR corrections.
2018-02-22 13:57:46 -08:00
Seth Alves
f17fa684f5
fix import of zones with skyboxes
2018-02-22 10:27:30 -08:00
Zach Fox
90f05f4db7
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1
2018-02-22 09:23:49 -08:00
SamGondelman
4b1217f1f6
move all entity items to main thread
2018-02-21 15:54:07 -08:00
Nissim Hadar
af484d0af6
Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
2018-02-20 23:48:12 -08:00
Seth Alves
c5d6f0e10f
don't queue up edit packets while connected to a serverless domain
2018-02-20 17:48:14 -08:00
Andrew Meadows
e7495d830b
maintain Space proxies for entities
2018-02-20 17:39:05 -08:00
Andrew Meadows
76d2e9bc78
fix comment
2018-02-20 17:38:01 -08:00
Zach Fox
2daa30f125
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1
2018-02-20 12:41:12 -08:00
Andrew Meadows
7ed68ced62
Merge master into highfidelity/workload
2018-02-20 12:31:37 -08:00
ZappoMan
76d611d563
Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters
2018-02-19 19:15:33 -08:00
Nissim Hadar
b2a06cdb98
Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
...
# Conflicts:
# libraries/entities/src/EntityItemProperties.cpp
# libraries/entities/src/ShapeEntityItem.h
# libraries/networking/src/udt/PacketHeaders.cpp
# libraries/networking/src/udt/PacketHeaders.h
2018-02-19 13:05:57 -08:00
David Rowe
9e37230aa1
Miscellaneous code tidying
2018-02-19 12:21:56 +13:00
David Rowe
67cfe783be
Entity properties JSDoc
2018-02-19 12:17:31 +13:00
Nissim Hadar
81c9e449e6
Models casting shadows (again). (Something stupid happened...)
2018-02-18 10:19:17 -08:00
Nissim Hadar
a69816f885
WIP.
2018-02-17 15:21:57 -08:00
Nissim Hadar
4c1f22f84e
Models and Avatar cast shadows (box doesn't, yet).
2018-02-16 14:01:33 -08:00
Andrew Meadows
6d347cf44f
revert deadlock, remove Space stubbery in EntityTree
2018-02-15 17:40:15 -08:00
SamGondelman
2d0b85af72
workaround bug
2018-02-15 17:28:59 -08:00
SamGondelman
2d754edf74
CR
2018-02-15 15:48:41 -08:00
Nissim Hadar
72e89851f3
Added READ_ENTITY_PROPERTY_TO_PROPERTIES
2018-02-15 14:16:56 -08:00
Andrew Meadows
f35469c0de
give EntityTree a workload/Space instance
2018-02-15 12:57:58 -08:00
Nissim Hadar
777862f253
can cast shadow flag now works correctly (UI/JS aspects).
2018-02-15 11:50:38 -08:00
Ryan Huffman
2a667fcd60
Cleanup entity -> ds persist
2018-02-15 10:09:21 -08:00
Ryan Huffman
cb9327e030
Add entity file sync and domain content backups
2018-02-15 10:09:20 -08:00
Nissim Hadar
7e99570824
Fixed Ubuntu warnings.
2018-02-15 07:54:55 -08:00
Nissim Hadar
adb02d69f9
WIP -adding canCastShadow flag.
2018-02-14 21:45:56 -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
SamGondelman
324eefc914
remove fresnel, add unlit, fix overlays, cleanup
2018-02-14 17:02:07 -08:00
Nissim Hadar
a92765a83a
Adding can cast shadow property.
2018-02-14 12:01:30 -08:00
ZappoMan
e71811bef2
Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters
2018-02-14 09:03:32 -08:00
Nissim Hadar
1632ab9782
Changed flag to "cast shadow" instead of "don't cast shadow".
2018-02-13 18:27:36 -08:00
Nissim Hadar
23a29b8d4b
Added don't castr shadow flag to entity and shape classes.
2018-02-13 16:16:04 -08:00
SamGondelman
4500ed17e7
merge from master
2018-02-13 13:58:39 -08:00
Zach Fox
ae8a8a48eb
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1
2018-02-13 13:55:32 -08:00
SamGondelman
38290064c1
replace materials by name, hide material mode for now
2018-02-13 13:24:08 -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
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
Zach Fox
95e9eb8e4a
Lots of progress
2018-02-12 17:06:57 -08:00
SamGondelman
9e8aa1898c
warnings, load material from URL, shapeID -> parentMaterialID
2018-02-12 12:50:09 -08:00
SamGondelman
84cd0e1529
wip live material swapping on model entities, model overlays, avatars,
...
and albedo swap on shape entities
2018-02-09 12:00:08 -08:00
NissimHadar
950a62f3f8
Global graphics flag default to on.
...
Added cast shadows flag to zone/keylight.
Exit the RenderShadowMap job if current keylight doesn't cast shadows.
2018-02-08 15:52:20 -08:00
ZappoMan
71a8e96d5a
fix several CR requests
2018-02-02 18:14:12 -08: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
ZappoMan
8a9153a461
Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters
2018-02-02 16:08:05 -08:00
Andrew Meadows
a5e968867e
Merge pull request #12302 from druiz17/fix-another-bootstrapping
...
Fix another bootstrapping and rename entityItem _dirtyFlags
2018-02-02 15:14:38 -08:00
Elisa Lupin-Jimenez
9f8e2017ce
can add image directly from asset server
2018-02-02 10:27:44 -08:00
Elisa Lupin-Jimenez
d390e20139
removed extraneous commenting and image class
2018-02-02 10:27:42 -08:00
Elisa Lupin-Jimenez
42151b8fd4
creating new image entity opens image property options
2018-02-02 10:14:27 -08:00
Elisa Lupin-Jimenez
ceb621a521
reverted protocol change for images
2018-02-02 10:08:40 -08:00
Elisa Lupin-Jimenez
576d683d3b
initial changes to incorporate snap model
2018-02-02 10:08:40 -08:00
Elisa Lupin-Jimenez
dc5f29aa58
entity item properties hooked up for image
2018-02-02 10:08:40 -08:00
Elisa Lupin-Jimenez
c9c55af661
setting up properties page (not complete)
2018-02-02 10:08:39 -08:00
Elisa Lupin-Jimenez
6f76650789
updated with master
2018-02-02 10:08:39 -08:00
Elisa Lupin-Jimenez
72d8f90ec1
not sure why entities don't render with these changes
2018-02-02 10:08:39 -08:00
Elisa Lupin-Jimenez
fc0e87d5ea
more infrastructure links
2018-02-02 10:08:39 -08:00
Elisa Lupin-Jimenez
fdca8ab93e
added image button to edit.js, working on connecting to cpp
2018-02-02 10:08:39 -08:00
Elisa Lupin-Jimenez
3a7290c3ed
starting 2d image entity type
2018-02-02 10:08:39 -08:00
ZappoMan
8751ef506e
Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters
2018-02-01 14:29:12 -08:00
Seth Alves
bdf6736a54
Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1
2018-02-01 12:04:56 -08:00
Dante Ruiz
ab20643ada
fix mistakes
2018-02-01 08:13:43 -08:00
Triplelexx
a8d2be045c
fix typos
2018-02-01 07:09:24 +00:00
Dante Ruiz
bd5fc65bfb
fix getDirtyFlags & getSpecialFlags function
2018-01-31 16:19:14 -08:00
Dante Ruiz
f6029ed9dc
made requested changes
2018-01-31 15:21:22 -08:00
Seth Alves
64a46bf5df
merge from upstream
2018-01-31 10:43:41 -08:00
Dante Ruiz
01f8227fa2
remove stray prints
2018-01-31 10:41:08 -08:00
Bradley Austin Davis
b97c938544
Merge pull request #12216 from thoys/feat/js-script-console-auto-complete
...
JS scripting console auto-complete
2018-01-31 10:39:51 -08:00
Dante Ruiz
9ff6e079ee
fix functions
2018-01-31 10:09:23 -08:00
Dante Ruiz
4429be23c0
add comment
2018-01-31 09:13:11 -08:00
Dante Ruiz
9c81909be5
restructures _dirtyFlags name and bits
2018-01-30 16:42:08 -08:00
ZappoMan
cd4b3b1a54
Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters
2018-01-30 12:52:41 -08:00
Dante Ruiz
4c0a173287
trying another solution
2018-01-30 10:23:19 -08:00
Dante Ruiz
bed2ea052d
better solution
2018-01-30 09:44:49 -08:00
Dante Ruiz
eef2f656be
Merge branch 'master' of github.com:highfidelity/hifi into fix-parenting-crash
2018-01-30 08:43:35 -08:00
Dante Ruiz
68fd9eafa8
fix entity parenting crash
2018-01-29 10:23:24 -08:00
ZappoMan
efc63a41e9
make sure true results for delete actually work, add more examples
2018-01-26 18:49:55 -08:00
ZappoMan
b883d006c8
add flags to support asking for specific messages, update examples
2018-01-26 18:26:48 -08:00
ZappoMan
a3d86a0242
cleanup
2018-01-26 17:37:24 -08:00
ZappoMan
aa82ad8855
adjust client to only delete entities on server echo
2018-01-26 14:57:36 -08:00
ZappoMan
aea16fe071
add delete filter support
2018-01-25 15:01:29 -08:00
Thijs Wenker
ce50380698
fix JSAPI typo
2018-01-25 22:47:35 +01:00
ZappoMan
c96e395a46
fix warning
2018-01-25 12:13:32 -08:00
ZappoMan
4497302a2b
Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters
2018-01-25 11:39:56 -08:00
Seth Alves
1cbc2e31cf
merge from upstream
2018-01-23 15:21:03 -08:00
humbletim
9fb20bee80
remove extra space
2018-01-23 15:13:53 -05:00
humbletim
65455e7b50
Merge remote-tracking branch 'upstream/master' into Leopoly_Phase1_004_RayPick-Changes
2018-01-23 14:57:33 -05: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
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
Seth Alves
9be2c67f00
Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1
2018-01-19 11:46:34 -08:00
Seth Alves
bce9b5f459
Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1
2018-01-19 09:53:54 -08:00
Andrew Meadows
75b5635d2f
less word salad
2018-01-18 17:43:22 -08:00
Andrew Meadows
3d3bfcf7a3
check dirty flags when harvesting physics results
2018-01-18 17:43:22 -08:00
ZappoMan
8364f64d4d
Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters
2018-01-18 15:08:27 -08:00
ZappoMan
25f5eb6b4f
named property example
2018-01-18 15:08:13 -08:00
Elisa Lupin-Jimenez
42b8c293d6
Merge pull request #12201 from elisa-lj11/qscriptvalue_macro_name
...
Fixed typo in macro name
2018-01-18 14:44:43 -08:00
Seth Alves
31c007d167
more backwards logic, added withViewVisibilityMask call in ItemKey
2018-01-18 14:15:30 -08:00
Dante Ruiz
3e3b3a0a9e
Merge branch 'master' of github.com:highfidelity/hifi into fix-dynamic-entities-not-colliding
2018-01-18 08:56:01 -08:00
Dante Ruiz
93594fb0bb
make dynamic entities collide with avatar when removing grab action
2018-01-18 08:55:51 -08:00
Seth Alves
76ef3d7c7d
pull from upstream
2018-01-18 07:01:50 -08:00
Elisa Lupin-Jimenez
49e72346a4
fixed typo in macro name
2018-01-17 18:08:05 -08:00
SamGondelman
134a026d8a
merge from master
2018-01-17 13:36:07 -08:00
Seth Alves
69a33428c0
Merge pull request #12078 from druiz17/soft-entities
...
Soft Entities
2018-01-17 08:02:37 -08:00
Sam Gateau
d4571bd86a
Merge pull request #12181 from humbletim/rename-model-graphics
...
Rename libraries/model -> libraries/graphics
2018-01-16 18:12:25 -08:00
NissimHadar
9a382ebb86
Merge pull request #12177 from NissimHadar/defaultAmbientFix
...
Set ambient mode to inherit if no URLs have been entered.
2018-01-16 14:40:08 -08:00
humbletim
08ccda9cfc
rename libraries/model(src/model) -> libraries/graphics(src/graphics)
2018-01-16 12:44:44 -05:00
Nissim Hadar
a1415e28ff
If there is neither a skybox URL nor an ambient light uRL, then set the ambient mode to inherit.
2018-01-15 15:11:10 -08:00
SamGondelman
f1253e3c6c
fix crash on last frame = first frame, make last frame inclusive
2018-01-15 15:01:17 -08:00
Dante Ruiz
645f608814
fixing merge conflict
2018-01-15 10:45:51 -08:00
SamGondelman
241849139f
wip
2018-01-15 10:21:16 -08:00
Dante Ruiz
5b82c7bc41
fix merge conflict
2018-01-12 11:00:19 -08:00
Nissim Hadar
50a030b68b
Corrected copy of ambient URL.
2018-01-12 00:22:06 -08:00
Nissim Hadar
a1f25bf49c
Moved variable setting to outside of loop.
...
Added copy of ambient URL.
2018-01-11 19:35:13 -08:00
Seth Alves
e7a3d98ae5
don't draw head-descendent entities when in 1st-person camera mode
2018-01-11 19:34:54 -08:00
Nissim Hadar
86cfeac95c
Moved variable setting to outside of loop.
2018-01-11 16:39:44 -08:00
Nissim Hadar
311e95e0d0
Corrected default values - for reading legacy content.
2018-01-11 14:57:22 -08:00
Nissim Hadar
4bd09fd9af
Corrected default values - for reading legacy content.
2018-01-11 14:53:58 -08:00
ZappoMan
612f9621b4
adding filter properties to allow optimization
2018-01-11 12:48:39 -08:00
Nissim Hadar
d225f803d0
Corrected default values.
2018-01-11 12:28:44 -08:00
Dante Ruiz
d0bff29471
fixing merge conflict
2018-01-10 10:11:53 -08:00
ZappoMan
3936dda099
Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters
2018-01-10 09:31:43 -08:00
Nissim Hadar
9f25b01b10
Merge branch 'master' of https://github.com/highfidelity/hifi into stageRemoval
2018-01-10 09:30:05 -08:00
Sam Gateau
6d6aad4aa8
Merge pull request #12060 from SamGondelman/burp5
...
Reduce EntityItem access in EntityRenderer::needsRenderUpdateFromEntity
2018-01-10 09:08:54 -08:00
Dante Ruiz
c4253f3b3b
Merge branch 'master' of github.com:highfidelity/hifi into soft-entities
2018-01-09 15:31:38 -08:00
ZappoMan
734ba3a8c5
Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters
2018-01-09 15:29:20 -08:00
Nissim Hadar
4ecb056210
Merge branch 'master' of https://github.com/highfidelity/hifi into stageRemoval
2018-01-09 13:44:13 -08:00
Nissim Hadar
c841ec6c8c
Copy Skybox URL to Ambient URL if background mode is Skybox and Ambient URL is blank.
2018-01-08 18:15:20 -08:00
Nissim Hadar
7811ddb904
Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
2018-01-08 15:39:09 -08:00
Nissim Hadar
b2b1807490
Changes per code review.
2018-01-08 15:37:06 -08:00
Nissim Hadar
46b494c802
Removed the Stage functionality - it is now implemented as a script.
2018-01-08 14:34:46 -08:00
SamGondelman
7c17603f3e
Merge remote-tracking branch 'upstream/master' into burp5
2018-01-08 14:27:31 -08:00
Melissa Brown
2fddace71e
Merge pull request #12019 from Delanir/C10594
...
Case 10594 - Fix entity property href not being able to reset (empty) ...
2018-01-08 14:22:28 -08:00
Nissim Hadar
0a21e5de04
Removed _backgroundPropertiesChanged
2018-01-08 12:07:21 -08:00
Nissim Hadar
d0c0d6a388
Set skybox mode as per legacy background mode if needed.
2018-01-08 11:50:28 -08:00
Nissim Hadar
93fffb4bbe
Removed PROP_BACKGROUND_MODE.
2018-01-07 14:21:22 -08:00
Nissim Hadar
8e793e790a
Deleted unused include file.
2018-01-07 14:11:26 -08:00
Nissim Hadar
8206ae6ffb
Removed BackgroundMode packet type.
2018-01-07 13:50:42 -08:00
Nissim Hadar
bc98cbd58f
Merge branch 'keylightInheritance' of https://github.com/NissimHadar/hifi into keylightInheritance
2018-01-06 23:26:28 -08:00
nissim.hadar
1acf7bae20
Removed reference to BackgroundMode.
2018-01-06 23:24:28 -08:00
Nissim Hadar
d5be9365fe
Merge branch 'keylightInheritance' of https://github.com/NissimHadar/hifi into keylightInheritance
2018-01-06 10:02:12 -08:00
nissim.hadar
33cc17a52f
Removing unused Background mode.
2018-01-06 02:27:49 -08:00
nissim.hadar
d2ac27f1b8
Code clean-up
2018-01-06 01:48:58 -08:00
nissim.hadar
579aec7118
Only check for zone fields.
2018-01-06 01:37:23 -08:00
Nissim Hadar
9e5eba4d3a
Merge branch 'keylightInheritance' of https://github.com/NissimHadar/hifi into keylightInheritance
2018-01-05 23:11:40 -08:00
Nissim Hadar
d645163294
Fixed gcc warning.
2018-01-05 13:16:02 -08:00
Nissim Hadar
635fd2d0cf
Use older C++ version for Ubuntu
2018-01-05 12:48:21 -08:00
Nissim Hadar
3963c0a5a1
Code review improvements.
2018-01-05 12:22:20 -08:00
Nissim Hadar
cf7d6a2eab
Added correct use of legacy background combo.
2018-01-04 20:30:10 -08:00
Nissim Hadar
c10d2a5461
Added correct use of legacy background combo.
2018-01-04 19:48:25 -08:00
Nissim Hadar
adbc4d0c39
Removed background mode from code (still in the protocol).
2018-01-04 18:23:25 -08:00
Nissim Hadar
e797a77262
Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
...
# Conflicts:
# interface/resources/qml/js/Utils.jsc
2018-01-04 15:58:08 -08:00
Andrew Meadows
a51d83c6e4
rollback automatic priority promotion to RECRUIT
2018-01-04 15:53:03 -08:00
Andrew Meadows
7e01f97f8f
more correct volunteer ownership priority promotion
2018-01-04 15:53:03 -08:00
Andrew Meadows
fbe2dd8a41
remove unnecessary 'virtual' keyword
2018-01-04 14:46:16 -08:00
Andrew Meadows
13538006ec
fix bug preventing sim owenrship on local domain
2018-01-04 14:46:16 -08:00
Nissim Hadar
8bd2985f1f
Simplified code.
2018-01-04 13:06:28 -08:00
Nissim Hadar
e8770ec204
TEMPORARY fix for older content not containing these fields (keylight, skybox, ambient light).
2018-01-04 11:30:02 -08:00
Nissim Hadar
5b7ef9a3d3
Minor cleanup.
2018-01-04 09:13:58 -08:00
Dante Ruiz
674e8e1ac2
Merge branch 'master' of github.com:highfidelity/hifi into soft-entities
2018-01-03 08:47:40 -08:00
humbletim
513a69cdcd
changes per CR feedback
2018-01-03 04:08:43 -05:00
ZappoMan
f639e950e9
Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters
2018-01-02 15:47:36 -08:00
Dante Ruiz
6fa3446c57
joints are being relayed to children
2018-01-02 13:54:13 -08:00
Clément Brisset
d6bc41db60
Merge pull request #12075 from highfidelity/stable
...
Stable merge back into master
2018-01-02 13:24:03 -08:00
Dante Ruiz
be9bf31843
Merge branch 'master' of github.com:highfidelity/hifi into soft-entities
2018-01-02 08:04:26 -08:00
nissim.hadar
b56c7535d2
Added legacy functionality (for zones that used Background "skybox")
2017-12-30 12:25:58 -08:00
druiz17
0ebbb76b49
fixed property over written issue and start relaying joints
2017-12-29 16:12:40 -08:00
Nissim Hadar
7260b4ff7b
Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
...
# Conflicts:
# libraries/entities/src/EntityPropertyFlags.h
2017-12-29 15:16:14 -08:00
Dante Ruiz
30bbe6e41b
added relayParentJoints property
2017-12-28 15:43:59 -08:00
Nissim Hadar
64644fc980
WIP - skybox inheritance
2017-12-28 14:31:59 -08:00
Nissim Hadar
4ffd896ced
WIP - adding AmbientLightPropertyGroup
2017-12-26 11:15:33 -08:00
Nissim Hadar
1fa8f7c55b
WIP - adding AmbientLightPropertyGroup
2017-12-26 09:15:45 -08:00
Nissim Hadar
0b73e7db3f
WIP - adding AmbientLightPropertyGroup
2017-12-26 09:15:13 -08:00
Nissim Hadar
3f82e9147b
Change keylight/ambient mode default from "enabled" to "inherit"
2017-12-22 16:30:19 -08:00
Nissim Hadar
8ee5f642a9
Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
...
# Conflicts:
# libraries/networking/src/udt/PacketHeaders.cpp
# libraries/networking/src/udt/PacketHeaders.h
2017-12-22 15:41:59 -08:00
Seth Alves
96197e66bb
Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3
2017-12-22 15:13:02 -08:00
Dante Ruiz
86be684d7a
delete code
2017-12-22 14:58:32 -08:00
Dante Ruiz
e316f71b31
fix grabbing
2017-12-22 14:53:48 -08:00
SamGondelman
5018edcfe0
reduce calls to getVisible
2017-12-22 12:59:06 -08:00
Seth Alves
533aa3d918
code review
2017-12-22 09:07:16 -08:00
Seth Alves
897b96d092
Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3
2017-12-22 07:36:26 -08:00
Zach Fox
07a1cf434a
IT'S WORKING!!!
2017-12-21 16:33:47 -08:00
Zach Fox
373ef6c6ce
Progress?
2017-12-21 16:32:20 -08:00
Zach Fox
a2f2c23337
Change three lines of code. Fix one thing. Break another.
2017-12-21 16:32:15 -08:00
Zach Fox
73eb258e79
IT'S WORKING!!!
2017-12-21 15:17:52 -08:00
Zach Fox
e963673409
Progress?
2017-12-21 14:08:18 -08:00
humbletim
a146b778f7
support additional .extraInfo for ray intersections
2017-12-21 12:35:13 -05:00
Nissim Hadar
58c6f8e9c4
Radio buttons now work correctly.
2017-12-20 19:17:18 -08:00
Zach Fox
b30d3fcc12
Change three lines of code. Fix one thing. Break another.
2017-12-20 15:40:10 -08:00
Nissim Hadar
d4b34b71ad
First version with packet update.
2017-12-20 13:12:07 -08:00
ZappoMan
45f07718d3
Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters
2017-12-19 12:59:17 -08:00
Andrew Meadows
bad2c1df76
proper modulus of animation frame
2017-12-19 10:40:17 -08:00
Seth Alves
63ac426bf2
fix logic that resets own-avatar collisions after a parenting grab is released
2017-12-19 08:13:44 -08:00
Seth Alves
ca45c4e8da
fix logic that resets own-avatar collisions after a parenting grab is released
2017-12-18 17:30:56 -08:00
Zach Fox
a2fe2797ff
Merge pull request #11982 from zfox23/commerce_staticCertVersioning
...
Commerce: staticCertificateVersion; Seal serverScripts JSON property; getStaticCertificateJSON()
2017-12-18 15:20:23 -08:00
Daniela Fontes
7ca4a21a91
Fix entity property href not being able to reset (empty) once it was set with
...
the correct input for the first time.
2017-12-18 21:00:29 +00:00
Andrew Meadows
cfd2097f36
Merge pull request #11965 from AndrewMeadows/expose-physics-perf-stats-to-js
...
Cleanup names of debug stats and trace contexts.
2017-12-18 10:02:42 -08:00
Brad Hefta-Gaub
5087893097
Merge pull request #11804 from amantley/character_entity_fixes
...
Fixed Entity Animation Property not applying to FBXs
2017-12-15 15:31:11 -08:00
ZappoMan
17288386ae
implement support for zone properties in filters
2017-12-15 10:42:29 -08:00
ZappoMan
5a843b1342
adding support for filters to get old properties
2017-12-14 11:14:09 -08:00
amantley
5bc113c818
deleted some debug print statements in ModelEntityItemcpp and deleted else statement that was superfluous
2017-12-13 19:07:23 -08:00
Zach Fox
4980c769c0
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_staticCertVersioning
2017-12-13 17:30:19 -08:00
Zach Fox
d388ca5ac9
Missed a spot. That was the problem the whole time.
2017-12-13 11:22:31 -08:00
Zach Fox
7113a72f2e
Bugfixes
2017-12-12 18:04:20 -08:00
Stephen Birarda
139976d8bb
allow staging METAVERSE_SERVER_URL to be toggled by env
2017-12-12 16:22:08 -08:00
Zach Fox
bced55801d
ABC ORDER!
2017-12-12 15:52:35 -08:00
Zach Fox
f5df83667f
Add getStaticCertificateJSON() to Entity Scripting Interface
2017-12-12 15:50:04 -08:00
Zach Fox
1bd12857ef
Add static certificate JSON versioning; add serverScripts to cert JSON
2017-12-12 12:07:08 -08:00
amantley
079d9639e4
Got rid of the while loop in updateFrameCount in ModelEntityItem_cpp
2017-12-12 09:12:11 -08:00
amantley
29538851b6
Made the changes from the latest code review, except getting rid of the
...
while loop.
2017-12-12 09:06:43 -08:00
Andrew Meadows
406bf7898d
cleanup prof stats and trace context names
2017-12-11 11:31:00 -08:00
amantley
65bb896450
Merge remote-tracking branch 'origin/master' into character_entity_fixes
2017-12-11 10:55:54 -08:00
Seth Alves
c4b2422f53
Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3
2017-12-07 19:40:52 -08:00
David Kelly
42b509639b
Fix certificate hash
2017-12-07 17:22:00 -08:00
Seth Alves
40412b80c6
Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3
2017-12-07 17:03:04 -08:00
Dante Ruiz
0f3a70553c
fix dynamic entities that are parented to your avatar
2017-12-06 11:18:15 -08:00
Dante Ruiz
8af1d8d8d0
dont run code if not nesscassry
2017-12-05 15:48:09 -08:00
Dante Ruiz
c58286d371
dont do work if not needed
2017-12-05 09:31:35 -08:00
Dante Ruiz
486cdf14d2
make sure that NO_BOOTSTRAPPING is disbaled correctly if parent is changed
2017-12-04 15:34:53 -08:00
Dante Ruiz
a1bf54ff00
fix issue of no_bootstrapping not being set correctly
2017-12-04 11:16:41 -08:00
Dante Ruiz
03934549cc
Merge branch 'master' of github.com:highfidelity/hifi into fix-collision-mask-for-children
2017-12-04 09:08:11 -08:00
Seth Alves
b590cd5b89
avatar-entities which are children of an avatar will scale with the avatar
2017-12-02 09:31:43 -08:00
Dante Ruiz
1e6b5c0c75
make requested changes
2017-12-01 17:09:00 -08:00
Dante Ruiz
a1d90b5dd9
added extra bit
2017-12-01 15:41:13 -08:00
ZappoMan
750d505f9b
fix issues in model import sizing caused by recent refactor
2017-11-30 17:51:59 -08:00
Bradley Austin Davis
59aea9c401
Merge pull request #11862 from jherico/android_nov
...
Make buildable APK from Gradle
2017-11-30 11:23:29 -08:00
howard-stearns
57ec73bb13
spacing
2017-11-29 14:37:20 -08:00
amantley
233d693d76
removed debug print statements and fixed negative FPS handling
2017-11-29 10:51:04 -08:00
amantley
778d98f56b
made some changes to fix coding standard problems in the code, also added the update for the EntityItem base class to the update function
2017-11-28 18:42:03 -08:00
howard-stearns
281b4cfd88
Merge branch 'master' of https://github.com/highfidelity/hifi into the-lost-ECDSA
2017-11-28 16:59:44 -08:00
Bradley Austin Davis
e4220aa44e
Fixing warnings in android build
2017-11-28 14:32:30 -08:00
amantley
101e67498a
cleaned up the code to remove _currentFrame updating in RenderModelEntityItem also removed the unnessary currently playing frame property
2017-11-28 14:11:56 -08:00
amantley
1eacf7cbda
Merge remote-tracking branch 'origin/master' into character_entity_fixes
...
This is to update the branch with the master branch
2017-11-28 11:41:29 -08:00
amantley
d607ca0914
initialize the _lastAnimated time when the modelEntityRenderer is instantiated, this fixes the sync between interface and the server
2017-11-28 11:04:48 -08:00
howard-stearns
1575119327
PR feedback
2017-11-27 10:46:57 -08:00
amantley
522dc3dfb1
Merge remote-tracking branch 'origin/master' into character_entity_fixes
...
updating Character entity fixes branch with the changes in the origin
master
2017-11-22 17:55:39 -08:00
amantley
2e75016021
changes to modelEntity.cpp
2017-11-22 17:53:21 -08:00
amantley
fdf5139a74
everything now works with an atomic start time property. but now I will get rid of this and use current frame instead
2017-11-22 17:52:13 -08:00
howard-stearns
a6b437a79f
get rid of "error" warning because the key wasn't broken into 64 char
...
lines
2017-11-22 16:55:57 -08:00
Seth Alves
9ccc416e80
avoid a crash during domain change
2017-11-22 16:34:56 -08:00
howard-stearns
abf41300dd
refactor
2017-11-22 16:29:56 -08:00
howard-stearns
899999a4c6
fix up dynamic ownership challenge
2017-11-22 15:58:30 -08:00
amantley
1e5d099b06
changed the currentlyplayingframe property so that it is updated in RenderableModelEntity.cpp now. Remains to remove everything but initializing currentlyPlayingFrame in ModelEntityRender.cpp
2017-11-21 17:36:01 -08:00
howard-stearns
ca80c9b764
Merge branch 'ECWallet' of https://github.com/MandatoryMania/hifi into MandatoryMania-ECWallet
2017-11-21 16:28:08 -08:00
ZappoMan
3a967ca895
Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup
2017-11-21 10:53:29 -08:00
Thijs Wenker
627fee80ec
added support for exporting parentJointName
2017-11-21 01:49:56 +01:00
Thijs Wenker
c3754d6369
smart pointer
2017-11-20 23:24:03 +01:00
amantley
5a1d04ee06
Merge remote-tracking branch 'origin/master' into character_entity_fixes
...
updating the branch with the current master
2017-11-20 10:22:46 -08:00
Thijs Wenker
e94199acad
Merge branch 'master' of github.com:highfidelity/hifi into feat/parentJointName
2017-11-20 18:29:54 +01:00
Thijs Wenker
84ec9890ca
reverted special property case, parentJointName is now only parsed from the JSON import
2017-11-20 18:29:33 +01:00
amantley
befa0f8ab5
now the update frame is only happening in the assignment client code. added setCurrentlyPlayingFrame to ModelEntityItem.cpp
2017-11-20 09:11:15 -08:00
ZappoMan
04ee1adabd
Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup
2017-11-19 14:40:31 -08:00
Brad Hefta-Gaub
ebac2556e4
Merge pull request #11841 from ZappoMan/makeAddEntityAtomic
...
Make add entity atomic
2017-11-18 14:27:12 -08:00
amantley
013d16cee9
this is the change to add a property for the currentframeplaying
2017-11-17 18:37:54 -08:00
ZappoMan
71a46a3374
cleanup
2017-11-17 13:03:04 -08:00
Stephen Birarda
239b116874
Merge pull request #11835 from birarda/bug/octree-connection-id
...
Reset EntityTreeSendThread known state if client disconnects from Entity Server
2017-11-17 12:56:25 -08:00
Thijs Wenker
3c37bf8acd
parentJointName property experiment
2017-11-17 20:33:06 +01:00
Andrew Meadows
98001b64d9
Merge pull request #11788 from ctrlaltdavid/21579-a
...
Particles emitter fixes
2017-11-17 11:31:12 -08:00
H Q
28eedd1a94
Small style mod
2017-11-17 11:30:21 -08:00
Stephen Birarda
dd27e3db31
add diff traversal reset when resetting state
2017-11-17 09:44:35 -08:00
ZappoMan
cd0fa989e1
debugging
2017-11-17 08:55:55 -08:00
H Q
21a28827c9
Remaining coding style changes, other small fixes
2017-11-17 07:59:52 -08:00
amantley
20fd893b47
Starting to implement the update function to ModelEntityItem_cpp Also put access to the currently playing frame in RenderableModelEntityItem_cpp
2017-11-16 18:38:28 -08:00
amantley
ded81fcab0
Merge remote-tracking branch 'origin/master' into character_entity_fixes
...
Updating the branch to the latest code
2017-11-16 13:53:17 -08:00
amantley
881b22ab15
added update function to modelEntityItem.cpp
2017-11-16 12:41:56 -08:00
H Q
14890495a2
Merge branch 'master' of https://github.com/highfidelity/hifi into ECWallet
...
Syncing
2017-11-16 12:38:45 -08:00
H Q
27350ddbfc
Coding style corrections
2017-11-16 12:35:00 -08:00
Andrew Meadows
d538a9aaa8
fix typo making cylinders collide as sphere
2017-11-15 09:04:04 -08:00
H Q
0db9e876d6
Merge branch 'master' of https://github.com/highfidelity/hifi into ECWallet
2017-11-14 15:40:44 -08:00
H Q
44f2c92d30
Final ECSDA and nonce modifications for this dev cycle
2017-11-14 15:40:29 -08:00
David Rowe
2c542b73a0
Fix particles emitter rendering not updating when edit textures URL
2017-11-10 10:22:35 +13:00
amantley
3ce65ece87
Merge remote-tracking branch 'upstream/master' into character_entity_fixes
...
this is just to synch this branch with the upstream master
2017-11-09 10:38:34 -08:00
amantley
af0304fd6b
preliminary changes for the property fixes
2017-11-09 10:04:12 -08:00
Clément Brisset
85efe5265d
Merge pull request #11724 from ctrlaltdavid/21580
...
Fix serverScripts not being able to see entities in parent/child tree
2017-11-07 10:36:20 -08:00
David Rowe
05275afb4f
Resending full scene is not necessary after all
2017-11-05 15:48:02 +13:00
David Rowe
2d27a6cf4c
Merge branch 'master' into 21580
2017-11-05 13:59:43 +13:00
ZappoMan
d4b4d188ed
allow splitting of edit or add entity packets across multiple edit packets when property list is larger than MTU
2017-11-04 13:40:41 -07:00
ZappoMan
74ceab1e68
fix mac and unic build
2017-11-02 19:30:39 -07:00
ZappoMan
baff900839
cleanup some writeLocks
2017-11-02 17:46:15 -07:00
ZappoMan
b5199220ab
cleanup SpatiallyNestable Velocity to match WorldVelocity naming
2017-11-02 17:07:53 -07:00
ZappoMan
53c6eeb58b
updatePosition now setPosition
2017-11-02 15:58:50 -07:00
ZappoMan
afaad5fcd7
Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup
2017-11-02 13:39:51 -07:00
Zach Fox
bb1ffbc06f
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_avatarEntityTests
2017-11-01 12:38:34 -07:00
Zach Fox
b335ba9a75
Timeout timer
2017-11-01 11:34:29 -07:00
Zach Fox
8a6a744099
It's working
2017-11-01 10:46:13 -07:00
David Rowe
328fc29bc5
Fix serverScripts not being able to see entities in parent/child tree
2017-11-01 17:01:19 +13:00
Zach Fox
93308dfcd3
Why did I think this would work before?
2017-10-31 16:21:10 -07:00
Nissim Hadar
03d2ca19b9
Moving consts into mode::Haze namespace.
2017-10-31 13:46:58 -07:00
Zach Fox
e9c144892a
Fixes
2017-10-31 13:11:32 -07:00
Zach Fox
f5ada4fe62
Will it compile?
2017-10-31 12:33:28 -07:00
Zach Fox
6f96e0c7bd
More progress
2017-10-31 12:14:12 -07:00
Zach Fox
90e9251176
It's a start
2017-10-31 11:28:19 -07:00
Nissim Hadar
f3147fc24f
Merge branch 'master' into hazeZone
2017-10-30 21:41:23 -07:00
Nissim Hadar
3ddf970be3
Removed haze init variables from the model namespace.
2017-10-30 21:40:14 -07:00
Nissim Hadar
636f7858a3
Removed _degs and _m suffixes.
2017-10-30 19:45:08 -07:00
Brad Hefta-Gaub
c1a808e726
Merge pull request #11703 from AndrewMeadows/circles-and-quads
...
fix Circles and quads
2017-10-30 18:03:32 -07:00
Zach Fox
19420a0ff2
Move static cert verify to properties
2017-10-30 17:01:55 -07:00
Nissim Hadar
5fc68cae0d
Converted Haze initialization values to static.
2017-10-30 11:51:19 -07:00
ZappoMan
f63db42c0e
migrate SpatiallyNestable::getOrientation to getWorldOrientation, remove redundant getRotation
2017-10-28 10:14:25 -07:00
ZappoMan
a7a0f03ede
rename SpatiallyNestable::getPosition() to SpatiallyNestable::getWorldPosition()
2017-10-27 18:39:17 -07:00
Nissim Hadar
fb6c5b98d6
Merge branch 'master' into hazeZone
2017-10-27 15:40:03 -07:00
Nissim Hadar
a5a135c2ba
Fixes for 8672-8674.
2017-10-27 15:39:14 -07:00
ZappoMan
1000318dff
tweak min dimension to match current behavior
2017-10-27 14:26:02 -07:00
Zach Fox
5ab737f66d
Merge pull request #11658 from zfox23/pop_dynamicTestsMaster
...
Commerce: Owner Verification for Certified Entities
2017-10-27 12:28:04 -07:00
Andrew Meadows
2c4d4373dc
support asymmetrical cross section Cylinder
2017-10-27 10:41:16 -07:00
Nissim Hadar
420b0f321c
Merge branch 'master' into hazeZone
2017-10-27 09:14:53 -07:00
Nissim Hadar
66c31caf4b
Refactoring of the haze
2017-10-27 09:08:58 -07:00
Andrew Meadows
474609dabf
enforce dimensions of Circles and Quads
2017-10-26 22:58:24 -07:00
Andrew Meadows
901e145712
remove redundant dimensionsChanged()
2017-10-26 22:57:33 -07:00
ZappoMan
431ee58577
more cleanup
2017-10-26 21:30:59 -07:00
ZappoMan
e5becba4e9
migrate away from updateXXX standardize on setXXX
2017-10-26 20:38:07 -07:00
Sam Gondelman
863a2041a6
Merge branch 'master' into pointerEvents
2017-10-25 17:22:19 -07:00
Andrew Meadows
2d0b94817c
Merge pull request #11336 from 1P-Cusack/21389_PR2
...
WL21389 PR2: Representation of collision shapes need updating (details below).
2017-10-25 10:41:21 -07:00
Zach Fox
91333cdf7b
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster
2017-10-25 10:26:50 -07:00
Brad Hefta-Gaub
18a74cea91
Merge pull request #11659 from zfox23/mergeRC57IntoMaster_20171023
...
2017-10-23: Merge RC57 into Master
2017-10-24 21:19:01 -07:00
ZappoMan
5901d1a311
clean up VERSION_ENTITIES stuff
2017-10-24 13:48:27 -07:00
ZappoMan
a1885926b5
some cleanup
2017-10-24 11:46:42 -07:00
LaShonda Hopper
dbd1a80046
[WL21389] Set Simulation::DIRTY_SHAPE flag when entity::Shape changes (details below).
...
* Fixes an issue where ShapeEntityItem's collisionShapeType wasn't updated when its
entity::Shape type was changed.
* Adds getNameForShapeType static method to ShapeInfo.
** Moves shapeTypeNames[] from EntityItemProperties.cpp to ShapeInfo.cpp
* Adds collisionShapeType to ShapeEntityItem::debugDump
* Tested creating shapes within the Creation Menu:
** Create Menu -> (Box/Sphere)
*** Observe Properties tab auto-focus
** From Properties tab elect alternate shape type from the Shape Dropdown list.
NOTE: While this fixes an issue with the collision shape, it doesn't completely
resolve the issues seen with the polyhedra or polygonal shapes noticed on
RELEASE-7130 rebase.
Reviewed-by: Leander Hasty <leander@1stplayable.com>
Changes Committed:
modified: libraries/entities/src/EntityItemProperties.cpp
modified: libraries/entities/src/ShapeEntityItem.cpp
modified: libraries/shared/src/ShapeInfo.cpp
modified: libraries/shared/src/ShapeInfo.h
2017-10-24 14:16:24 -04:00
LaShonda Hopper
789b850846
[WL21389] Addresses feedback from PR #11336 .
...
* Removes todos from ShapeEntityItem::shapeCalculator stub commit.
* Removes defined out debugging, as requested, from GeometryCache::computeSimpleHullPointListForShape.
* Moves cone handling to its own section for better contextual flow.
Changes Committed:
modified: libraries/entities/src/ShapeEntityItem.cpp
modified: libraries/render-utils/src/GeometryCache.cpp
2017-10-24 14:16:23 -04:00
LaShonda Hopper
5b50b362f1
[WL21389] WL21389 PR2: Representation of collision shapes need updating (details below).
...
This commit adds support for the polyhedrons and polygons sans
Torus and Quad which aren't currently supported within GeometryCache.
* Moves GeometryCache::_shapes from public to private scope
* Nothing aside from the class should be directly altering this, only querying
* Updated instances of direct referencing which looks to have been limited to prior
testing of instancing and shapes.
* Adds an accessor function for ShapeData to GeometryCache
* Consolidates point list generation to helper function
* GeometryCache::computeSimpleHullPointListForShape
* Moves GeometryCache::Shape to entity::Shape mapping to GeometryCache from
RenderableShapeEntityItem
* Adds conversion accessor to GeometryCache, GeometryCache::Shape getShapeForEntityShape
* Sets ShapeEntityItem::ShapeInfoCalculator callback committed earlier.
* This helps circumvent the issue with library inclusion. entity-render knows about
entity; however, entity doesn't know about entity-renderer; however, GeometryCache
data is needed within entity::ShapeEntityItem to compose the ShapeInfo point list data.
* This callback is set up within Application::init of the Interface as it knows about
both halves of the equation, and the callback needs to be setup prior to any entities
collision data getting generated.
* Removes _type reset within ShapeInfo::setPointCollection
* This should avoid any issues due to subversively setting the type or
incorrectly setting the type as a tangential operation.
* Audited instances of ShapeInfo::setPointCollection and all seemed to be
calling the function immediately after having set the type via
ShapeInfo::setParams
* Adds new ShapeType: SHAPE_TYPE_CIRCLE
* This type is reserved for the circle which is now treated as a special
type of Cylinder_Y with regard to collision as opposed to a simple hull.
* Fixes the issue where jumping on a circle, at times, would
result in the avatar sliding off towards an edge as if atop a
squished cone.
* Also updates ShapeInfo::getType() to return ShapeType as opposed to int
* Auditing calls showed that majority of places were comparing against ShapeType
* ShapeType::_type is a ShapeType so returning the type explicitly
is more consistent.
* ShapeInfo file houses ShapeType enum so any file aware of ShapeInfo is aware of
ShapeType enumeration.
* entity::Quad defaults to SHAPE_TYPE_ELLIPSOID
* Like entity::Shape::Torus, entity::Shape::Quad is currently unsupported within
GeometryCache::buildShapes.
* Also it appears that a Quad shape can't be created within world via the creation menu.
* There's no explicit option at present to create one.
* Trying subvert the Cube/Box creation option to generate one results in an enforced
stubby box as opposed to a quad.
* Given the aforementioned points, entity::Shape::Quad will default to
SHAPE_TYPE_ELLIPSOID as opposed to SHAPE_TYPE_BOX.
* Added Todo regarding the shape being unsupported along with a notation to create
a special ShapeType, SHAPE_TYPE_QUAD, for it should it be added in the future.
* Adds some comments and has some minor clean up.
Reviewed-by: Leander Hasty <leander@1stplayable.com>
Changes Committed:
modified: interface/src/Application.cpp
modified: interface/src/Util.cpp
modified: interface/src/Util.h
modified: libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
modified: libraries/entities/src/ShapeEntityItem.cpp
modified: libraries/entities/src/ShapeEntityItem.h
modified: libraries/physics/src/ShapeFactory.cpp
modified: libraries/render-utils/src/GeometryCache.cpp
modified: libraries/render-utils/src/GeometryCache.h
modified: libraries/shared/src/ShapeInfo.cpp
modified: libraries/shared/src/ShapeInfo.h
modified: tests/gpu-test/src/TestInstancedShapes.cpp
2017-10-24 14:16:17 -04:00
ZappoMan
1128a98e88
implement callEntityClientMethod
2017-10-24 11:15:57 -07:00
Andrew Meadows
9981a44b71
add hook for ShapeInfo calculator
2017-10-24 14:15:08 -04:00
Zach Fox
1f6d989044
Merge branch 'RC-57' of https://github.com/highfidelity/hifi into mergeRC57IntoMaster_20171023
2017-10-23 17:37:43 -07:00
Zach Fox
3e139283ba
Remove unnecessary newlines
2017-10-23 17:31:21 -07:00
Zach Fox
97d44e62c8
Fix bugs
2017-10-23 16:52:32 -07:00
Zach Fox
53081b51a6
Clean up as much as possible
2017-10-23 16:00:39 -07:00