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

20493 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
6d8f319e51 remove Audio methods re-introduced after merge 2015-01-05 09:27:01 -08:00
Stephen Birarda
dfb02aea0c resolve conflicts on merge, add cstring inc 2015-01-05 09:25:30 -08:00
Andrew Meadows
d032eab0de merge upstream/master into andrew/inertia 2015-01-05 09:19:37 -08:00
Andrew Meadows
30200ef7eb add damping to ObjectMotionState 2015-01-05 09:17:46 -08:00
Philip Rosedale
315b932445 Merge pull request #4038 from ZappoMan/hydraHands 
Make Hydra hands go neutral when resting on base.
 2015-01-04 12:31:59 -08:00
Brad Hefta-Gaub
89e499a78f only active sixsense palms 2015-01-04 12:26:30 -08:00
Philip Rosedale
218ae9c9d8 Hydra hands deactivate when placed back on controller base, removed measuring non-movement for inactivity 2015-01-04 12:12:57 -08:00
Philip Rosedale
a01ab38f1b Merge pull request #4029 from Atlante45/new_glm_fix 
Fix compile error with new glm version
 2015-01-04 11:26:37 -08:00
Philip Rosedale
e16fa465f6 Merge pull request #4037 from highfidelity/revert-4015-master 
Revert "Hydra hands deactivate when placed back on controller base"
 2015-01-03 21:15:14 -08:00
Philip Rosedale
fefcdfa9f6 Revert "Hydra hands deactivate when placed back on controller base" 2015-01-03 21:03:23 -08:00
ZappoMan
b0ac9e22c1 Merge branch 'master' of https://github.com/highfidelity/hifi into audioStarvation 2015-01-02 17:33:25 -08:00
ZappoMan
1df54cffd6 add audio starvation detection 2015-01-02 17:28:51 -08:00
Ryan Huffman
bbfe2ff1b9 Merge branch 'master' of git://github.com/highfidelity/hifi into audio-buffer-size 2015-01-02 17:08:02 -08:00
Ryan Huffman
4a72a4be83 Add audio output buffer size to settings 2015-01-02 17:03:01 -08:00
Ryan Huffman
0d71d25063 Add min/max for audio buffer size 2015-01-02 17:02:44 -08:00
Philip Rosedale
9837521fc6 Merge pull request #4033 from ZappoMan/bugFix 
remove PerformanceTimer from recalculateMeshBoxes() because it's not thread safe
 2015-01-02 16:13:58 -08:00
Ryan Huffman
4c5bb66bd7 Add audio output buffer size to preferences 2015-01-02 16:01:04 -08:00
Ryan Huffman
f97109f6a4 Add outputBufferSizeFrames property to Audio 2015-01-02 16:00:07 -08:00
ZappoMan
4cc641320b fix PerformanceTimer to handle timer stacks on multiple threads 2015-01-02 15:04:48 -08:00
ZappoMan
139f96c8b0 remove PerformanceTimer from recalculateMeshBoxes() because it's not thread safe 2015-01-02 14:41:09 -08:00
Philip Rosedale
384899e977 Merge pull request #4032 from Atlante45/uninitialized_entity_members 
Initialize entities' _locked and _script
 2015-01-02 14:01:55 -08:00
Philip Rosedale
1563b7ea0a Merge pull request #4031 from samcake/tot 
Simpler shadows only casted by the Avatar + make it work with lighlmpped surfaces
 2015-01-02 13:52:33 -08:00
Atlante45
022beff569 Initialize entities' _locked and _script 2015-01-02 12:37:00 -08:00
Sam Gateau
0169d82fff Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2015-01-02 12:16:17 -08:00
Sam Gateau
46ab4833be applying the shadowing improvment to the cascaceded path shader and cleaning the code 2015-01-02 12:12:41 -08:00
Philip Rosedale
90cf9acef1 Merge pull request #4030 from huffman/220-position 
Update inWorldTestTone.js to play in front of avatar
 2015-01-02 11:48:48 -08:00
Ryan Huffman
cf04c3313a Update inWorldTestTone.js to play in front of avatar 2015-01-02 11:43:41 -08:00
Sam Gateau
fe371730e3 Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2015-01-02 11:30:16 -08:00
Sam Gateau
24d39f4453 refining the shadowing 2015-01-02 11:29:54 -08:00
Sam Gateau
ef7c002237 Improving the shadow effect with lightmaps 2015-01-02 10:31:34 -08:00
Philip Rosedale
8fb0ed17b7 Merge pull request #4028 from huffman/disable-camera-tool 
Disable camera tool temporarily
 2015-01-02 09:35:04 -08:00
Andrew Meadows
0d3e78fdb8 modify extrapolation behavior when bullet enabled 
Allows Bullet to specify an object as "at rest"
by setting velocity to zero.
Also, moved velocity damping above position integration
to get the same order of operations as Bullet.
 2014-12-31 16:32:09 -08:00
Atlante45
b1f0ec8dfb Fix compile error with new glm version 2014-12-31 15:49:56 -08:00
Ryan Huffman
50bbeae30b Disable camera tool temporarily 2014-12-31 15:40:11 -08:00
Ryan Huffman
b6b2388d41 Update grid rendering to fade from center location rather than distance from camera 2014-12-31 11:15:44 -08:00
Ryan Huffman
a8de290482 Update grid alpha 2014-12-31 11:12:02 -08:00
Sam Gateau
02949dbc5a Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2014-12-31 10:59:42 -08:00
ZappoMan
9630279459 Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy 
Conflicts:
	examples/editVoxels.js
	examples/fallingSand.js
	examples/growTrees.js
	interface/src/Application.cpp
	interface/src/Application.h
	libraries/avatars/CMakeLists.txt
	libraries/entities/src/EntityItem.h
 2014-12-31 10:50:53 -08:00
Philip Rosedale
bd88e0f38d Merge pull request #4026 from ZappoMan/entityScriptsAndEvents 
evaluate entity scripts in a sandbox before constructing
 2014-12-31 10:44:55 -08:00
Brad Hefta-Gaub
eaa6d4455d Merge pull request #4024 from samcake/temp1 
Moving deferred lighting shaders from the resource folder to embedded source in the executable
 2014-12-31 10:33:30 -08:00
Brad Hefta-Gaub
43e6ba77fa Merge pull request #4007 from AndrewMeadows/inertia 
Bullet physics part 1
 2014-12-31 10:33:00 -08:00
Brad Hefta-Gaub
d47b0a33ea Merge pull request #3995 from huffman/camera-display 
Camera tool - orientation + mode display
 2014-12-31 10:32:31 -08:00
Ryan Huffman
7478b631da Move write lock in Overlays::overlayDrawOnChanged to encompass reads 2014-12-31 10:16:29 -08:00
Ryan Huffman
5caec4dea5 Update overlays to handle updates in drawOnHUD after creation 2014-12-31 10:15:15 -08:00
ZappoMan
eb28efa648 evaluate entity scripts in a sandbox before constructing 2014-12-31 09:58:18 -08:00
Sam Gateau
e1a295fb37 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2014-12-31 08:40:15 -08:00
Andrew Meadows
ec1ef39a7f Merge pull request #4023 from PhilipRosedale/master 
Torso twists to follow head, fix bug with head rotations
 2014-12-31 08:01:39 -08:00
ZappoMan
48285b21c4 remove voxel related scripts 2014-12-30 20:50:07 -08:00
ZappoMan
67595ea571 more voxelEctomy 2014-12-30 20:35:21 -08:00
Philip Rosedale
104f7b7576 make formula more readable 2014-12-30 20:34:12 -08:00