Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 13:11:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
26506 commits 75 branches 59 tags 1.2 GiB
Commit graph

9528 commits

Author SHA1 Message Date
ZappoMan
adcb62eb18 more hacking and cleanup 2015-06-02 21:03:34 -07:00
Seth Alves
a31a5a1554 main actions interface is in EntityItem. changes in actions are queued up and applied before simulation step 2015-06-02 19:40:20 -07:00
Sam Gateau
8bf08b34d7 Trying to get Ubuntu to build... again 2015-06-02 19:37:54 -07:00
Sam Gateau
eea7ddf491 Trying to get Ubuntu to build 2015-06-02 19:27:32 -07:00
Sam Gateau
640071dd35 Avoiding any setVIewTransform in payloadREnder and introducing monitoring values 2015-06-02 18:23:53 -07:00
Andrew Meadows
acb3163f43 add comments for future work 2015-06-02 17:20:41 -07:00
ZappoMan
4ce27f1483 first cut at rendering avatars as individual model items 2015-06-02 16:54:47 -07:00
Seth Alves
f84e970c48 Merge branch 'master' of github.com:highfidelity/hifi into actions 2015-06-02 16:28:07 -07:00
Seth Alves
d6549948d0 first pass at entity interface to actions 2015-06-02 16:06:27 -07:00
Sam Gateau
903837ab4f exposing some controls on the engine to js for debugging 2015-06-02 15:57:37 -07:00
Andrew Meadows
0e2028b820 merge 
Conflicts:
	libraries/entities/src/EntityItem.cpp
 2015-06-02 15:08:36 -07:00
Sam Gateau
3c7eb4de6d merging with upstream 2015-06-02 14:48:53 -07:00
Andrew Meadows
9e0c2a3c6c fix crash in ~OffscreenGlCanvas on linux shutdown 2015-06-02 14:36:34 -07:00
Andrew Meadows
2702e07863 Merge pull request #5015 from sethalves/polyvox 
PolyVox improvements -- depends on #5008
 2015-06-02 14:34:49 -07:00
Sam Gateau
453fa87654 making sure the proj and view matrix are correctly assigned 2015-06-02 14:31:40 -07:00
Brad Hefta-Gaub
2a8e758559 Merge pull request #5010 from ericrius1/lineEntity 
Modified the line entity to take two new properties: lineWidth and linePoints
 2015-06-02 14:25:44 -07:00
Eric Levin
7527efc2d6 removed unsuded variable 2015-06-02 13:58:09 -07:00
Eric Levin
a98baef736 another code cleanup 2015-06-02 13:56:18 -07:00
Seth Alves
100248c4e8 beginnings of ObjectAction class 2015-06-02 13:19:07 -07:00
Seth Alves
b24cd82b80 beginnings of ObjectAction class 2015-06-02 13:18:49 -07:00
Seth Alves
981ac2ce7d quiet-compiler -- remove unused prototype for cleanupMenuItems 2015-06-02 13:17:15 -07:00
Eric Levin
55ffb7f1c0 code style changes 2015-06-02 12:51:45 -07:00
Brad Hefta-Gaub
507158e510 Merge pull request #5021 from Atlante45/lod 
Team Teaching - LOD shouldRender in render engine
 2015-06-02 12:21:25 -07:00
Sam Gateau
901717fb2c trying to fix the issues of model disappearing 2015-06-02 11:52:22 -07:00
ZappoMan
5459b8402c Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-02 11:25:23 -07:00
Sam Gateau
ef2d8a0dbe tuesday morning rendering poor performances networking issue 2015-06-02 10:58:56 -07:00
Atlante45
d431a1b522 Remove comment 2015-06-02 19:28:05 +02:00
Atlante45
6d234a20ad Hack for unknown pipelines 2015-06-02 19:07:57 +02:00
Seth Alves
11eb073bcf fix comment 2015-06-02 10:04:39 -07:00
Seth Alves
d201f7791e oops 2015-06-02 10:01:43 -07:00
Seth Alves
20d3814c1b code review 2015-06-02 10:00:07 -07:00
Eric Levin
e7c5a24e3d fixed packet number increment logic 2015-06-02 09:38:45 -07:00
Atlante45
ad3cea9907 Disable entity debub 2015-06-02 18:23:37 +02:00
Howard Stearns
0837c016c5 Update constant to use AudioConstants.h 2015-06-02 09:18:45 -07:00
Atlante45
9d4ded1fb3 Add shouldRender functor to render args 2015-06-02 16:09:05 +02:00
Howard Stearns
622a1e3068 Pitch-shift collision sounds, and make entities-renderer depend on soxr. 2015-06-01 21:19:42 -07:00
Sam Gateau
cd7914ad9d Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk 2015-06-01 17:31:39 -07:00
Sam Gateau
bd7c22e715 Trying to transfer the rnedering from displaySide to RenderDeferredTask 2015-06-01 17:31:00 -07:00
ZappoMan
037246ee3c implement meta item for model entities 2015-06-01 15:58:43 -07:00
Eric Levin
f51ad6b8da merged master 2015-06-01 15:39:05 -07:00
Eric Levin
785144404c changed entity packet type version number 2015-06-01 15:37:29 -07:00
Eric Levin
83bf4241e4 resolved merge conflicts... but now lines not flying across clients 2015-06-01 15:16:08 -07:00
Andrew Meadows
cc9ae81c75 group Entity property settings together 2015-06-01 14:47:14 -07:00
ZappoMan
d4af454834 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-01 14:42:35 -07:00
Seth Alves
ea3f002a65 ifdef out debug pritns 2015-06-01 14:38:07 -07:00
Stephen Birarda
12bcbbf338 Merge pull request #5012 from ctrlaltdavid/20555 
DO NOT MERGE - QA for #20555 - Re-style QML Address Bar
 2015-06-01 17:08:00 -04:00
Andrew Meadows
fa491a5c4f fix theoretical crash bug in editEntity() 2015-06-01 13:59:56 -07:00
Seth Alves
d1bb6473d9 more work on edge handling and resizing 2015-06-01 13:57:28 -07:00
Sam Gateau
1b22f1f147 Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk 2015-06-01 13:56:13 -07:00
samcake
50f3d2d12b Merge pull request #5014 from ZappoMan/team-teaching-scene-api 
TEAM TEACHING - report correct part bounds
 2015-06-01 13:55:55 -07:00
ZappoMan
1e2d2a2a99 calculate the actual bounding box for the mesh parts 2015-06-01 13:31:42 -07:00
ZappoMan
750d9c0616 poor mans version of mesh part bounds 2015-06-01 12:53:09 -07:00
Sam Gateau
c8e30ef39e On to a full rendered pipeline 2015-06-01 12:35:54 -07:00
samcake
98c0cd7d23 Merge pull request #5009 from ZappoMan/team-teaching-scene-api 
TEAM TEACHING - hacking on rendering mesh parts
 2015-06-01 12:24:27 -07:00
Sam Gateau
4bcc71192d Merge branch 'team-teaching-scene-api' of https://github.com/ZappoMan/hifi into punk 2015-06-01 12:07:16 -07:00
Seth Alves
43a1519e29 better handling of changes to the size of voxel space. limit each dimension to 32 2015-06-01 12:01:45 -07:00
ZappoMan
ea31fdcc26 hacking on transparency 2015-06-01 11:53:40 -07:00
Eric Levin
5cce4edec8 fix merge conflicts attemp 1 2015-06-01 11:18:33 -07:00
ZappoMan
4b46fc3ad9 cleanup Model::renderPart() 2015-06-01 11:11:27 -07:00
Eric Levin
b6b5078048 removed unneeded append methods from OctreePacketData 2015-06-01 11:11:08 -07:00
Eric Levin
93c3f90c95 clened up read and write of qVec- no longer converting between qVector and qByteArray 2015-06-01 11:08:48 -07:00
Seth Alves
175926736d Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-06-01 09:59:01 -07:00
Eric Levin
7b08537574 code standards fixes 2015-06-01 09:51:24 -07:00
Eric Levin
8a191a661d adding flag for points changed 2015-06-01 09:35:32 -07:00
ZappoMan
1b8572640b more hacking sams tweaks 2015-06-01 09:07:32 -07:00
Andrew Meadows
2400f5c000 update ALL parameters of remote physics simulation 2015-06-01 09:02:59 -07:00
David Rowe
e41b4c1b7b Add new address bar dialog error message 
Implemented as a new simple InformationDialog so that can try it out
without reworking MessageDialog immediately for all QML UI.
 2015-06-01 09:01:11 -07:00
Seth Alves
d04b61d6a8 oops 2015-06-01 07:16:16 -07:00
Seth Alves
00af0a4376 trying to make thing behave when voxel-space is resized 2015-06-01 07:15:37 -07:00
Sam Gateau
c10384f91b Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk 2015-05-31 23:20:49 -07:00
Sam Gateau
83c4a52454 Cleaning for PR 2015-05-31 19:34:03 -07:00
Sam Gateau
33d397a440 A fist update solution for the item 2015-05-31 19:10:37 -07:00
Eric Levin
9ca5310c21 cleaned up another qDebugging line 2015-05-31 15:33:51 -07:00
Eric Levin
9641b11086 array of points takes absolute positions now, so script writer has an easier time 2015-05-31 14:59:09 -07:00
Eric Levin
115bf3dd25 cleaned up logging and testing code. 2015-05-31 14:52:44 -07:00
Eric Levin
27b59b5f72 fixed bug in qvec unpacking code 2015-05-31 14:46:20 -07:00
Eric Levin
5e22af8643 points and line width persistent accross clients 2015-05-31 14:21:28 -07:00
Sam Gateau
4c817547b7 Merging with Brad's branch and trying to get the rendering working 2015-05-31 14:02:20 -07:00
Seth Alves
cfeab893e7 fix voxelToLocalMatrix 2015-05-31 09:28:33 -07:00
Seth Alves
b9202ebfb6 added SURFACE_EDGED_CUBIC surface extractor which pads the outsides of the voxel-space with empty cells to change how the edges of the surface look 2015-05-31 09:14:59 -07:00
Seth Alves
a3589788df allow edit.js to change between cubic and marching-cubes surface extractor on polyvox entity-items. 2015-05-30 18:33:35 -07:00
Seth Alves
f955cb45b2 keep track of number of non-zero voxels, use this information when deciding on shape-type 2015-05-30 18:14:54 -07:00
Seth Alves
c5a0dd72ec keep track of number of non-zero voxels, use this information when deciding on shape-type 2015-05-30 18:13:57 -07:00
Seth Alves
fe59f8846f recompute polyvox mesh when setVoxelSurfaceStyle is called. remove left-over color stuff from polyvox. don't require that a polyvox be rendered before computing its physics shape 2015-05-30 16:43:11 -07:00
Sam Gateau
ddec8fd26f Trying to find a good solution for update message & data 2015-05-30 13:57:05 -07:00
ZappoMan
34fd1bd470 added debugging 2015-05-30 08:45:02 -07:00
ZappoMan
a0683b2847 Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api 2015-05-29 21:57:47 -07:00
ZappoMan
0124f98340 more hacking on rendering model parts 2015-05-29 21:56:24 -07:00
Eric Levin
cb72b620cf printing bytes out correctly 2015-05-29 19:42:07 -07:00
Seth Alves
96a40bd673 basic collisions with cubic polyvoxes 2015-05-29 18:50:26 -07:00
Eric Levin
7d5dd278a1 adding unpacking 2015-05-29 16:54:40 -07:00
Howard Stearns
9c56f6270e Remove debug print. 2015-05-29 16:21:57 -07:00
Howard Stearns
6e2378e676 Sound parameter tweaks. 2015-05-29 16:19:41 -07:00
Philip Rosedale
6b9f6ff7bb Merge pull request #4994 from AndrewMeadows/isentropic 
compute correct deltaTime for extrapolation of moving entity and other fixes
 2015-05-29 16:07:10 -07:00
Sam Gateau
7bde81e95f Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into daft 2015-05-29 15:50:31 -07:00
Sam Gateau
f04f3bda72 Introducing the RenderDeferredTask class which moves the current rendering pipeline into the render::ENgine scheme 2015-05-29 15:44:14 -07:00
samcake
f8a90684ce Merge pull request #5000 from huffman/scene-overlay 
Team Teaching - Move overlay rendering to Scene pipeline
 2015-05-29 15:31:46 -07:00
Sam Gateau
81396ae5aa TRying again a better compare function signature for ubunutu 2015-05-29 13:48:19 -07:00
Ryan Huffman
667dccbb87 Add Item::INVALID_ITEM_ID and use in overlays 2015-05-29 13:43:49 -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
6913c62b84 Merge branch 'master' of github.com:highfidelity/hifi into created-time-is-a-property 2015-05-29 13:42:25 -07:00
Sam Gateau
98160c8d60 Reorganize the sorting classes for maybe compiling on linux gcc 4.8 ? 2015-05-29 13:31:17 -07:00
Stephen Birarda
e7ce8706a3 Merge pull request #5004 from birarda/domain-dtls 
fix debug for failed ping to DS
 2015-05-29 16:21:41 -04:00
Stephen Birarda
33fde7c66d remove extra debug 2015-05-29 13:21:24 -07:00
Sam Gateau
eef8077417 Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk 2015-05-29 13:20:43 -07:00
Brad Hefta-Gaub
7d1cd70e89 Merge pull request #4969 from jherico/plugins_pt3 
Working towards display plugins
 2015-05-29 13:19:18 -07:00
Seth Alves
1a26421414 Merge branch 'master' of github.com:highfidelity/hifi into created-time-is-a-property 2015-05-29 13:04:45 -07:00
Brad Davis
77b45e2b4a Adding missing files 2015-05-29 12:59:55 -07:00
Brad Davis
f98305dd55 CR comments 2015-05-29 12:45:03 -07:00
Stephen Birarda
2207bfaf40 Merge branch 'master' of https://github.com/highfidelity/hifi into domain-dtls 2015-05-29 12:06:12 -07:00
Stephen Birarda
e253687dcd fix fail case for DS pings 2015-05-29 12:06:07 -07:00
Andrew Meadows
8177512432 send all TerseUpdate properties when one changes 2015-05-29 11:35:50 -07:00
ZappoMan
7ec44dfc88 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching-scene-api 2015-05-29 11:23:31 -07:00
ZappoMan
94f6e8cebd Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api 2015-05-29 11:23:22 -07:00
ZappoMan
dc62052a3c more hacking on models 2015-05-29 11:07:25 -07:00
Atlante45
e9edc3e789 PolyVox entities use simple program 2015-05-29 20:05:38 +02:00
Atlante45
f70fb0801b Merge branch 'team-teaching' into entities 2015-05-29 19:58:59 +02:00
Atlante45
d8168811b3 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-05-29 19:58:22 +02:00
Seth Alves
b0f6826d17 Merge pull request #4995 from birarda/domain-dtls 
speed up initial connection to domains
 2015-05-29 10:50:01 -07:00
Andrew Meadows
f049dc37fc Merge pull request #4992 from howard-stearns/preload-collision-sounds 
Preload collision sounds
 2015-05-29 09:51:41 -07:00
Stephen Birarda
e91ee7e7e3 only send add packet for nodes in interest set 2015-05-29 09:49:54 -07:00
Ryan Huffman
b4db787837 Merge branch 'team-teaching' of github.com:highfidelity/hifi into scene-overlay 2015-05-29 09:42:46 -07:00
Seth Alves
9f4fff3588 don't need convertScriptValue(QScriptEngine* e, QDateTime v) 2015-05-29 09:33:29 -07:00
Eric Levin
f573645291 line entity width translating 2015-05-29 09:24:00 -07:00
Atlante45
27d932bed4 Merge branch 'team-teaching' into entities 2015-05-29 18:07:43 +02:00
Brad Davis
8bad80324f Merge branch 'master' into plugins_pt3 2015-05-29 09:05:01 -07:00
Atlante45
ab13bc41a4 Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching 2015-05-29 17:53:17 +02:00
Ryan Huffman
b2c503af0e Add NO_DEPTH_SORT ItemKey flag 2015-05-29 08:52:37 -07:00
Atlante45
ad2d4d5e85 PolyVox entities render in Batch 2015-05-29 17:44:41 +02:00
ZappoMan
78c701a89d Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api 2015-05-29 08:40:46 -07:00
Brad Hefta-Gaub
0380be7550 Merge pull request #4997 from Atlante45/text-renderer 
TEAM TEACHING - Web entities render in batch
 2015-05-29 08:38:02 -07:00
Atlante45
0384b74479 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-05-29 17:37:53 +02:00
Atlante45
75788a3c51 Reactivate Transform asserts 2015-05-29 17:05:56 +02:00
Atlante45
f07f9ac0c5 Expand setDimensions check to negative values 2015-05-29 17:04:39 +02:00
Atlante45
212007aa6f Cleanup simple fragmen shaders 2015-05-29 16:53:53 +02:00
Atlante45
1d336b76de Web entities render in Batch 2015-05-29 16:51:48 +02:00
Atlante45
0770f88606 Add glTexParamteri to GLBackend/Batch 2015-05-29 16:50:11 +02:00
Atlante45
51570aac68 Add simple textured pipeline 2015-05-29 16:49:31 +02:00
Seth Alves
0cf9afd8ec attempt to save _created as an iso date in utc 2015-05-28 21:21:57 -07:00
Sam Gateau
dd9cafcd09 Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk 2015-05-28 18:14:41 -07:00
Sam Gateau
3f8bdc14c4 reinserting culling, lod and depth sort to the rendering 2015-05-28 18:01:31 -07:00
ZappoMan
eb19b93433 render models in scene checkpoint 2015-05-28 17:19:30 -07:00
Stephen Birarda
046828ee5d make the LNL the parent of any Nodes it adds 2015-05-28 16:58:58 -07:00
Stephen Birarda
29d3ca85d9 cleanup debug logs for DS/node ping punch 2015-05-28 16:53:13 -07:00
Stephen Birarda
265e0f3da6 remove NetworkPeer dtor debug, fix ICE socket 2015-05-28 16:44:34 -07:00
Andrew Meadows
ac0609ea92 also render bbox when debugging simulator owner 2015-05-28 16:29:43 -07:00
Stephen Birarda
493a9da43e make sure DS log handler is cleaned up 2015-05-28 16:23:14 -07:00
Seth Alves
6b8b930839 Merge branch 'master' of github.com:highfidelity/hifi into created-time-is-a-property 2015-05-28 16:16:13 -07:00
Eric Levin
3627f03c0d drawing lines relative to position 2015-05-28 16:00:24 -07:00
Eric Levin
533148f26d line being sent as array 2015-05-28 15:48:31 -07:00
Stephen Birarda
9d2e1773a0 fix memory issues for immediate ice pings 2015-05-28 15:31:21 -07:00
Stephen Birarda
da0c9fbc31 fix send of existing peer to querier 2015-05-28 14:37:16 -07:00
Eric Levin
4d4a90e9ce removed render debugging 2015-05-28 14:30:34 -07:00
Seth Alves
94edb72b47 oops 2015-05-28 14:30:06 -07:00
Seth Alves
131827a82b libraries/entities doesn't need polyvox, only libraries/entities-renderer 2015-05-28 14:27:49 -07:00
Stephen Birarda
e096cbe040 have ice-server immediately send peer to DS 2015-05-28 14:25:18 -07:00
Andrew Meadows
7be16da1a8 compute correct time-of-flight for extrapolation 2015-05-28 14:24:39 -07:00
Eric Levin
2d66696675 line working from array of points 2015-05-28 14:18:57 -07:00
Howard Stearns
e7a48af56d Merge branch 'master' of https://github.com/highfidelity/hifi into preload-collision-sounds 2015-05-28 14:15:51 -07:00
Stephen Birarda
531ef1fa1c change ice-server heartbeat behaviour 2015-05-28 14:05:43 -07:00
Brad Hefta-Gaub
1c3398f27e Merge pull request #4991 from ZappoMan/team-teaching 
TEAM TEACHING - merge from master
 2015-05-28 13:52:18 -07:00
Howard Stearns
0f30ec2ccc Undo the merge with the broken master checking. What could go wrong? 2015-05-28 13:48:27 -07:00
ZappoMan
f736ce714f fix build buster 2015-05-28 13:33:57 -07:00
Stephen Birarda
eb6b80133b immediately ping the ICE DS every 25ms 2015-05-28 13:17:48 -07:00
Howard Stearns
810c766f77 When an entity is added or changed with a collisionSoundURL, cache it so that it is ready to play on the first hit. 2015-05-28 12:50:02 -07:00
ZappoMan
1029a8af7c Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api 2015-05-28 12:38:16 -07:00
ZappoMan
a0e51469d3 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-05-28 12:36:34 -07:00
Andrew Meadows
b90d35c0c0 restore code to fix box entites not rendering 
boxes wouldn't render when in an otherwise empty domain
 2015-05-28 12:22:17 -07:00
Andrew Meadows
b7e3461e1a restore _created magic 2015-05-28 12:21:38 -07:00
ZappoMan
2fba5a0928 more work on simple renderable 2015-05-28 12:19:43 -07:00
Sam Gateau
2cbd049e4e adding the concept of job 2015-05-28 12:02:57 -07:00
Eric Levin
8886e93d5f changed qVector to qVectorVec3 2015-05-28 11:26:41 -07:00
Stephen Birarda
81c23e9ca0 output if pinged node cannot be reached 2015-05-28 11:22:27 -07:00
Stephen Birarda
cee058c4ce handle immediate add packets in NodeList 2015-05-28 11:02:45 -07:00
Seth Alves
92817d9302 created-time is a property so it can be persisted to and retrieved from json saves 2015-05-28 10:59:27 -07:00
Stephen Birarda
5c75863af4 immediately send add packet from DS for new node 2015-05-28 10:45:03 -07:00
Eric Levin
72af4e4e67 latest pointer 2015-05-28 10:44:44 -07:00
Seth Alves
ab86b1d90a code review 2015-05-28 10:29:23 -07:00
Seth Alves
7547ef6ea4 code review 2015-05-28 10:29:07 -07:00
Seth Alves
e46c24ea58 code review 2015-05-28 10:27:59 -07:00
ZappoMan
806ee88f1f place burden of adding/removing to/from scene on entity 2015-05-28 09:43:36 -07:00
Atlante45
bca80addef Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into text-renderer 2015-05-28 16:13:24 +02:00
Atlante45
b0cbf5c51a Adjust wraping with offset 2015-05-28 16:06:18 +02:00
Seth Alves
a91a7942a4 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-28 06:59:39 -07:00
Atlante45
ca529e4bb8 Remove debug/tweak sampler 2015-05-28 15:58:40 +02:00
Atlante45
12d75481e5 Introducing TextRenderer3D 2015-05-28 15:43:16 +02:00
Atlante45
c4ab18736d Restore TextRenderer and sdf_text 2015-05-28 15:20:40 +02:00
Atlante45
10c2f3f561 More TextRenderer work 2015-05-28 14:51:57 +02:00
Brad Davis
e5bc0fad1e Merge branch 'master' into plugins_pt3 2015-05-27 23:45:31 -07:00
Andrew Meadows
4e073c77b3 Merge pull request #4978 from sethalves/fix-4973 
recreate PR #4973 with some additional changes -- removed const keywo…
 2015-05-27 21:11:28 -07:00
Andrew Meadows
c32ff497e8 Merge pull request #4982 from howard-stearns/unowned-object-sounds 
Unowned object sounds
 2015-05-27 21:07:49 -07:00
ZappoMan
3f14a7a262 allow entities to have multiple items 2015-05-27 21:00:20 -07:00
ZappoMan
5ad9efbee4 allow entities to tell us if they support proper scene rendering 2015-05-27 20:42:53 -07:00
ZappoMan
63c19f7c11 fix build buster from bad merge 2015-05-27 20:19:59 -07:00
ZappoMan
763e6dd97b Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-05-27 19:58:11 -07:00
Seth Alves
4961c10e17 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-27 19:05:01 -07:00
Stephen Birarda
667df66963 add packet type for DS node add 2015-05-27 18:25:38 -07:00
Stephen Birarda
0cb67cce2c add ping timer tied to NetworkPeer 2015-05-27 18:22:23 -07:00
Seth Alves
4fa6f388b9 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-27 18:20:59 -07:00
Howard Stearns
bbc04f3b03 Merge branch 'master' of https://github.com/highfidelity/hifi into unowned-object-sounds 2015-05-27 18:08:37 -07:00