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

9079 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrzej Kapolka
78d9b79805 Another fix for Blender exports. Closes #1762. 2014-01-30 13:24:30 -08:00
Andrzej Kapolka
181670f5d7 Fixes for parsing FBX text encoding. 2014-01-30 12:53:02 -08:00
AndrewMeadows
910b97de21 Merge pull request #1759 from birarda/master 
data-server repairs for get responses
 2014-01-30 10:56:29 -08:00
Stephen Birarda
49d04ce14e data-server repairs for get responses 2014-01-30 10:42:29 -08:00
AndrewMeadows
d556119087 Merge pull request #1755 from birarda/master 
fix for HandData crash
 2014-01-30 09:56:17 -08:00
Stephen Birarda
84ef757af4 fix avatar count, HandData crash (closes #1754) 2014-01-30 09:45:09 -08:00
ZappoMan
c58f44f54a Merge pull request #1735 from AndrewMeadows/fix-particle-avatar-collisions 
Fix crash on shutdown caused by duplicate delete on a QObject
 2014-01-29 17:54:23 -08:00
ZappoMan
44d60614bc Merge pull request #1743 from birarda/dataserver 
fix for data-server crashes
 2014-01-29 16:22:07 -08:00
Stephen Birarda
2f6961f455 remove debug and wrong data-server address 2014-01-29 16:06:12 -08:00
Stephen Birarda
810877b8e4 fix some silly data-server mistakes 2014-01-29 16:05:21 -08:00
AndrewMeadows
6a017e93f1 Merge pull request #1721 from ey6es/metavoxels 
Basic editing and delta streaming for metavoxels.
 2014-01-29 14:21:53 -08:00
Andrzej Kapolka
c456f684b4 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-01-29 13:48:47 -08:00
Andrzej Kapolka
2c08254bf7 Merge pull request #1738 from ey6es/master 
Missing includes.
 2014-01-29 13:48:20 -08:00
Andrzej Kapolka
1e9e298a75 Missing includes. 2014-01-29 13:47:13 -08:00
Andrzej Kapolka
e99b7ea92c Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	assignment-client/src/metavoxels/MetavoxelServer.cpp
	interface/src/MetavoxelSystem.cpp
 2014-01-29 13:34:19 -08:00
Andrzej Kapolka
4c70af51e8 Expand data automatically to encompass edits. 2014-01-29 13:30:54 -08:00
Andrew Meadows
82a4b7a4d1 Merge branch 'master' of ssh://github.com/highfidelity/hifi into fix-particle-avatar-collisions 
Conflicts:
	interface/src/Application.cpp
 2014-01-29 13:20:42 -08:00
AndrewMeadows
4ff400f59f Merge pull request #1725 from birarda/packet-changes 
I looked it over but did not test.  A lot of uint64_t --> qint64 and name changes.
 2014-01-29 13:13:20 -08:00
Stephen Birarda
7d8b7a79ac fix Particle update signature 2014-01-29 12:30:20 -08:00
Stephen Birarda
2dd71435ee fix build breakers for new packet type 2014-01-29 12:25:05 -08:00
Stephen Birarda
33edcea5fb resolve conflicts on merge with upstream master 2014-01-29 12:23:06 -08:00
Andrew Meadows
d757f20d22 Merge branch 'master' of ssh://github.com/highfidelity/hifi into fix-particle-avatar-collisions 
Conflicts:
	interface/src/Application.cpp
 2014-01-29 11:41:39 -08:00
AndrewMeadows
3cfca795e2 Merge pull request #1731 from ZappoMan/more_scripting 
I looked the code over and also did some basic testing (started servers on localhost, logged in with interface).
 2014-01-29 11:34:52 -08:00
ZappoMan
616cfac293 fix init bug 2014-01-29 11:21:45 -08:00
Andrzej Kapolka
69a727c3e1 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-01-29 11:14:48 -08:00
Andrzej Kapolka
154deccbc6 Pass in the starting minimum/size. 2014-01-29 11:14:10 -08:00
Andrew Meadows
43f965c90a Merge branch 'master' of ssh://github.com/highfidelity/hifi into fix-particle-avatar-collisions 2014-01-29 09:25:00 -08:00
ZappoMan
b36cc0bcf9 removed old cruft around mousePitch in Head and unified pitch 2014-01-29 02:09:49 -08:00
ZappoMan
ecd2477007 adding lookWithMouse.js example that uses mouse instead of multi-touch to add the look around feature 2014-01-29 01:01:41 -08:00
ZappoMan
98cdc656c4 more scripting support, including adding a Quat helper class that makes JS quat math easier 2014-01-29 00:56:08 -08:00
ZappoMan
434756a40f removed some dead comments 2014-01-28 20:40:00 -08:00
ZappoMan
bcc7cfb15e removed some debug 2014-01-28 20:38:47 -08:00
ZappoMan
9d87d58723 Merge branch 'master' of https://github.com/worklist/hifi into more_scripting 
Conflicts:
	libraries/particles/src/ParticlesScriptingInterface.cpp
 2014-01-28 20:36:35 -08:00
ZappoMan
39a33b8c7d Merge pull request #1723 from ey6es/master 
Fixes for translucent textures (such as that used in jellyhead.fbx).
 2014-01-28 19:57:40 -08:00
ZappoMan
a73733e57b controller scripting example 2014-01-28 19:48:06 -08:00
ZappoMan
305e69def6 really get controller key, mouse, etc scripting working 2014-01-28 19:47:45 -08:00
ZappoMan
febb306a62 cleaned up some registration of global objects 2014-01-28 19:46:59 -08:00
Andrew Meadows
677341d207 fix for crash bug #1728. 
Moving _myAvatr to live in AvatarManager.  Application still has a
pointer to it.  Unfortunately the order of Application initialization
and destruction matters very much.
 2014-01-28 18:04:42 -08:00
Andrzej Kapolka
5bd7609fbb Merge branch 'master' of https://github.com/highfidelity/hifi 2014-01-28 17:32:55 -08:00
Andrzej Kapolka
2f23d918f6 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-01-28 17:06:04 -08:00
ZappoMan
acf580531b Merge pull request #1729 from birarda/trailing-slash 
handle trailing slash in HTTPManager
 2014-01-28 16:58:20 -08:00
Stephen Birarda
d624654a29 serve a 301 redirect when trailing slash is missing, closes #1712 2014-01-28 16:25:04 -08:00
Andrzej Kapolka
674bc70223 Offset adjustment. 2014-01-28 15:50:13 -08:00
Andrzej Kapolka
f435f61467 Start the grid position off roughly at our feet. 2014-01-28 15:46:02 -08:00
Andrzej Kapolka
b6a15ea6c5 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-01-28 15:12:32 -08:00
Andrzej Kapolka
e10ab8d546 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-01-28 15:10:34 -08:00
ZappoMan
7882d50c5f hacking on controller events 2014-01-28 14:58:20 -08:00
ZappoMan
5addc35cd8 hacking on controller events 2014-01-28 14:58:08 -08:00
ZappoMan
50f36c6b74 Merge pull request #1722 from AndrewMeadows/fix-particle-avatar-collisions 
Fix particle avatar collisions
 2014-01-28 14:57:25 -08:00
Andrew Meadows
e13bc71f39 Adding avatar info back into ParticleCollisionSystem ctor arguments. 2014-01-28 14:43:36 -08:00