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

9265 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philip Rosedale
a9b330baff Merge branch 'master' of https://github.com/worklist/hifi 2014-02-06 07:46:26 -08:00
Philip Rosedale
c1ab02b79d Merge pull request #1901 from ZappoMan/fix_stutter_on_spin 
fix stutter while spinning
 2014-02-06 07:45:33 -08:00
Brad Hefta-Gaub
a16b3a34e4 fix stutter while spinning 2014-02-06 02:18:28 -08:00
Philip Rosedale
0148742bc2 Merge pull request #1898 from ZappoMan/remove_local_cache 
remove local cache option
 2014-02-06 00:06:21 -08:00
ZappoMan
1c47ab9fcb Merge branch 'master' of https://github.com/worklist/hifi into remove_local_cache 2014-02-05 20:57:47 -08:00
ZappoMan
979d323aef Merge pull request #1899 from ZappoMan/fix_warning 
fix warning
 2014-02-05 20:57:33 -08:00
ZappoMan
4410fbb3f2 Merge branch 'master' of https://github.com/worklist/hifi into remove_local_cache 2014-02-05 20:47:35 -08:00
Brad Hefta-Gaub
4f5a27796f fix warning 2014-02-05 20:46:17 -08:00
ZappoMan
3e4ce72b47 Merge pull request #1896 from birarda/library-cleanup 
library and ScriptEngine cleanup
 2014-02-05 20:34:31 -08:00
ZappoMan
6e6eece814 Merge pull request #1894 from AndrewMeadows/issue-1880 
fix for visibility of head geometry when in first-person
 2014-02-05 20:34:05 -08:00
ZappoMan
7c8858c7b6 Merge pull request #1887 from ZappoMan/fixwindowsbuild 
fix windows build errors and warnings
 2014-02-05 20:32:51 -08:00
ZappoMan
7e41d3b7ed Merge pull request #1886 from ZappoMan/bugfixes 
fix spacebar capture
 2014-02-05 20:32:31 -08:00
ZappoMan
f657a3efe9 remove local cache option 2014-02-05 20:02:01 -08:00
Stephen Birarda
f4fe2bb754 move octree-server libs to assignment-client 2014-02-05 16:04:23 -08:00
Philip Rosedale
1d5248e3a4 Merge branch 'master' of https://github.com/worklist/hifi 2014-02-05 15:38:54 -08:00
Andrew Meadows
4e8dd7c92a Merge branch 'master' of ssh://github.com/highfidelity/hifi into issue-1880 2014-02-05 15:37:12 -08:00
Stephen Birarda
5fdec5a18d Merge pull request #1893 from birarda/master 
fixes for assignment-client Agent
 2014-02-05 15:36:23 -08:00
Andrew Meadows
aa3a1a9a72 Stop rendering our head in first person camera mode. 2014-02-05 15:35:57 -08:00
Stephen Birarda
9694a622b5 update placeholder and give edit packet senders to Agent 2014-02-05 15:35:13 -08:00
AndrewMeadows
2fcc4271c4 Merge pull request #1892 from ZappoMan/OctreeSendThread_crash 
fix crash in octree server related to getActiveSocket() returning NULL
 2014-02-05 15:07:29 -08:00
ZappoMan
ce30e83113 fix crash in octree server related to getActiveSocket() returning NULL 2014-02-05 14:56:00 -08:00
ZappoMan
5059f27067 update README to reference build notes for Windows and Ubuntu and Qt 5.2 2014-02-05 14:08:42 -08:00
ZappoMan
8cc4666f2a fix spacing 2014-02-05 14:00:17 -08:00
ZappoMan
b0ccedd1a6 fix spacing 2014-02-05 13:59:17 -08:00
Brad Hefta-Gaub
a05e07460f fix windows build errors and warnings 2014-02-05 13:54:17 -08:00
ZappoMan
3e08a0b48b fix spacebar capture 2014-02-05 13:26:46 -08:00
Philip Rosedale
0b4fb3dd23 Merge branch 'master' of https://github.com/worklist/hifi 2014-02-05 12:44:41 -08:00
Philip Rosedale
7d5366a1b8 Merge pull request #1881 from birarda/audio-fixes 
repairs to audio so buffers don't climb
 2014-02-05 12:33:07 -08:00
Stephen Birarda
96fd73a766 fixed wrapped read of samples from end of buffer 2014-02-05 11:39:03 -08:00
Stephen Birarda
cff4994c01 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-fixes 2014-02-05 11:04:24 -08:00
ZappoMan
98967189ac Merge pull request #1878 from ZappoMan/bugfixes 
fix particle init
 2014-02-05 10:32:17 -08:00
ZappoMan
76bc4564ad push to force rebuild 2014-02-05 10:24:00 -08:00
Stephen Birarda
6b3b03228e audio repairs so buffers do not climb 2014-02-05 10:22:07 -08:00
ZappoMan
53e7cd7797 fix particle init 2014-02-05 10:16:43 -08:00
AndrewMeadows
42528be7ca Merge pull request #1846 from ZappoMan/fixdebugoutput 
fix debug to properly work with outputBufferBits()
 2014-02-05 10:03:09 -08:00
ZappoMan
38c180065d Merge pull request #1863 from AndrewMeadows/stable-camera 
Fix #1862 camera should not follow head orientation when using faceshift
 2014-02-05 09:58:05 -08:00
Philip Rosedale
4cba03dd67 Merge branch 'master' of https://github.com/worklist/hifi 2014-02-05 07:29:15 -08:00
Stephen Birarda
c194ad1b2d Merge pull request #1873 from ZappoMan/bugfixes 
Fix corruption in voxel packets
 2014-02-04 23:17:45 -08:00
ZappoMan
1b9cc4f5a5 more fixup to octree packets 2014-02-04 23:02:56 -08:00
ZappoMan
b0c41b086d fix voxel packet corruption 2014-02-04 22:54:55 -08:00
Philip Rosedale
d88d598e2b Merge branch 'master' of https://github.com/worklist/hifi 2014-02-04 21:29:38 -08:00
Philip Rosedale
d416f33e67 Merge pull request #1872 from ZappoMan/invaders_tweaks 
Invaders tweaks
 2014-02-04 21:29:23 -08:00
ZappoMan
5afe184c3b removed debug 2014-02-04 21:16:07 -08:00
ZappoMan
7ffe73bf6e added the cannon as voxels 2014-02-04 21:14:49 -08:00
ZappoMan
15be49cb8d latest changes to space invaders 2014-02-04 21:08:12 -08:00
ZappoMan
758c1e0817 add examples for setting model scale and translation 2014-02-04 20:28:11 -08:00
ZappoMan
2f14b265a8 make sure SVO files with version details are supported 2014-02-04 20:24:08 -08:00
ZappoMan
13d9b710f1 bump packet version 2014-02-04 20:23:12 -08:00
ZappoMan
a35e5eeb92 move modelScale before translation and rotation since that seems to fix the corruption 2014-02-04 20:20:06 -08:00
ZappoMan
305e34e834 more tweaks to particles with models rendering to make space invaders work 2014-02-04 20:18:45 -08:00