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

20457 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
5cef7d0e9d more voxelEctomy 2014-12-30 20:24:27 -08:00
ZappoMan
95bb125e48 more voxelEctomy 2014-12-30 20:13:57 -08:00
ZappoMan
27d8ccb51e more voxelEctomy 2014-12-30 19:58:04 -08:00
ZappoMan
f1de9cabe9 comment 2014-12-30 19:07:32 -08:00
ZappoMan
278ed96f14 more work on voxelEctomy 2014-12-30 18:54:53 -08:00
ZappoMan
49d8f2b2f5 more work on voxelEctomy 2014-12-30 18:52:33 -08:00
ZappoMan
141e231958 more work on voxelEctomy 2014-12-30 18:41:56 -08:00
ZappoMan
4ea9bbc309 first major pass at voxelEctomy 2014-12-30 18:08:58 -08:00
Sam Gateau
ae6ccf1a7d Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2014-12-30 17:56:08 -08:00
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
Thijs Wenker
c73b496cac press X button with gamepad 2014-12-31 02:25:55 +01: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
Thijs Wenker
398e88107c renamed virtualKeyboardLocation.js to goTo.js as discussed 2014-12-31 01:53:10 +01: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
Thijs Wenker
33a4f80300 hide keyboard after submit 2014-12-31 01:49:01 +01:00
Thijs Wenker
a0e209276b textbox visibility 2014-12-31 01:46:01 +01:00
Thijs Wenker
1365ecede3 removed unused variables 2014-12-31 01:42:19 +01:00
Thijs Wenker
e856d302d3 - improved keyboard visibility setting 
- added posibility to teleport to location through hmd
 2014-12-31 01:37:51 +01:00
Thijs Wenker
11d66ae83f fixed text entity height 2014-12-31 00:51:34 +01: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
Thijs Wenker
a8122e5a85 virtualKeyboard.js - scale 50% 
virtualKeyboardLocation.js - toggle visibility with Enter/Return key
virtualKeyboardTextEntityExample.js - attempt to fix character glyphs
 2014-12-30 23:30:48 +01: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