Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 05:43:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
26245 commits 76 branches 59 tags 1.2 GiB
Commit graph

9373 commits

Author SHA1 Message Date
ZappoMan
37a291275d more work on rendering in engine 2015-05-27 16:46:44 -07:00
Howard Stearns
4fffe05b63 Play still sound for still objects and those just created in a script. 2015-05-27 16:25:11 -07:00
Stephen Birarda
757d02a600 fix reset on address lookup 2015-05-27 16:00:56 -07:00
Stephen Birarda
e6e2c4b95d look for connection steps in LimitedNodeList 2015-05-27 15:54:39 -07:00
Stephen Birarda
734798a365 fix move of connection steps to LNL 2015-05-27 15:50:31 -07:00
Eric Levin
385c9be75f using vec of points 2015-05-27 15:35:06 -07:00
ZappoMan
a56e0d80b6 more work on renderable entities 2015-05-27 15:30:55 -07:00
ZappoMan
61712a6ac3 add some debugging streamers for some scene classes 2015-05-27 15:29:35 -07:00
Seth Alves
c3c701f807 polyvox no longer has a color 2015-05-27 15:23:01 -07:00
Seth Alves
8cb5717b86 formatting, cleanups 2015-05-27 15:16:15 -07:00
Ryan Huffman
8002014dcd Add <memory> to AvatarData for _ptr 2015-05-27 15:13:25 -07:00
Seth Alves
5cc038e1c6 polyvox no longer has a color 2015-05-27 15:12:26 -07:00
Seth Alves
ded79609de back out unrelated change 2015-05-27 15:10:27 -07:00
Seth Alves
1109444c3d attempt to make sure the ray that picks against polyvox entities is long enough 2015-05-27 14:57:12 -07:00
Ryan Huffman
21b5e26dc9 Move AvatarData typedefs to AvatarData.h 2015-05-27 14:52:48 -07:00
Seth Alves
386b3301f4 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-27 14:46:37 -07:00
Seth Alves
bfa0e9c234 recreate PR #4973 with some additional changes -- removed const keyword from qinvokables for avatar getter methods such as getVelocity 2015-05-27 14:44:23 -07:00
Stephen Birarda
c7c542ef4c decouple STUN from DS check in 2015-05-27 14:24:15 -07:00
Seth Alves
ba0467aafe Revert "removed const keyword from Q_INVOKABLE for avatar getter methods such…" 2015-05-27 14:10:45 -07:00
Seth Alves
7f99f261c2 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-27 13:59:13 -07:00
Eric Levin
8edc883e4d adding serialization for Qvector 2015-05-27 13:47:47 -07:00
Eric Levin
62539719df line width added as property to line entities 2015-05-27 13:31:47 -07:00
ZappoMan
8c9cf480f3 more hacking 2015-05-27 13:23:59 -07:00
Ryan Huffman
c13254a9c4 Merge branch 'team-teaching' of github.com:highfidelity/hifi into scene-avatar 
Conflicts:
	interface/src/Application.cpp
 2015-05-27 12:44:52 -07:00
Ryan Huffman
389d5556f5 Update Avatar*Pointers to use std::*_ptr instead of Q*Pointer 2015-05-27 12:36:55 -07:00
David Rowe
a2272d3f42 Fix Windows C4351 build warning 
VS2013 warns about default initialization of arrays because it behaved
differently in previous versions. Default initialization is what we expect
now that we're using VS2013 so we can disable this warning globally.
 2015-05-27 11:49:00 -07:00
Eric Levin
eb0f35e041 removed const keyword from qinvokables for avatar getter methods such as getVelocity 2015-05-27 11:44:37 -07:00
ZappoMan
007aed7a0a Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api 2015-05-27 10:51:50 -07:00
Howard Stearns
380723d1c5 Merge pull request #4970 from AndrewMeadows/thermonuclear 
rewritten MassProperties with complete unit tests
 2015-05-27 10:42:17 -07:00
ZappoMan
1a7c6eb316 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-05-27 10:41:01 -07:00
ZappoMan
4654ed95ac Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api 2015-05-27 10:40:24 -07:00
ZappoMan
2516066e1d some hacking 2015-05-27 10:40:07 -07:00
Seth Alves
5e66a079c4 make this build on older gcc 2015-05-27 10:38:15 -07:00
Stephen Birarda
4b6b34836d repair anomalies in timing table 2015-05-27 10:30:45 -07:00
Seth Alves
6fd38fabe4 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-27 10:06:53 -07:00
Seth Alves
14c68519f3 limit size of polyvox data property to below MTU 2015-05-27 09:59:18 -07:00
Seth Alves
429cc631f3 limit size of polyvox data property to below MTU 2015-05-27 09:48:32 -07:00
Seth Alves
3af916e27e use enum for polyvox surface style 2015-05-27 09:32:10 -07:00
Brad Hefta-Gaub
afb09e81a6 Merge pull request #4962 from howard-stearns/entity-events-in-normal-scripts 
Entity events in normal scripts
 2015-05-27 09:24:50 -07:00
andrew
2a6955ce12 fix windows build 2015-05-27 09:14:11 -07:00
Seth Alves
1749ec83db adapting to entitypointer merge 2015-05-27 09:00:59 -07:00
Seth Alves
f310da9cd3 adapting to entitypointer merge 2015-05-27 08:59:44 -07:00
Seth Alves
b02e452b19 adapting to entitypointer merge 2015-05-27 08:58:03 -07:00
Seth Alves
c1f75506ae adapting to entitypointer merge 2015-05-27 08:57:22 -07:00
Seth Alves
df795cf296 adapting to entitypointer merge 2015-05-27 08:54:15 -07:00
Seth Alves
c80f2970fd Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-27 07:37:51 -07:00
Seth Alves
0f81445cee flag for polyvox to select minecraft vs walking-cubes. uppack to unpack 2015-05-27 07:04:44 -07:00
Sam Gateau
a5c5cc9b70 First Item really rendering , for the WorldBox, desigining more of the RenderContext and task interface 2015-05-27 01:15:14 -07:00
Andrew Meadows
39d8244255 use highfideltiy style for class data member names 2015-05-26 22:59:29 -07:00
Andrew Meadows
708203089c replace tabs with spaces 2015-05-26 22:53:57 -07:00
Andrew Meadows
efbb9b0238 rewritten MassProperties with complete unit tests 2015-05-26 22:48:45 -07:00
Seth Alves
6930008f74 remove debugging spew 2015-05-26 21:40:50 -07:00
Seth Alves
6b5020285b set last-edited in properties when changing voxel data 2015-05-26 21:32:33 -07:00
Seth Alves
5acc018bda debugging 2015-05-26 20:58:23 -07:00
Seth Alves
ebae87136f debugging 2015-05-26 20:57:58 -07:00
Brad Davis
09085f1cd9 Working towards display plugins 2015-05-26 18:42:38 -07:00
Eric Levin
4fb5f0796c added props for encoding and decoding 2015-05-26 18:40:15 -07:00
Eric Levin
811f5db419 fixed linker error in lineentityitem.cpp 2015-05-26 18:36:24 -07:00
Eric Levin
dc4196df30 line entities 2015-05-26 18:26:25 -07:00
Seth Alves
cd2b6473ba debugging 2015-05-26 18:21:45 -07:00
Seth Alves
517d4372fa debugging 2015-05-26 16:53:11 -07:00
Stephen Birarda
9cb6ccaa46 thread safe timing of domain connection 2015-05-26 16:49:18 -07:00
Seth Alves
0ecd60a489 update voxel mesh when new data arrives from the wire 2015-05-26 16:45:29 -07:00
Seth Alves
55028f6cb0 voxel data sent over wire and saved to json 2015-05-26 16:34:35 -07:00
ZappoMan
2f6a3a61d7 reorder headers to match coding standard 2015-05-26 16:31:15 -07:00
ZappoMan
0799670215 simple entity payload 2015-05-26 16:27:00 -07:00
Eric Levin
1f312b4e02 successfully using geometry cache! 2015-05-26 16:17:31 -07:00
ZappoMan
25823bedd1 Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api 2015-05-26 15:51:46 -07:00
Eric Levin
f1fc7a2a09 switching over to geometry cache method for rendering lines 2015-05-26 15:46:25 -07:00
ZappoMan
20ceb72d92 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-05-26 15:01:26 -07:00
Seth Alves
66760afadb quiet compiler 2015-05-26 14:27:22 -07:00
Seth Alves
22cc298861 Merge branch 'polyvox' of github.com:sethalves/hifi into polyvox 2015-05-26 14:26:11 -07:00
Seth Alves
cdef502e2e expose setVoxelSphere to js 2015-05-26 14:26:05 -07:00
Stephen Birarda
d1489c50fe add connection times getter to NodeList 2015-05-26 14:18:58 -07:00
Stephen Birarda
626f22191c add a QAbstractTableModel for domain connection steps 2015-05-26 14:17:02 -07:00
Seth Alves
28e052ffdb Merge branch 'polyvox' of github.com:sethalves/hifi into polyvox 2015-05-26 14:12:11 -07:00
Seth Alves
728e6d121b changes sam made to get normals to work on a mesh 2015-05-26 14:12:01 -07:00
Andrew Meadows
16e5710325 Merge pull request #4954 from ZappoMan/entitysmartpointers 
EnitityItem smart pointers
 2015-05-26 14:05:03 -07:00
Sam Gateau
e5755f52e5 Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into daft 2015-05-26 13:57:10 -07:00
samcake
84525aabec Merge pull request #4959 from ZappoMan/team-teaching-entitysmartpointer 
TEAM TEACHING BRANCH - Entity Smart Pointers
 2015-05-26 13:56:47 -07:00
Seth Alves
1ec384ab4d allow QByteArray data to be sent with a length. Use appendRawData in places that used to append raw byte-arrays 2015-05-26 13:43:22 -07:00
Seth Alves
988ecf9d55 send PolyVox voxel dimensions and compressed data over the wire 2015-05-26 13:18:52 -07:00
Seth Alves
ed6fdcfb31 add QByteArray data uppacking 2015-05-26 13:18:25 -07:00
Howard Stearns
3a7a290094 Uglify conditional returns. :-) 2015-05-26 11:38:36 -07:00
Atlante45
c9022212e8 More work on the text renderer 2015-05-26 20:34:23 +02:00
Atlante45
5d19431d26 Copy/paste error with useClientState 2015-05-26 20:20:39 +02:00
Howard Stearns
5608892a15 Remove obsolete comment. 2015-05-26 11:16:11 -07:00
Howard Stearns
bbdf9f1d9f Remove changingEntityID. 2015-05-26 11:14:23 -07:00
Atlante45
76fc59675b Merge branch 'team-teaching' into text-renderer 2015-05-26 20:01:26 +02:00
Atlante45
46c86f7c10 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-05-26 20:01:00 +02:00
Atlante45
22a3822159 Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching 2015-05-26 20:00:50 +02:00
samcake
dd9d758da1 Fixing the compilation issue for real 2015-05-26 10:53:23 -07:00
Seth Alves
d71921fd03 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-26 10:46:02 -07:00
Stephen Birarda
f9251471da add audio connection to final part of connection steps 2015-05-26 10:44:45 -07:00
Stephen Birarda
f28ade1075 log connection times for eventual stats display 2015-05-26 10:37:44 -07:00
Seth Alves
92c55d69ba Merge pull request #4944 from AndrewMeadows/bispinor 
avatar-avatar collisions work again
 2015-05-26 10:36:54 -07:00
Stephen Birarda
eda57ff5ef Merge branch 'master' of https://github.com/highfidelity/hifi into domain-dtls 2015-05-26 10:35:25 -07:00
ZappoMan
c4f96b09a2 sam's feedback on shared pointers in master 2015-05-26 09:55:28 -07:00
Seth Alves
59f68f5625 added voxel-data compression code to see what the sizes are like 2015-05-26 09:52:18 -07:00
ZappoMan
c92e7bed87 andrews CR feedback 2015-05-26 09:44:02 -07:00
ZappoMan
5f6978a517 sam's CR feedback, more use of share_ptr<> 2015-05-26 09:41:51 -07:00
ZappoMan
d1520c5502 andrews CR feedback 2015-05-26 09:23:27 -07:00
Atlante45
62bb1a49e4 Fix inverted glyphs load check 2015-05-26 18:18:50 +02:00
Atlante45
490053edea Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-05-26 18:15:50 +02:00
Atlante45
bcee01b3a3 First pass at moving TextureRender to use a batch 2015-05-26 18:13:23 +02:00
Atlante45
88d42f931e Remove unused Headers 2015-05-26 18:12:20 +02:00
Seth Alves
a251ae7f50 far is a reserved word 2015-05-26 09:06:51 -07:00
Seth Alves
727f457f91 hook up RenderablePolyVoxEntityItem::findDetailedRayIntersection to polyvox library's version 2015-05-25 21:01:20 -07:00
Howard Stearns
069e6237cc Noop change with more declarations, in hopes of convincing MSVS how lambdas work. 
(Hey, it's worth a try...)
 2015-05-25 16:52:14 -07:00
samcake
ffca6a6502 Merge pull request #4935 from sethalves/sam-model-fixes 
fixes Sam made in my branch while trying to get a mesh to render
 2015-05-25 16:39:25 -07:00
Howard Stearns
1b134d60d5 Fix typo that messed up the otherEntity for collisions. 2015-05-25 15:46:55 -07:00
Seth Alves
9735174036 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-25 15:37:23 -07:00
Anthony Thibault
18d683bced Particle entities should avoid resetting simulation when setMaxParticles is called. 
This caused all particles to disappear when a network packet was received.
 2015-05-25 12:22:38 -07:00
Howard Stearns
599886079d Restore blank line for minimum diff. 2015-05-25 11:33:12 -07:00
Howard Stearns
4266a99d78 Put the javascript methods on Script, not Entities, and other minimum-diff cleanup. 2015-05-25 11:28:33 -07:00
Atlante45
c0725813b6 typo 2015-05-25 12:11:24 +02:00
Atlante45
526ec3d489 Move #if #else #endif for convenience 
This is a convenience change. The double '{' created by the #else messes
up Xcode autoindentation.
It won't that way and the fact that useClientState is a const set to
false when SUPPORT_LEGACY_OPENGL, the code inside the if should still
get optimised out by the compiler.
 2015-05-25 11:45:16 +02:00
Sam Gateau
f0ab6d96f5 merge with upstream team-teaching 2015-05-24 19:45:37 -07:00
Sam Gateau
35b8d45bee Insert a first scene and the engine in the Application and render a first Item 2015-05-24 17:03:43 -07:00
Howard Stearns
a0d09c0a6d Mulitple independent handlers for same entity/event. 2015-05-24 11:48:11 -07:00
Atlante45
3d7a834356 Ignore new entity dimensions if one of them is 0 2015-05-24 20:20:20 +02:00
Howard Stearns
b884d3cf90 Handle all the signals. 2015-05-24 09:57:12 -07:00
Atlante45
20cb2464d1 Merge branch 'master' of https://github.com/highfidelity/hifi into text-renderer 2015-05-24 17:42:51 +02:00
Howard Stearns
1dd2b7275e Simpler and more uniform version that handles all the standard entity-script events. 2015-05-23 18:11:05 -07:00
Howard Stearns
277f5ef3a4 Working experimental first version. 2015-05-23 13:35:35 -07:00
Atlante45
9e121aa387 Fix incorrect scale constants 2015-05-23 20:13:14 +02:00
ZappoMan
bcac50b362 verify that entityitem cleanup is happening correctly 2015-05-22 22:39:41 -07:00
ZappoMan
72ffd01920 more work on smart pointers 2015-05-22 22:39:37 -07:00
ZappoMan
9988f2d1cd EnitityItem smart pointers 2015-05-22 22:38:02 -07:00
Brad Hefta-Gaub
910c8549fc Merge pull request #4951 from huffman/ctx 
Team Teaching - Add gpu::context to RenderArgs and use RenderArgs in more render() methods
 2015-05-22 22:20:45 -07:00
ZappoMan
76c5bd1ab7 verify that entityitem cleanup is happening correctly 2015-05-22 22:01:25 -07:00
ZappoMan
9fa9942861 more work on smart pointers 2015-05-22 21:45:57 -07:00
Atlante45
a52c79c378 typo 2015-05-23 03:25:57 +02:00
Atlante45
a44054f9db Make TextureCache::getImageTexture static 2015-05-23 03:24:26 +02:00
ZappoMan
8b78fc4190 EnitityItem smart pointers 2015-05-22 17:57:50 -07:00
Ryan Huffman
43317bc829 Temporarily remove isValidScale assert 2015-05-22 17:00:39 -07:00
Stephen Birarda
27717db9d1 fire off DS check immediately once DS info is known 2015-05-22 16:38:26 -07:00
Stephen Birarda
69f1cd80e6 immediately send ICE heartbeat once data present 2015-05-22 16:29:01 -07:00
Seth Alves
6c67d14fbc experimenting with physics 2015-05-22 16:21:09 -07:00
Ryan Huffman
822ae800c5 Update Model::endScene to require RenderArgs 2015-05-22 16:17:01 -07:00
Seth Alves
e702518041 adjust logic around timestamps used by entity-server to know if something was sent. adjust which physics variables are adjusted by a non-sim-owner packet 2015-05-22 16:11:29 -07:00
Ryan Huffman
8380eec03b Update Model::renderCore to use RenderArgs 2015-05-22 16:10:43 -07:00
Ryan Huffman
7be646d62e Make gpu::context the first RenderArgs ctor parameter 2015-05-22 16:02:10 -07:00
Ryan Huffman
bffcfa2ab8 Add cache sync flag in Context::enqueueBatch 2015-05-22 15:34:05 -07:00
Ryan Huffman
d1a5662ca7 Merge branch 'team-teaching' of github.com:highfidelity/hifi into ctx 
Conflicts:
	libraries/entities-renderer/src/EntityTreeRenderer.cpp
 2015-05-22 15:33:40 -07:00
Ryan Huffman
3f22b5f8b3 Add RenderArgs to more render methods 2015-05-22 15:25:53 -07:00
Brad Hefta-Gaub
ce613d4960 Merge pull request #4947 from samcake/punk 
Introducing the Engine and its Tasks
 2015-05-22 15:15:16 -07:00
ZappoMan
160898ce96 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-05-22 14:55:29 -07:00
ZappoMan
d9ed1e061c Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api 2015-05-22 14:54:47 -07:00
ZappoMan
4bdeef7610 checkpoint 2015-05-22 14:54:30 -07:00
Sam Gateau
a28c99bb40 Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk 2015-05-22 14:40:00 -07:00
Brad Hefta-Gaub
dec1686228 Merge pull request #4943 from Atlante45/simple_program 
TEAM TEACHING - Simple program uses transform stack
 2015-05-22 14:39:13 -07:00
Sam Gateau
373ccd07ec Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk 2015-05-22 13:14:57 -07:00
samcake
c6b20da8b5 fix typos 2015-05-22 13:12:03 -07:00
Sam Gateau
e7e3eb2b7c FIrst version of the design for the Engine, the Tasks and a DrawTask. Introduced the ItemFilter 2015-05-22 12:58:18 -07:00
David Rowe
a01830f8f8 Fix some double to float conversion warnings in Windows builds 2015-05-22 12:32:02 -07:00
Andrew Meadows
461d08c0a9 merge upstream/master into andrew/bispinor 2015-05-22 11:35:02 -07:00
Andrew Meadows
bf225e4886 fix bug masking physics shape changes 2015-05-22 11:33:45 -07:00
Atlante45
e691a03c97 Remove push/popInputState 2015-05-22 20:30:54 +02:00
Atlante45
20ff43e29a Don't sync by default 2015-05-22 20:29:25 +02:00
Andrew Meadows
0431e8da36 put avatar body in right spot, and give it mass 2015-05-22 11:08:56 -07:00
Seth Alves
380fed7aee metersToVoxelCoordinates and voxelCoordinatesToMeters 2015-05-22 10:37:48 -07:00
Clément Brisset
e276926608 Add include/remove duplicate type 2015-05-22 18:23:42 +01:00
Ryan Huffman
491861c1db Remove constness from GlowEffect RenderArgs params 2015-05-22 10:02:06 -07:00
Ryan Huffman
66dc555ba9 Remove context->enqueueBatch from RenderableBoxEntityItem 2015-05-22 09:59:34 -07:00
Atlante45
c6ce5e7680 PerformanceTimer deactivated when not in use 2015-05-22 18:54:40 +02:00
Ryan Huffman
4a4c9c75fc Add gpu::context to RenderArgs and start using RenderArgs in place of the flags 2015-05-22 09:50:51 -07:00
Atlante45
e5aa696dda syncInputStateCache 2015-05-22 17:39:08 +02:00
Seth Alves
ed082800f5 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-22 08:38:22 -07:00
Atlante45
9561086d0d Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into simple_program 2015-05-22 17:21:50 +02:00
Atlante45
f089143cf1 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-05-22 17:16:51 +02:00
Clément Brisset
e980859059 Simple Program uses gpu API 2015-05-22 16:14:32 +01:00
Atlante45
5d2187cedf Remove non batch call to bind/releaseSimpleProgram 2015-05-22 16:37:02 +02:00
Atlante45
314486ab88 Ignore scale in Transform when 0.0f 
Also cleaned up some coding standard
 2015-05-22 16:21:12 +02:00
Eric Levin
fe99941de3 fixed problem with particle entities not showing up on other clients by adding properties to decodeEditEntityPacket and encodeEntityEditPacket methods in EntityItemProperties.cpp 2015-05-21 19:35:27 -07:00
Seth Alves
258e3b901d fixes Sam made in my branch while trying to get a mesh to render 2015-05-21 18:20:52 -07:00
Seth Alves
1100c832eb clean up diff 2015-05-21 18:18:04 -07:00
Seth Alves
f85cc89946 clean up diff 2015-05-21 18:17:07 -07:00
Seth Alves
a882fc7fb1 pull out common parts of the two sphere-in-volumes 2015-05-21 18:07:46 -07:00
Sam Gateau
bec8d1838c Adding th etask class 2015-05-21 17:12:01 -07:00
Seth Alves
8b2d570f3f clearSphereInVolume 2015-05-21 17:04:57 -07:00
Seth Alves
478cb40135 draws in the right place, now 2015-05-21 16:46:27 -07:00
Seth Alves
2cb73b5430 added a volex-volume size member variable. drawing transform still isn't quite right 2015-05-21 16:31:01 -07:00
Andrew Meadows
466af03fa9 support for ShapeInfo::offset 2015-05-21 16:25:05 -07:00
ZappoMan
0d9f0f609b first cut at RenderableEnitityItem payload 2015-05-21 16:22:23 -07:00
Andrew Meadows
f6721aa6eb moved ShapeInfoUtil to be ShapeFactory 2015-05-21 15:53:16 -07:00
Andrew Meadows
2e3973dfdd impl AvatarMotionState::set/getWorldTransform() 2015-05-21 15:34:30 -07:00
Sam Gateau
a87d2927f1 FIxing typos and refining naming again, getting ready to use a Payload 2015-05-21 15:27:55 -07:00
Seth Alves
bbb61a77d9 dodge stride bug in mesh code 2015-05-21 14:47:23 -07:00
Andrew Meadows
67f5d0773d some list management of AvatarMotionStates 2015-05-21 14:40:47 -07:00
Seth Alves
fd19c63449 fix bug in mesh 2015-05-21 14:26:40 -07:00
Sam Gateau
f0daa3ebcb Refining the namings, creating the bucketing system, making a first example 2015-05-21 12:06:47 -07:00
Atlante45
6b9f9a32bb Merge branch 'yellow' of http://github.com/samcake/hifi into simple_program 2015-05-21 20:58:42 +02:00
Sam Gateau
a71df42ca4 Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk 2015-05-21 10:52:40 -07:00
Seth Alves
fe188f9a43 something draws, now 2015-05-21 10:42:14 -07:00
ZappoMan
c7fb8fab85 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching-scene-api 2015-05-21 10:36:22 -07:00
Sam Gateau
1881b51f66 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2015-05-21 10:00:19 -07:00
Seth Alves
72e227eefe Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-21 09:55:14 -07:00
Sam Gateau
13a2c733d1 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2015-05-21 09:49:28 -07:00
Sam Gateau
8f9a1d1074 THursday morning commit before merging with teaching team 2015-05-21 09:45:48 -07:00
Seth Alves
52ce26d80d Merge branch 'master' of github.com:highfidelity/hifi into no-id-swap-redux 2015-05-21 09:20:56 -07:00
Philip Rosedale
1b0ef406ed Merge pull request #4921 from birarda/domain-toggle 
add a global toggle for restricted users
 2015-05-20 21:27:10 -07:00
Seth Alves
de6422683a cleanups, trying to figure out why this doesn't draw 2015-05-20 21:21:39 -07:00
ZappoMan
ce81d9a817 fix merge issue 2015-05-20 19:30:44 -07:00
ZappoMan
e1c5c5b12e Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api 2015-05-20 18:42:54 -07:00
ZappoMan
8b95b538e6 Merge branch 'render' of https://github.com/samcake/hifi into team-teaching-scene-api 2015-05-20 18:34:53 -07:00
ZappoMan
5b27bac72d Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching 2015-05-20 18:31:50 -07:00
Seth Alves
38edc27cbb Merge branch 'master' of github.com:highfidelity/hifi into no-id-swap-redux 2015-05-20 18:24:40 -07:00
Seth Alves
c3b26b78a0 Merge branch 'polyvox' of github.com:sethalves/hifi into polyvox 2015-05-20 18:22:16 -07:00
Seth Alves
138077ede9 hook up mesh renderer 2015-05-20 18:22:07 -07:00
Seth Alves
d7ccd23b07 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-20 18:08:29 -07:00
samcake
22c99d02b9 FIxing the Render::Item compilation on mac 2015-05-20 18:07:17 -07:00
Stephen Birarda
427e2e7dbf Merge branch 'master' of https://github.com/highfidelity/hifi into domain-toggle 2015-05-20 18:00:40 -07:00
Stephen Birarda
b6f458eaf1 Merge branch 'master' of https://github.com/highfidelity/hifi into ac-ice-connect 2015-05-20 17:59:40 -07:00
Seth Alves
aa1d3eb82a respond to code review 2015-05-20 17:31:57 -07:00
Stephen Birarda
7373bb6817 contain QSharedMemory for local server port to reader 2015-05-20 17:11:08 -07:00
Sam Gateau
1a59f4a97c fix typo 2015-05-20 17:08:19 -07:00
samcake
496898273c Merge pull request #4846 from jherico/dk1 
Second attempt at fixing the HMD eye projections, without breaking the camera this time.
 2015-05-20 17:02:28 -07:00
Sam Gateau
3893dff94f Renaming the PendingChanges 2015-05-20 16:59:10 -07:00
Sam Gateau
2ed7aae8d5 merging and updating 2015-05-20 16:50:43 -07:00
Stephen Birarda
6306b69ec8 add a version and handle remapping for restricted access 2015-05-20 16:27:53 -07:00
Seth Alves
782402b4c8 Merge branch 'master' of github.com:highfidelity/hifi into no-id-swap-redux 2015-05-20 14:53:05 -07:00
Seth Alves
4a59dc24c5 split entity-add and entity-edit messages 2015-05-20 14:52:03 -07:00
Brad Hefta-Gaub
39ab2f43bf Merge pull request #4885 from Atlante45/warings 
Quiet warnings
 2015-05-20 14:45:55 -07:00
Brad Hefta-Gaub
07366ca173 Merge pull request #4917 from huffman/fix-spotlight-size 
Fix spotlight dimensions
 2015-05-20 14:45:23 -07:00
Seth Alves
124ff68cee make EntityItemID a subclass of QUuid 2015-05-20 14:22:08 -07:00
Seth Alves
f522334c99 sort out script interface changes 2015-05-20 12:30:06 -07:00
Howard Stearns
c5b8dd51d8 Fix https://app.asana.com/0/32622044445063/34195351184789 
Handle collision events when we do other updates (and their entity scripts) rather than when we do the physic updates while the tree is locked.
Given that, remove the check that kept sound from playing (or scripts from running) when we would have deadlocked, because now we don't.
 2015-05-20 11:07:03 -07:00
Seth Alves
a769cfdaf2 client decides on new entity-ids, keep EntityItemID class 2015-05-20 10:42:19 -07:00
Brad Davis
827d7f6221 Merge branch 'master' into dk1 2015-05-20 09:41:20 -07:00
Ryan Huffman
6f69ed2561 Fix calculated dimensions of spotlight 
The spotlights region of effect is the intersection of the spotlight
with radius r, and the sphere of radius r
 2015-05-20 09:11:48 -07:00
Ryan Huffman
bb38b3eb3f Update default light cutoff to PI / 2 2015-05-20 09:11:21 -07:00
Seth Alves
f2c1c43da3 polyvox code runs, no rendering yet 2015-05-20 08:44:41 -07:00
Atlante45
9c9aee667a Header cleanup 2015-05-20 17:17:03 +02:00
Atlante45
ee4b28b6b9 Other TextRenderer memory leak 2015-05-20 16:56:04 +02:00
Atlante45
9a007ab135 Remove unused method 2015-05-20 16:50:31 +02:00
Atlante45
ee264368c0 Add renderQuad to DeferredLighting 2015-05-20 16:45:21 +02:00
Atlante45
e5d0851337 Remove unnecessary glPush/Pop 2015-05-20 16:29:43 +02:00
Seth Alves
4b263cf5c8 derieve PolyVox Entity from Model Entity 2015-05-19 21:40:05 -07:00
Andrew Meadows
2f4162f447 cleanup of AvatarManger API 2015-05-19 16:53:30 -07:00
Seth Alves
4166c3224f link polyvox library in with entities 2015-05-19 16:24:13 -07:00
Seth Alves
b32e069f1d bump protocol version 2015-05-19 14:45:01 -07:00
Seth Alves
f9d46b0cb5 interface decides on entityIDs rather than bouncing a temporary id through the entity server 2015-05-19 14:25:23 -07:00
Andrew Meadows
f86c419988 stubbery for collidable avatars 2015-05-19 14:15:26 -07:00
Andrew Meadows
ead1d9f4d1 formatting 2015-05-19 14:15:09 -07:00
Atlante45
eef87412fd Particles render in Batch 2015-05-19 15:54:19 +02:00
Atlante45
229f88617d Header cleanup 2015-05-19 15:19:02 +02:00
Sam Gateau
3ec6ada29d Introduce an official syncCache on the GLBackend to catch up with the glCOntext ttrue state 2015-05-19 00:32:36 -07:00
Howard Stearns
bb4df26690 Fix indentation. 2015-05-18 14:25:35 -07:00
Howard Stearns
95be605233 Typo: unlock=>lock in rednerDebugMeshBoxes. 2015-05-18 14:05:13 -07:00