Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 03:13:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
17956 commits 71 branches 56 tags 1.2 GiB
Commit graph

17956 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
650660a0fc Merge pull request #3632 from ey6es/metavoxels 
Added network condition simulator for metavoxels, fixed crash issues with reliable deltas.
 2014-10-21 18:36:11 -07:00
Brad Hefta-Gaub
1348523c95 Merge pull request #3633 from samcake/temp0 
Record graphics API commands in a "gpu::Batch" to separate traversal from rendering
 2014-10-21 18:36:00 -07:00
Sam Gateau
057c17fd2f fix suseless spaces around parameters in functions 2014-10-21 18:14:26 -07:00
Sam Gateau
86819b9344 fix endline on Batch.cpp 2014-10-21 18:03:53 -07:00
Sam Gateau
f8f9383c43 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-10-21 17:57:38 -07:00
Sam Gateau
821284edfd Introduce the gpu::Batch for the full Model::render call 2014-10-21 17:46:41 -07:00
Andrzej Kapolka
4840c44d7c Time calculation fix. 2014-10-21 17:41:41 -07:00
Andrzej Kapolka
311d1332f1 Include a simple bandwidth limit option. 2014-10-21 17:29:28 -07:00
Andrzej Kapolka
9c0e3ead13 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-21 16:27:41 -07:00
Andrzej Kapolka
0f58b42795 Forgot these guys. 2014-10-21 16:27:26 -07:00
Brad Hefta-Gaub
af5a4da30e Merge pull request #3631 from huffman/entity-tools-multi-selection 
Entity Tool Updates
 2014-10-21 16:24:27 -07:00
Andrzej Kapolka
3d43e86faa Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-21 15:49:06 -07:00
Andrzej Kapolka
bd4738d2c2 Reliable delta fix. 2014-10-21 15:48:53 -07:00
Ryan Huffman
d9029beaa4 Merge remote-tracking branch 'upstream/master' into entity-tools-multi-selection 2014-10-21 15:17:07 -07:00
Ryan Huffman
d5c7c60553 Update entity edit tools 
Move editing functions into "tool" objects which contain onBegin,
onMove, and onEnd functions.
Add multi-selection
Add local and world editing modes
Fix XZ tool
 2014-10-21 15:15:26 -07:00
Clément Brisset
9476154375 Merge pull request #3628 from ZappoMan/master 
add 3D text overlay support
 2014-10-21 12:39:30 -07:00
Brad Hefta-Gaub
308c1d9bbb Merge pull request #3629 from PhilipRosedale/master 
Improved version of headMove with timed target reveal
 2014-10-21 12:29:37 -07:00
ZappoMan
228de963ab CR feedback 2014-10-21 12:28:44 -07:00
Andrzej Kapolka
02c6b5a8bf Fix for send delay, delay ordering. 2014-10-21 12:16:55 -07:00
Andrzej Kapolka
5efb108e6c Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-21 11:45:43 -07:00
Philip Rosedale
2a5b2d8686 Improved version of headMove with timed target reveal 2014-10-21 11:40:16 -07:00
Sam Gateau
f090a1868c qerge branch 'master' of https://github.com/highfidelity/hifi into temp0 
q Please enter a commit message to explain why this merge is necessary,
 2014-10-21 10:51:46 -07:00
Sam Gateau
00dbe486d9 FIrst working version of the GLBatching system introduced in the MOdelrendering path 2014-10-21 10:50:53 -07:00
Brad Hefta-Gaub
d79b851cf4 Merge pull request #3627 from PhilipRosedale/master 
First cut, Oculus headMove with warping
 2014-10-21 10:03:34 -07:00
Stephen Birarda
1658f6cc03 Merge pull request #3624 from thoys/sdl2-find-hifi_libs 
Allow "%HIFI_LIB_DIR%/SDL2" for SDL2 path on Windows
 2014-10-21 08:46:46 -07:00
ZappoMan
1b9565e575 cleanup 2014-10-21 08:25:04 -07:00
ZappoMan
956d7c73b2 removed debug 2014-10-21 08:21:01 -07:00
ZappoMan
99adb413e3 add 3D text overlay support 2014-10-21 08:20:15 -07:00
Thijs Wenker
8b8b7f1189 Moved the new hints to HINTS, thanks for the hint @birarda 2014-10-21 13:39:24 +02:00
Philip Rosedale
4e605f5f67 First headMove "no-barf" version with lean/nod to walk, turn 2014-10-21 00:20:08 -07:00
Andrzej Kapolka
45fb31cd08 Basic network simulation for metavoxels. 2014-10-20 18:43:41 -07:00
Andrzej Kapolka
b796e1bedd Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-20 16:17:16 -07:00
Andrzej Kapolka
d64b43693d Networking fix. 2014-10-20 15:33:46 -07:00
Thijs Wenker
90a1f141ba removed duplicate hints entries 2014-10-20 22:28:02 +02:00
Andrzej Kapolka
e586b6e29b Remove nodes with no opaque elements. 2014-10-20 12:27:49 -07:00
Andrzej Kapolka
b719f00547 Merge pull request #3625 from ey6es/metavoxels 
Fix for Xcode warning.
 2014-10-20 12:13:44 -07:00
Andrzej Kapolka
662189159d Fix for Xcode warning. 2014-10-20 12:09:33 -07:00
AndrewMeadows
2569f70ac3 Merge pull request #3623 from ey6es/master 
For FBX files with marked "skeleton" joints, only show those marked nodes in the upload dialog.  Also added some more default node names to look for on upload.
 2014-10-20 09:00:06 -07:00
AndrewMeadows
2e958599aa Merge pull request #3621 from ey6es/metavoxels 
Sculpt brush, very rough conversion of heightfield patches to dual contour surfaces on edit.
 2014-10-20 08:55:01 -07:00
AndrewMeadows
7a97634a78 Merge pull request #3616 from ZappoMan/fixSVOs 
fix SVOs to render again
 2014-10-20 08:33:42 -07:00
AndrewMeadows
f7c4804f33 Merge pull request #3613 from ctrlaltdavid/20112 
CR for Job #20112 - chat alerts persist
 2014-10-20 08:32:32 -07:00
Thijs Wenker
3cd42b7671 Allows Windows users to put SDL2 folder in %HIFI_LIB_DIR% folder (see BUILD.md for info about %HIFI_LIB_DIR% environment variable) 2014-10-18 19:46:15 +02:00
Andrzej Kapolka
32c5f6e40e Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-17 18:28:16 -07:00
Andrzej Kapolka
da60a17b45 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-10-17 18:27:31 -07:00
Sam Gateau
0def490db7 startign to record all the gl commands in the Batch 2014-10-17 18:17:44 -07:00
Andrzej Kapolka
e98b99fe84 Merge pull request #3622 from birarda/domain-tunnel 
work around double login issue by generating keypair on each launch
 2014-10-17 18:05:45 -07:00
Andrzej Kapolka
c979ace924 Read the unit scale factor and include it in the offset scale. 2014-10-17 17:34:27 -07:00
Stephen Birarda
5882001311 Merge pull request #3619 from ZappoMan/modelOverlayRayPick 
ray picking support for Model and 3D volume overlays
 2014-10-17 17:03:37 -07:00
Andrzej Kapolka
1940fe67a0 Add jointEyeLeft/jointEyeRight/jointNeck to list of nodes we check for on 
upload.
 2014-10-17 16:57:15 -07:00
Stephen Birarda
5ecdb58e20 generate a new keypair on every interface launch 2014-10-17 16:55:50 -07:00