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

14354 commits

This branch
This branch
All branches
Author SHA1 Message Date
wangyix
99bc7f8c9d #include "" to #include <> 2014-06-25 09:20:15 -07:00
Andrew Meadows
81209c38ca fix warning about out of order initialization 2014-06-25 09:09:44 -07:00
Andrew Meadows
d3d8e4dc2d fix warnings about signed/unsigned comparisons 2014-06-25 09:07:10 -07:00
Andrew Meadows
552efa3e91 remove warning: unused variables 2014-06-25 09:01:49 -07:00
Philip Rosedale
40dee3b39e Added JS calls for left/right estimated palm position on skeleton model, improved toy ball to use them 2014-06-25 05:24:22 -07:00
Philip Rosedale
88c01266ab more hair tweaks, don’t render in 1P, improved toy ball 2014-06-25 03:29:08 -07:00
Philip Rosedale
95a66a06af Merge branch 'master' of https://github.com/worklist/hifi 2014-06-25 02:57:54 -07:00
Ryan Huffman
3bec59fd33 Fix unindented line 2014-06-24 20:38:46 -07:00
Philip Rosedale
60c33c18c3 Expose mode shift period to JS, remove default value 2014-06-24 20:32:41 -07:00
Clément Brisset
3b4ac91d60 Merge pull request #3073 from ZappoMan/removeOctreeTests 
try to get tests to build
 2014-06-24 20:28:23 -07:00
Ryan Huffman
5ece424a45 Merge branch 'master' of git://github.com/highfidelity/hifi into 19644 
Conflicts:
	interface/ui/runningScriptsWidget.ui
 2014-06-24 20:27:44 -07:00
ZappoMan
a7f2d150a4 what's this cmake defines ssize_t??? 2014-06-24 20:15:34 -07:00
ZappoMan
fd3916e662 another hack attempt to fix unit tests on windows 2014-06-24 20:10:06 -07:00
ZappoMan
1001ea5f87 fixed some windows warnings 2014-06-24 20:07:47 -07:00
ZappoMan
1eb5b3dda1 argggg ssize_t from stdlib.h 2014-06-24 19:58:59 -07:00
ZappoMan
d967c100c4 argggg ssize_t from types.h 2014-06-24 19:57:52 -07:00
Andrzej Kapolka
d913ac4486 Fix for streams' getting stuck on the final part. 2014-06-24 19:34:19 -07:00
ZappoMan
5486cd4019 argggg ssize_t 2014-06-24 19:29:26 -07:00
ZappoMan
71afc3f4d4 argggg ssize_t 2014-06-24 19:26:24 -07:00
ZappoMan
e5349024e6 argggg ssize_t 2014-06-24 19:15:48 -07:00
Andrzej Kapolka
e7db355c95 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-24 19:11:43 -07:00
ZappoMan
7d759fc00c argggg 2014-06-24 19:11:32 -07:00
Andrzej Kapolka
65e50f32e4 Tests, fixes for SpanList. 2014-06-24 19:10:52 -07:00
ZappoMan
3ad07f4b91 argggg 2014-06-24 19:08:16 -07:00
ZappoMan
fdb0cf9386 change order of headers 2014-06-24 18:53:20 -07:00
Atlante45
9a6f144da9 Added sitting points metadata for fst 2014-06-24 18:21:57 -07:00
ZappoMan
40a842d251 windows build issue 2014-06-24 18:15:00 -07:00
ZappoMan
773e1b0522 try to get tests to build 2014-06-24 18:02:35 -07:00
Clément Brisset
b6a8949b4c Merge pull request #3069 from binaryking/19765 
Code Review for Job #19765
 2014-06-24 17:49:42 -07:00
wangyix
d098edcdf0 Merge remote-tracking branch 'upstream/master' 2014-06-24 17:39:13 -07:00
AndrewMeadows
2db156d6cd Merge pull request #3072 from ZappoMan/removeOctreeTests 
try to disable model tests
 2014-06-24 17:35:52 -07:00
ZappoMan
bc5f563f5c and change ring buffer size 2014-06-24 17:25:45 -07:00
ZappoMan
3da18ec1c0 try to disable model tests 2014-06-24 17:23:09 -07:00
wangyix
52f00769d4 merged with upstream 2014-06-24 17:22:30 -07:00
wangyix
e1d28dfe73 removed debug code 2014-06-24 17:14:20 -07:00
wangyix
5fd1d0a87c added AudioRingBuffer unit test 
fixed bug with _endOfLastWrite not rolling over in addSilentFrame
 2014-06-24 16:51:51 -07:00
Stephen Birarda
7d46b8062b Merge pull request #3070 from birarda/rounding-fix 
revert credit balance rounding
 2014-06-24 16:25:57 -07:00
Stephen Birarda
5f4baaffa5 revert credit balance rounding 2014-06-24 16:25:41 -07:00
Philip Rosedale
81e7f8e0a5 Merge branch 'master' of https://github.com/worklist/hifi 2014-06-24 16:21:35 -07:00
Philip Rosedale
9eb91e2b44 tweaking params 2014-06-24 16:15:16 -07:00
Philip Rosedale
5bb2c3c62f Added in-world test tone JS file 2014-06-24 16:14:40 -07:00
Stephen Birarda
11f23ca6f6 add POSTing of settings to DS via form2js 2014-06-24 15:56:53 -07:00
Brad Hefta-Gaub
6d77d438ab Merge pull request #3057 from AndrewMeadows/ragdoll 
Ragdoll Part3: avatar shapes self collide (but don't yet affect the joint positions of MyAvatar)
 2014-06-24 15:47:18 -07:00
AndrewMeadows
da45e8a5f8 Merge pull request #3058 from ZappoMan/octreeTests 
added some model tree performance tests
 2014-06-24 14:27:29 -07:00
Stephen Birarda
cf0e1ab1a9 finish up handlebars template for settings 2014-06-24 14:24:56 -07:00
Mohammed Nafees
d5d2107b97 Merge remote-tracking branch 'upstream/master' into 19765 2014-06-25 01:50:29 +05:30
Mohammed Nafees
7271f85041 Change font size values from pt to px in Chat Window. 2014-06-25 01:49:17 +05:30
Stephen Birarda
afe2e57701 add a settings page to DS that uses handlebars template library 2014-06-24 12:33:40 -07:00
Brad Hefta-Gaub
c38790db72 Merge pull request #3068 from ZappoMan/serverSideAudioMixerStats 
make default ring buffer much larger
 2014-06-24 12:19:35 -07:00
wangyix
8e2bb130f7 added extra sample in AudioRingBuffer... 
changed buffer overflow behavior to overwrite old data in writeData;
added overflow behavior to drop silent samples in addSilentFrame
 2014-06-24 12:18:40 -07:00