Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-14 14:56:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
33467 commits 74 branches 59 tags 1.2 GiB
Commit graph

186 commits

Author SHA1 Message Date
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
Stephen Birarda
052978898e resolve conflicts on merge with upstream master 2015-08-05 11:16:20 -07:00
Andrew Meadows
5be8583b7d Merge pull request #5494 from sethalves/gzip-json-entity-persist-files 
gzip json entity persist files
 2015-08-05 10:56:03 -07:00
Seth Alves
5369f4c5eb adjust comments 2015-08-04 08:25:33 -07:00
Seth Alves
adcd91e3ff Added an option to domain-server settings to persist entities as gzipped json. With this setting enabled, persist files take much less space on disk than with the other two options. 2015-08-04 07:23:24 -07:00
Andrew Meadows
0a5ada3c09 remove legacy shapes 2015-07-29 09:02:24 -07:00
Stephen Birarda
dce63c84a3 read and write uin8_t PacketType into SVO as int 2015-07-24 16:33:03 -07:00
Stephen Birarda
9e7fb9ae16 shuffle Packet headers, use static enum for PacketType 2015-07-23 13:56:47 -07:00
Atlante45
d1c66751c4 emove unused method 2015-07-16 16:08:58 -07:00
Stephen Birarda
60ae02e4e9 some formatting changes in entities 2015-07-16 12:38:39 -07:00
Atlante45
c80df94b06 Update includes for moved files 2015-07-13 15:28:55 -07:00
Atlante45
d4e01742e5 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-08 18:40:18 -07:00
Atlante45
e2718d5c94 Merge branch 'protocol' of https://github.com/birarda/hifi into protocol 2015-07-08 18:26:36 -07:00
Stephen Birarda
ecb6309932 fix HEADER_LENGTH in Octree 2015-07-08 15:02:57 -07:00
Stephen Birarda
74940a2132 replace lingering PacketTypes in old format 2015-07-08 10:18:13 -07:00
ZappoMan
29a7584ee6 remove dead code 2015-07-03 11:29:59 -07:00
Stephen Birarda
0d64e82fe2 replace PacketType declarations with PacketType::Value 2015-07-02 16:38:52 -07:00
Seth Alves
a96520ca74 set up EntityItemPropertiesFromScript to either ignore or honor read-only properties 2015-05-29 13:43:18 -07:00
Seth Alves
f75b599288 don't save default values in json file 2015-04-30 11:28:27 -07:00
ZappoMan
1ef58139a4 fix bug in parsing root element data 2015-04-27 15:07:32 -07:00
David Rowe
76d6c6cac5 Delete char* items properly 2015-04-08 20:03:42 -07:00
Seth Alves
91861e9e5a split out octree logging 2015-04-06 17:04:49 -07:00
ZappoMan
84940d8e43 fix SVO import 2015-04-02 14:13:19 -07:00
Seth Alves
5bc2d88ea6 diff minimization 2015-03-16 12:11:41 -07:00
Seth Alves
1e50d94384 don't put arbitrarily large array on stack 2015-03-16 11:59:30 -07:00
Seth Alves
9e6c289ab8 move filename utils into shared library 2015-03-12 10:23:57 -07:00
Seth Alves
3bc85c2531 instead of a json checkbox, a dropdown to chose the file type 2015-03-12 09:34:01 -07:00
Seth Alves
ac882f86e2 backup code is now aware of possible file extension differences 2015-03-12 09:13:53 -07:00
Seth Alves
2a06816f71 added persist-as-json checkbox to domain settings. File extension of persist file is automatically adjusted when entity server saves. When loading, if both a json and svo file exist, the newer one is used. This is regardless of the persistAsJson setting 2015-03-11 23:09:15 -07:00
Seth Alves
48244840d5 merge from upstream 2015-03-10 15:43:40 -07:00
ZappoMan
b9671f3f9b CR feedback 2015-03-10 15:27:44 -07:00
ZappoMan
5facb39aa7 support for import entities from network URL 2015-03-10 12:21:37 -07:00
ZappoMan
c8298ca617 migrate SVO reading to use QDataStream in step toward reading from HTTP url 2015-03-10 10:49:53 -07:00
Seth Alves
afd2c87dfe Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json 2015-03-10 10:12:43 -07:00
Seth Alves
2076de9153 started on reading entities from json file 2015-03-10 10:12:29 -07:00
Andrew Meadows
373be95297 entity cubes are in meters 2015-03-06 15:32:03 -08:00
Andrew Meadows
d7d25a6509 Octree::findCapsulePenetration() uses meters 2015-03-04 16:16:49 -08:00