Atlante45
28f164d7e5
Remove legacy jurisdiction code
2017-12-29 12:46:52 -08:00
Brad Davis
7bf1b176d7
Renaming Tablet API to Tablets, supporting dev-mode QML loading from filesystem
2017-11-10 14:21:24 -08:00
ZappoMan
5901d1a311
clean up VERSION_ENTITIES stuff
2017-10-24 13:48:27 -07:00
Andrew Meadows
aee35b751e
replace 'unsigned long' with uint64_t
2017-08-18 14:35:48 -07:00
Andrew Meadows
0de109e2e8
cleanup and fix typos
2017-08-18 11:29:47 -07:00
David Kelly
c4d5d16eb3
cr feedback
2017-07-18 11:12:06 -07:00
David Kelly
061f084d9f
Get marketplaceID into imported entities
...
Rather than doing this on the backend, we can do it here at the
time we import. Later we will have some support for getting
an entities identity hash and querying the backend to get a
marketplaceID for them as needed. However for now this is enough
to get us moving forward.
2017-07-17 15:08:30 -07:00
Seth Alves
794495c197
make ResourceManager be owned by DependencyManager
2017-06-28 14:18:14 -07:00
Brad Davis
fece438602
Cleanup and refactoring
2017-06-15 18:58:56 -07:00
Stephen Birarda
53e6a77fcc
cleanup EncodeBitstreamParams to use nodeData when possible
2017-03-24 13:41:36 -07:00
Stephen Birarda
1b1ae48650
don't recurse on octree elements that have not changed
2017-01-30 17:01:45 -08:00
Stephen Birarda
a40c25ddbf
fix repeated send of matching entities
2017-01-19 16:42:14 -08:00
Stephen Birarda
b08bfe93f4
change lastViewFrustumSent to lastQuerySent
2017-01-18 14:58:36 -08:00
David Rowe
657f8fdad5
Fix reporting of JSON export failure
2016-06-15 14:12:49 +12:00
David Rowe
2953ca08cb
Fix import of invalid JSON file failing silently
2016-06-10 12:04:41 +12:00
Andrew Meadows
bcf2cc8074
use references not pointers for ViewFrustums
...
also unravelling some spaghetti:
(1) split Octree stuff out of ViewFrustum
(2) moved ViewFrustum from octree to shared lib
(3) removed some cruft
2016-05-05 18:28:27 -07:00
Zach Pomerantz
ac30aed948
Hold onto octree child after creation
2016-04-04 17:52:41 -07:00
Atlante45
807698f0bb
Make svo loading use ResourceManager
2016-03-28 18:07:48 -07:00
Zach Pomerantz
40aabe7fae
Delete used QNetworkReply
2016-03-21 13:30:01 -07:00
Brad Hefta-Gaub
6d211dd4e5
first cut at fixing the scene not stable bug
2016-03-08 14:52:21 -08:00
Andrew Meadows
c3dfc13f88
namechange ViewFrustum::location to ::intersection
2016-02-25 18:09:35 -08:00
Andrew Meadows
9c927ea36b
ViewFrustum method renames and whitespace cleanup
...
fooInFrustum() --> computeFooViewLocation()
except pointInFrustum() --> computeFrustumLocation()
2016-02-25 09:11:28 -08:00
Seth Alves
e365d93ed9
don't save entites with invalid parentIDs (or with IDs that indicates an avatar) to the persist file
2016-01-18 16:50:26 -08:00
Brad Hefta-Gaub
2774df38bc
check for entity size before including it for LOD
2016-01-18 09:06:57 -08:00
Brad Davis
6ef77bc46a
Support the marketplace in QML
2015-12-21 11:34:03 -08:00
Atlante45
ce51350b65
Fix warnings on windows 64bit
2015-12-11 15:42:15 -08:00
Brad Hefta-Gaub
18e62290f3
fix warnings
2015-12-04 08:37:46 -08:00
Brad Hefta-Gaub
f472b515c3
remove wantsColor support since its always true and required for entities
2015-12-03 21:03:32 -08:00
Brad Hefta-Gaub
81fb4476bc
remove coverage map and occulusion culling, since it was always disabled
2015-12-03 20:29:23 -08:00
Brad Hefta-Gaub
5a75a17174
Revert "Cruft removal"
2015-12-03 17:40:41 -08:00
Brad Hefta-Gaub
528b8e5d3f
fix warnings
2015-12-03 16:45:01 -08:00
Brad Hefta-Gaub
849a8707d2
remove wantsColor support since its always true and required for entities
2015-12-03 11:11:15 -08:00
Brad Hefta-Gaub
0c05ffe9ce
remove coverage map and occulusion culling, since it was always disabled
2015-12-03 10:20:04 -08:00
Atlante45
4aaa9ca02f
Make OctreeElementBag safer to use
2015-11-30 15:23:49 -08:00
Brad Hefta-Gaub
8ba6dfe721
add deprication warning about binary SVOs
2015-11-20 09:29:36 -08:00
Stephen Birarda
0a64242160
cleanup string grabbing for PacketType enum
2015-11-12 14:43:25 -08:00
ericrius1
dcb37ccd73
Removed whitelist and raypicking code from octree, fixed a small bug with polylines
2015-10-19 13:14:19 -07:00
ericrius1
8c229d88a8
moving whitelist code out of octree
2015-10-19 11:59:44 -07:00
ericrius1
3b59bffb79
Deleting only strokes from the whiteboard where the erase button was clicked on
2015-10-15 11:38:18 -07:00
ericrius1
cfca0fe8c0
Adding a color indicator to whiteboard
2015-10-14 15:58:18 -07:00
ericrius1
d01dda9c81
Adding in functionality to include only specified Ids in ray picking
2015-10-12 14:40:11 -07:00
Brad Hefta-Gaub
430cbcca7e
first cut at adding surface normals to ray intersection
2015-09-27 21:57:50 -07:00
Brad Davis
9b81842850
Merge branch 'master' into homer
...
Conflicts:
assignment-client/src/octree/OctreeSendThread.cpp
interface/src/Application.cpp
libraries/entities-renderer/src/EntityTreeRenderer.cpp
libraries/entities/src/EntityItem.cpp
libraries/entities/src/EntityTree.cpp
libraries/entities/src/EntityTreeElement.cpp
libraries/entities/src/EntityTreeElement.h
libraries/entities/src/EntityTreeHeadlessViewer.cpp
libraries/entities/src/RecurseOctreeToMapOperator.cpp
libraries/octree/src/Octree.h
libraries/physics/src/EntityMotionState.cpp
2015-09-11 16:31:18 -07:00
Brad Davis
aa989c3687
Fixing some entity race condition crashes
2015-09-10 20:53:17 -07:00
Seth Alves
9c4fdfd653
merge from upstream
2015-09-08 18:01:07 -07:00
Seth Alves
31fcd55d47
octree uses shared pointers
2015-09-08 11:59:48 -07:00
Stephen Birarda
80cf7b6c76
resolve conflicts on merge with upstream/master
2015-08-27 14:50:04 -07:00
Atlante45
179ee73e26
Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocol
2015-08-26 16:50:33 +02:00
Brad Davis
d311e4f2ea
Fixing problems reported by static analysis tool
2015-08-25 19:18:55 -07:00
Brad Davis
380b0cb23c
Removing tabs from our javascript and C++
2015-08-24 15:26:46 -07:00
