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

20484 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Gateau
4fb9e9c775 cleaning the code 2014-12-30 17:55:49 -08:00
Sam Gateau
8d95639416 moving the deferrered shaders from the resource folder to built-in the executable 2014-12-30 17:43:52 -08:00
Sam Gateau
37017d0c16 moving the deferrered shaders from the resource folder to built-in the executable 2014-12-30 17:42:10 -08:00
Philip Rosedale
dc9937e11a only twist own body, remove unused head functions 2014-12-30 17:02:53 -08:00
Philip Rosedale
98cbb2355f Merge branch 'master' of https://github.com/worklist/hifi 2014-12-30 17:00:38 -08:00
ZappoMan
2a129b6635 Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy 2014-12-30 16:49:38 -08:00
samcake
20d66d201e Merge pull request #4020 from ZappoMan/gpuStreamizing 
Improvements to GeometryCache::renderQuad()
 2014-12-30 16:49:16 -08:00
Philip Rosedale
4f06c271c0 Merge pull request #4022 from ZappoMan/animationFrameIndex 
fix one more case of animaiton stutter
 2014-12-30 15:47:19 -08:00
Philip Rosedale
4e31d7a650 Merge pull request #4021 from ZappoMan/removeHair 
Haircut at Philip's request
 2014-12-30 15:41:53 -08:00
Philip Rosedale
b76f5bf272 Merge branch 'master' of https://github.com/worklist/hifi 2014-12-30 15:41:06 -08:00
Ryan Huffman
3bfc298349 Remove extraneous getDrawonHUD call 2014-12-30 15:31:08 -08:00
Ryan Huffman
929200bc76 Remove qDebug 2014-12-30 15:30:53 -08:00
Ryan Huffman
cf798e0a2f Fix orbit camera capturing mouse 2014-12-30 15:30:25 -08:00
ZappoMan
86a9d5719b fix one more case of animaiton stutter 2014-12-30 15:12:23 -08:00
Philip Rosedale
f4f43d6b38 added twisting of torso to follow head, fixed bug with body rotation not factored out of head rotation, removed credits from title bar 2014-12-30 15:11:32 -08:00
Andrew Meadows
adf778fba2 Merge pull request #4013 from Atlante45/cmake_fix 
Fix for new version of cmake
 2014-12-30 15:10:14 -08:00
Ryan Huffman
0105906dc7 Merge branch 'master' of github.com:highfidelity/hifi into camera-display 
Conflicts:
	examples/editEntities.js
 2014-12-30 15:02:59 -08:00
Ryan Huffman
2b835e621c Rename 2D -> HUD, 3D -> World in Overlays 2014-12-30 14:50:17 -08:00
Sam Gateau
3409ef3b46 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2014-12-30 14:34:47 -08:00
Sam Gateau
ccc77ce7a6 fixing command for scribe 2014-12-30 14:30:18 -08:00
ZappoMan
e1d8022409 working on removing voxels 2014-12-30 14:11:31 -08:00
ZappoMan
fbfa40e3c9 remove hair 2014-12-30 13:44:25 -08:00
Clément Brisset
860098585c Merge pull request #4018 from samcake/temp0 
Moving the shaders used in Model.cpp from resources folder into the built-in executable
 2014-12-30 13:36:13 -08:00
Sam Gateau
43dbc1a2da Merge branch 'temp0' of https://github.com/samcake/hifi into temp1 2014-12-30 13:31:08 -08:00
ZappoMan
eb4b8291d7 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2014-12-30 13:28:49 -08:00
ZappoMan
4e6ed4a449 fix comments 2014-12-30 13:26:13 -08:00
ZappoMan
28569836bb rename parameters and reuse previously registered quad if geometry didn't change 2014-12-30 13:24:31 -08:00
Clément Brisset
717176af61 Merge pull request #4019 from huffman/update-grid-colors 
Update grid colors
 2014-12-30 13:22:01 -08:00
Clément Brisset
58c95a12aa Merge pull request #4017 from ey6es/master 
Scale back on first dropped packet, use Qt socket options, fixed overflow warning.
 2014-12-30 13:21:01 -08:00
Andrew Meadows
6f72d4ad81 easier to read Bullet to GLM conversions and back 2014-12-30 13:15:57 -08:00
Ryan Huffman
ea69dcaf29 Update grid colors 2014-12-30 13:10:23 -08:00
Andrzej Kapolka
0d07875f94 Fix overflow warning. 2014-12-30 12:54:12 -08:00
Andrzej Kapolka
180bed4609 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-12-30 12:51:03 -08:00
Sam Gateau
a022e94814 Adding the shader files 2014-12-30 12:38:36 -08:00
ZappoMan
be137534b5 first cut at registered quads to reduce copies of constantly changing quads 2014-12-30 12:38:16 -08:00
Sam Gateau
e752edc44a Moving the shaders used in Model.cpp from resources folder into the built-in executable 2014-12-30 12:35:00 -08:00
Andrzej Kapolka
c9b3b5ff7d Scale back on first dropped packet, use Qt send/receive buffer size options 
rather than setsockopt/getsockopt.
 2014-12-30 12:30:38 -08:00
Clément Brisset
ecdf415954 Merge pull request #4016 from huffman/grid-tools-overlay 
Grid tools overlay
 2014-12-30 12:18:13 -08:00
Ryan Huffman
1da253d39f Remove duplicate minorGridWidth variable 2014-12-30 12:13:40 -08:00
Andrew Meadows
5e2246625b fix layout to abide by the coding standard 2014-12-30 12:09:22 -08:00
Clément Brisset
9a1c521df2 Merge pull request #4014 from ZappoMan/animationFrameIndex 
Fix stuttering in animation caused when animation plays too long without lastFrame set
 2014-12-30 12:07:26 -08:00
Andrew Meadows
e43d7b7369 fix indentation in ctor init 2014-12-30 12:05:28 -08:00
Clément Brisset
5f07e3425d Merge pull request #4015 from PhilipRosedale/master 
Hydra hands deactivate when placed back on controller base
 2014-12-30 12:04:16 -08:00
Andrew Meadows
da551a0a76 restore script change detection to what it was 2014-12-30 11:56:39 -08:00
Andrew Meadows
ba873deb49 ignore Entity updates that don't change anything 2014-12-30 11:38:24 -08:00
Sam Gateau
744c66226f Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2014-12-30 11:35:04 -08:00
Ryan Huffman
16bf4e87e6 Remove unused function 2014-12-30 11:34:59 -08:00
Ryan Huffman
a0cb40597b Remove gridControls.html 2014-12-30 11:31:47 -08:00
Ryan Huffman
552a421f24 Update grid tool to be an overlay 2014-12-30 11:31:29 -08:00
Ryan Huffman
fbd189bde3 Rename minorGridSpacing to minorGridWidth 2014-12-30 11:28:10 -08:00