Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 02:58:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
26373 commits 75 branches 59 tags 1.2 GiB
Commit graph

12233 commits

Author SHA1 Message Date
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
Howard Stearns
8e245ec4c2 getCollisionEvents has a side-effect on state (removing END events from further consideration), so it must be called once per step. 
Otherwise entities never get to see end events.
Also, entity collision processing should only be done when there are outgoing changes (just like for avatar).
 2015-05-29 09:59:21 -07:00
Ryan Huffman
b4806f5aac Fix render::PendingChanges using render::Scene::PendingChanges 2015-05-29 09:40:52 -07:00
Ryan Huffman
0e5cf273ab Fix AABox bounds handling in Overlays 2015-05-29 09:40:23 -07:00
Ryan Huffman
b21d0a3a53 Remove Overlays::renderWorld from Application 2015-05-29 09:40:03 -07:00
Ryan Huffman
2222468e89 Remove Overlays::renderWorld 2015-05-29 08:53:40 -07:00
Ryan Huffman
874f722504 Remove unused Avatar::Pointer typedef 2015-05-29 08:51:37 -07:00
Ryan Huffman
1089490658 Move overlay rendering to Scene 2015-05-29 08:51:25 -07: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
Stephen Birarda
5749fefcd5 have show DS connect refresh existing dialog 2015-05-28 17:07:57 -07:00
Stephen Birarda
7f86ca3f10 refresh the network dialog if it is already up 2015-05-28 17:07:20 -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
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
ZappoMan
2fba5a0928 more work on simple renderable 2015-05-28 12:19:43 -07:00
Andrew Meadows
2a4cd468e4 Merge pull request #4979 from sethalves/polyvox 
initial pass at Polyvox Entity Type
 2015-05-28 10:43:50 -07:00
Seth Alves
065f19d527 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-28 10:31:44 -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
Seth Alves
a91a7942a4 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-28 06:59:39 -07:00
Atlante45
10c2f3f561 More TextRenderer work 2015-05-28 14:51:57 +02:00
Brad Davis
e5bec42512 Fix mouse emulation picking and pointer positioning for the hydra 2015-05-27 23:36:00 -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
ZappoMan
763e6dd97b Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-05-27 19:58:11 -07:00
Seth Alves
4fa6f388b9 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-27 18:20:59 -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
Brad Hefta-Gaub
5da3a9440e Merge pull request #4964 from howard-stearns/remove-global-collision-and-update-examples 
[REQUIRES #4962] Remove global collision and update examples
 2015-05-27 16:09:14 -07:00
Stephen Birarda
734798a365 fix move of connection steps to LNL 2015-05-27 15:50:31 -07:00
Ryan Huffman
ea6b620d8a Add declarations for avatar payload functions 2015-05-27 14:53:49 -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
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
Ryan Huffman
c5a3edee09 Fix error with duplicate variable names 2015-05-27 13:13:52 -07:00
Ryan Huffman
00db7fca70 Update avatar rendering to set displayLookAtVectors 2015-05-27 13:11:29 -07:00
Ryan Huffman
825e071ac0 Add overrides to MyAvatar::render* 2015-05-27 13:02:48 -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
f972e84d6c Move avatar renedering to Scene 2015-05-27 12:40:26 -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
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
Howard Stearns
4b4bf9fd90 Merge branch 'master' of https://github.com/highfidelity/hifi into remove-global-collision-and-update-examples 2015-05-27 09:29:06 -07:00
Seth Alves
c80f2970fd Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-27 07:37:51 -07:00
Sam Gateau
58e3fe695c Refining once more for sir gcc on Ubuntu 2015-05-27 01:32:40 -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
Stephen Birarda
9cb6ccaa46 thread safe timing of domain connection 2015-05-26 16:49:18 -07:00
Seth Alves
55028f6cb0 voxel data sent over wire and saved to json 2015-05-26 16:34:35 -07:00
Stephen Birarda
08affbfd0d fix table size calculations 2015-05-26 16:14:12 -07:00
Stephen Birarda
5b5518077d fix headers and stats for domain connection timing 2015-05-26 15:51:00 -07:00
Stephen Birarda
61029fd0b1 add ability to display domain connection times 2015-05-26 15:22: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
Stephen Birarda
626f22191c add a QAbstractTableModel for domain connection steps 2015-05-26 14:17:02 -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
Howard Stearns
3c718af43f Merge branch 'master' of https://github.com/highfidelity/hifi into remove-global-collision-and-update-examples 2015-05-26 13:26:02 -07:00
Sam Gateau
ad0b0cfade FIxing one more issue with compilation on ubuntu regarding the template functions specializationand the namespace 2015-05-26 11:40:35 -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
samcake
dd9d758da1 Fixing the compilation issue for real 2015-05-26 10:53:23 -07:00
Stephen Birarda
f28ade1075 log connection times for eventual stats display 2015-05-26 10:37:44 -07:00
ZappoMan
c92e7bed87 andrews CR feedback 2015-05-26 09:44:02 -07:00
ZappoMan
d1520c5502 andrews CR feedback 2015-05-26 09:23:27 -07:00
Sam Gateau
0083ba6f85 trying again 2015-05-25 17:39:31 -07:00
Sam Gateau
ad054a640e Fixing a problem with Mac/ubuntu build maybe 2015-05-25 17:21:03 -07:00
Howard Stearns
cbf4e09a10 Remove global collision event. 2015-05-25 16:10:50 -07: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
ZappoMan
9988f2d1cd EnitityItem smart pointers 2015-05-22 22:38:02 -07: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
Stephen Birarda
69f1cd80e6 immediately send ICE heartbeat once data present 2015-05-22 16:29:01 -07:00
Ryan Huffman
47d9cf42c5 Remove unused lodManager 2015-05-22 16:04:05 -07:00
Ryan Huffman
05f8ba558f Update RenderArgs construction in paintGL 2015-05-22 16:02:24 -07:00
Ryan Huffman
1d12744781 Remove commented out code 2015-05-22 15:34:19 -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
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
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
Andrew Meadows
461d08c0a9 merge upstream/master into andrew/bispinor 2015-05-22 11:35:02 -07: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
Brad Hefta-Gaub
da8f99508c Merge pull request #4871 from huffman/console-error 
Add error handling to JSConsole
 2015-05-22 10:57:18 -07:00
Ryan Huffman
5ac02f66ca Remove const from ApplicationOverlay::renderOverlay 2015-05-22 09:58:20 -07:00
Ryan Huffman
6fd474a1a3 Fix comment 2015-05-22 09:56:21 -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
David Rowe
c530c530ef Make eyelids follow iris as head tilts - for DDE and no face tracking 2015-05-22 09:24:41 -07:00
Andrew Meadows
01cc629224 fix crashes during init and shutdown 2015-05-22 09:20:08 -07:00
Atlante45
e5aa696dda syncInputStateCache 2015-05-22 17:39:08 +02:00
Atlante45
f089143cf1 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-05-22 17:16:51 +02:00
Atlante45
5d2187cedf Remove non batch call to bind/releaseSimpleProgram 2015-05-22 16:37:02 +02:00
David Rowe
a0c3c974a9 Throttle DDE face acquisition attempts in order to reduce CPU usage 2015-05-21 19:44:38 -07:00
Andrew Meadows
ac8cac9783 avatars use DYNAMIC motion 2015-05-21 16:37:10 -07:00
Andrew Meadows
2e3973dfdd impl AvatarMotionState::set/getWorldTransform() 2015-05-21 15:34:30 -07:00
Andrew Meadows
67f5d0773d some list management of AvatarMotionStates 2015-05-21 14:40:47 -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
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
Seth Alves
38edc27cbb Merge branch 'master' of github.com:highfidelity/hifi into no-id-swap-redux 2015-05-20 18:24:40 -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
2ed7aae8d5 merging and updating 2015-05-20 16:50:43 -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
Brad Hefta-Gaub
79023763ef Merge pull request #4869 from ctrlaltdavid/20543 
CR for #20543 - Option to auto-mute mic if step away from PC when face tracking is enabled
 2015-05-20 14:47:31 -07:00
Seth Alves
124ff68cee make EntityItemID a subclass of QUuid 2015-05-20 14:22:08 -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
Atlante45
9b49936d29 TextRenderer memory leak 2015-05-20 16:41:47 +02:00
Andrew Meadows
2f4162f447 cleanup of AvatarManger API 2015-05-19 16:53:30 -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
Atlante45
a9a0c9f387 Render 3D overlays before entities 
This gets rid of some issues due to entities moving to render pipeline
 2015-05-18 17:13:32 +02:00
Atlante45
a7ee10001a Remove used deprecated methods 
Also added a warning on the single one in use right now,
so that it gets deleted once it is moved to the rendering pipeline
 2015-05-18 16:37:28 +02:00
Sam Cake
580339e99f Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-05-15 17:24:59 -07:00
Sam Cake
e9ff06df24 FIx the issue where the view frustum used in the skybox wasn;t in sync with the true camera, except if shadows is on, THe one call missing is now always executed 2015-05-15 17:22:29 -07:00
Philip Rosedale
36b396b9ef Merge pull request #4881 from ctrlaltdavid/fix-binary-eyelid 
Fix visibility of binary eyelid control menu item
 2015-05-15 17:19:15 -07:00
Philip Rosedale
0d00393eff Merge pull request #4854 from ctrlaltdavid/fix-facetracker-rotation 
Fix facetracker rotation
 2015-05-15 17:17:30 -07:00
David Rowe
d3cb6a9334 Fix visibility of binary eyelid control menu item 2015-05-15 09:40:32 -07:00
Brad Davis
6797174b97 Fix picking in the HMD 2015-05-14 19:15:47 -07:00
Seth Alves
41d77e6146 Merge pull request #4852 from AndrewMeadows/nova 
improved distributed simulation ownership negotiation
 2015-05-14 11:40:49 -07:00
Ryan Huffman
0cd60782e7 Add error handling to JSConsole 2015-05-14 11:00:30 -07:00
Philip Rosedale
e0e026c639 Merge pull request #4862 from birarda/master 
fixes for other avatar receive stats rendering
 2015-05-14 10:19:09 -07:00
Andrew Meadows
81d06e0dc3 Merge upstream/master into andrew/nova 
Conflicts:
	libraries/entities/src/EntityItem.cpp
	libraries/entities/src/EntityItemProperties.cpp
 2015-05-14 10:09:55 -07:00
Brad Hefta-Gaub
d1f52231be Merge pull request #4863 from samcake/orange 
Using the skymap for ambient lighting
 2015-05-14 09:12:46 -07:00
David Rowe
ff7b2016b4 Add option to auto mute microphone after lose face tracking 2015-05-14 08:50:43 -07:00
David Rowe
95a565627c Make DDE isTracking() behave the same as Faceshift's 2015-05-14 08:49:44 -07:00
Brad Davis
e20d2ffb15 Merge typo 2015-05-13 21:39:04 -07:00
Brad Davis
c94b8b6e30 Merge branch 'master' into dk1 
Conflicts:
	interface/src/devices/OculusManager.cpp
	interface/src/devices/TV3DManager.cpp
 2015-05-13 21:25:56 -07:00
Brad Hefta-Gaub
77019eafa7 Merge pull request #4831 from jherico/plugins_pt2 
Display plugins part 2
 2015-05-13 20:40:33 -07:00
Brad Hefta-Gaub
3b7acae8a2 Merge pull request #4850 from jherico/web-entity 
Web entity
 2015-05-13 17:02:55 -07:00
Sam Cake
d13106f4c9 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-05-13 16:00:42 -07:00
Stephen Birarda
57fa3d8c53 fixes for other avatar receive stats rendering 2015-05-13 14:43:31 -07:00
Brad Davis
3b7e8a69b5 Attempting to fix threading issues with web entities 2015-05-13 14:00:41 -07:00
Bradley Austin Davis
a0097bcff8 Fixing offscreen rendering on retina display, even without a proxy window 2015-05-13 12:26:46 -07:00
Seth Alves
80749195e6 don't ddeTracker->init if HAVE_DDE isn't set 2015-05-13 11:44:42 -07:00
David Rowe
7319c7b767 Fix face-tracked head rotation for Faceshift, also 2015-05-13 11:35:04 -07:00
David Rowe
5050171d30 Fix face-tracked head disappearing into body 
Normalize quaternion to ensure that acos(r.w) is valid (r.w <= 1.0) and
r.w = 1.0 when r.x = r.y = r.z = 0.0.
 2015-05-13 11:34:19 -07:00
Sam Cake
8324268ec8 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-05-13 11:32:39 -07:00
Philip Rosedale
96b761357b Merge pull request #4853 from huffman/remove-scripts-tip 
Remove scripts 'Tip' label and fix tool window heights
 2015-05-13 11:21:49 -07:00