Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 06:23:35 +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
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
Andrew Meadows
0a0eba8277 merge 2015-05-27 18:07:00 -07:00
Andrew Meadows
aba539928d fix grab glitches and failure to own simulation 2015-05-27 18:05:59 -07:00
Brad Hefta-Gaub
0553f7ca4c Merge pull request #4961 from hyperlogic/ajt/particle-net-anim-fix 
Particle entities should avoid resetting simulation when setMaxParticles is called
 2015-05-27 17:44:44 -07:00
Brad Hefta-Gaub
bcc24c9762 Merge pull request #4975 from huffman/scene-avatar 
Team Teaching - Move avatar rendering to Scene pipeline
 2015-05-27 17:13:10 -07:00
ZappoMan
b0cc536f53 debug cleanup 2015-05-27 16:55:02 -07:00
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