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

9226 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
aa3a1a9a72 Stop rendering our head in first person camera mode. 2014-02-05 15:35:57 -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
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
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
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
Andrew Meadows
1ad2171952 Fix #1862 camera should not follow head orientation when using faceshift 2014-02-04 15:23:10 -08:00
Philip Rosedale
29af3d7833 Merge pull request #1854 from ZappoMan/invaders_tweaks 
Invaders tweaks
 2014-02-04 14:30:53 -08:00
ZappoMan
785e76102f change game at for space invaders to be close to avatar 2014-02-04 14:22:22 -08:00
ZappoMan
461a600d7f add sounds to space invaders 2014-02-04 14:04:33 -08:00
ZappoMan
055dae5f78 tweak modelScale to 2.0 for better space invaders 2014-02-04 14:04:21 -08:00
ZappoMan
468cd0d8bb temporary hack to work around model scale data corruption 2014-02-04 13:21:31 -08:00
ZappoMan
2b429ba2d3 downward motion to space invaders 2014-02-04 13:18:19 -08:00
ZappoMan
2cf2e693b9 fix debug to properly work with outputBufferBits() 2014-02-04 12:29:55 -08:00
Stephen Birarda
f1b612d8d8 Merge pull request #1835 from birarda/master 
fix for toyball crash
 2014-02-03 16:27:01 -08:00
Stephen Birarda
d563c89482 fix for ScriptEngine crash 2014-02-03 16:25:38 -08:00
Stephen Birarda
f11ac778c2 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-03 16:16:23 -08:00
ZappoMan
c739c2452a Merge pull request #1832 from birarda/script-timer 
hide ScriptEngine calls from JS
 2014-02-03 12:45:41 -08:00
AndrewMeadows
6dc959f780 Merge pull request #1831 from ZappoMan/scripting 
More scripting work
 2014-02-03 12:43:56 -08:00
ZappoMan
d04a9c4d05 Merge pull request #1823 from AndrewMeadows/cleanup 
cleanup: moving stuff out of Application and AvatarManager into MyAvatar
 2014-02-03 12:39:13 -08:00
Andrew Meadows
cb186b10db Merge branch 'master' of ssh://github.com/highfidelity/hifi into cleanup 
Conflicts:
	interface/src/Application.cpp
 2014-02-03 12:29:44 -08:00
ZappoMan
f33f4e9cc2 change invaders to use absolute positions 2014-02-03 11:09:30 -08:00
Stephen Birarda
a5cee02cc7 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-03 11:03:01 -08:00
ZappoMan
f41d2a3c02 change Agent to Script 2014-02-03 10:35:25 -08:00
Stephen Birarda
028eec7164 don't allow calls to init, run, evaluate from JS 2014-02-03 10:33:31 -08:00
ZappoMan
0bcbe485c0 Merge pull request #1815 from birarda/script-timer 
expose QTimer to the script engine
 2014-02-03 10:27:04 -08:00
Stephen Birarda
e2842ab7a4 stop timers when the script does, add cleanup methods 2014-02-03 10:10:58 -08:00
ZappoMan
8b2f185937 always emit update even when no servers 2014-02-03 10:05:26 -08:00
ZappoMan
906d913d71 added more examples, updated lookWithMouse.js to support alwaysLook 2014-02-03 10:05:07 -08:00
Stephen Birarda
9dd8c11e1e change script timer setup to match HTML dom standard 2014-02-03 09:59:16 -08:00
Stephen Birarda
d9cfaec4f0 Merge branch 'master' of https://github.com/highfidelity/hifi into script-timer 2014-02-03 09:32:13 -08:00
Stephen Birarda
e6c0aa1082 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-03 09:29:27 -08:00
ZappoMan
8797c35834 Merge pull request #1824 from ey6es/master 
Fixes for transforms and blendshapes on Blender FBX exports.
 2014-01-31 22:05:14 -08:00
Andrzej Kapolka
2b4876181a Different take on the transform fix. 2014-01-31 19:38:45 -08:00
Andrzej Kapolka
ee0b6fad55 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-01-31 19:00:58 -08:00
Andrzej Kapolka
e1350f8e24 Trying out a transform tweak. 2014-01-31 19:00:24 -08:00
ZappoMan
ed3f7b9d28 Merge pull request #1822 from birarda/cleanup 
application destructor cleanup, spacing cleanup
 2014-01-31 18:03:19 -08:00
Andrew Meadows
32df731aae Merge branch 'master' of ssh://github.com/highfidelity/hifi into cleanup 2014-01-31 17:55:05 -08:00