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

12669 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
ddc9408a55 commit implementation of deleteLastCollision() 2014-05-05 12:32:23 -07:00
Andrew Meadows
f6b2b43376 forget collision for this failure case 2014-05-05 12:31:36 -07:00
Andrew Meadows
d2f858100e add CollisionList::deleteLastCollision() 2014-05-05 12:30:38 -07:00
Atlante45
1ecf0e3b9d Used wrong formula in previous commit 2014-05-05 11:43:58 -07:00
Atlante45
7855bf8e24 Fix scale issue in editVoxels.js (closes #2776) 2014-05-05 11:35:50 -07:00
Atlante45
31b5c39f16 Fix warnings 2014-05-05 11:17:11 -07:00
Atlante45
7f7cd6f654 Fix for OS X Fullscreen (closes #2414) 2014-05-05 11:15:55 -07:00
Andrew Meadows
0cecef6441 fix "nearly but not quite" edge/corner collisions 2014-05-05 10:01:31 -07:00
Andrew Meadows
b097eed1aa fix sphere-cube collisions at edges (really) 2014-05-05 08:47:02 -07:00
Andrew Meadows
1d64262067 whoops, committed wrong file. Rolling back. 2014-05-05 08:46:35 -07:00
Andrew Meadows
6cc8d53a6d fix sphere-cube collisions at edges 2014-05-04 22:14:05 -07:00
Andrzej Kapolka
e898b4a900 More attachment bits. 2014-05-04 17:24:15 -07:00
Andrzej Kapolka
53a2760905 More attachment bits. 2014-05-04 16:24:23 -07:00
Stojce Slavkovski
01ebefde11 Merge branch 'master' of https://github.com/worklist/hifi into 19597 2014-05-05 01:24:15 +02:00
Andrzej Kapolka
e0400dbd9c Working on allowing attachment models to be uploaded. 2014-05-04 15:23:31 -07:00
Andrzej Kapolka
2bc605e193 Merge pull request #2779 from PhilipRosedale/master 
Remove dead ‘play slaps’ code
 2014-05-04 13:33:03 -07:00
Stojce Slavkovski
37664d3877 Merge branch 'master' of https://github.com/worklist/hifi into 19597 2014-05-04 18:32:01 +02:00
Philip Rosedale
ab0e854336 Removed session UUID from interface title bar 2014-05-03 11:33:39 -07:00
Philip Rosedale
adb301bfe3 Merge pull request #2778 from thoys/readme-update 
There are 6 assignment-client types right now
 2014-05-03 10:55:40 -07:00
Philip Rosedale
d1c9032c8f Merge pull request #2777 from ey6es/master 
Fixes for ASCII-encoded FBX models, removed camera pushback entirely from first person camera mode.
 2014-05-03 09:53:36 -07:00
Philip Rosedale
eb991b60ce Remove dead ‘play slaps’ code 2014-05-03 09:08:26 -07:00
Thijs Wenker
2f1e5ad5ca description update 2014-05-03 14:51:16 +02:00
Thijs Wenker
13170ce23f There are 6 assignment-client types right now 2014-05-03 14:48:32 +02:00
Andrew Meadows
0e3d66caf6 fix incorrect rescale of vec3 2014-05-02 22:27:52 -07:00
Andrew Meadows
c8e56a97cc fix sphere-cube collisions, with tests 2014-05-02 21:47:27 -07:00
Andrzej Kapolka
3a4dfb92f6 Let's try using the neck parent rotation, rather than the neck, to fix 
separate heads.
 2014-05-02 19:37:42 -07:00
Andrzej Kapolka
9e6b29951d Whoops! 2014-05-02 19:14:40 -07:00
Andrzej Kapolka
9959d8d73f OK, this time for sure. 2014-05-02 19:06:44 -07:00
Andrzej Kapolka
8ec03979da OK, one more try. 2014-05-02 18:14:17 -07:00
Andrzej Kapolka
3e8b5c8714 Let's try that again. 2014-05-02 18:03:54 -07:00
Andrzej Kapolka
0c8b3eaf1a Yet another check. 2014-05-02 17:56:23 -07:00
Andrzej Kapolka
a1eeef3feb Out-of-bounds check. 2014-05-02 17:52:52 -07:00
Stephen Birarda
7921d33716 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-02 17:47:48 -07:00
Andrzej Kapolka
c08dfc90c3 Add a hack to fix normals on Makehuman exports. 2014-05-02 17:46:11 -07:00
Andrzej Kapolka
b458cd1297 Default joint mappings for Makehuman models. 2014-05-02 17:29:38 -07:00
Andrzej Kapolka
93cb5fc330 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-02 17:21:51 -07:00
Philip Rosedale
9aac74035c Merge pull request #2771 from birarda/oauth-ds 
restrict access to domains using user roles retreived from data-web
 2014-05-02 17:09:52 -07:00
Andrzej Kapolka
4c49d00683 Scale adjustment for Makehuman models. 2014-05-02 17:01:07 -07:00
Stephen Birarda
1f35c07420 more repairs to OAuth signal/slot connection 2014-05-02 16:58:06 -07:00
Stephen Birarda
2dacc81960 use old signal/slot notation in OAuthWebViewHandler 2014-05-02 16:47:49 -07:00
Philip Rosedale
4c2a1426a9 Merge pull request #2775 from Atlante45/editModels_js 
Edit models js
 2014-05-02 16:34:26 -07:00
Stephen Birarda
59ad09bfda fix another missed casing issue 2014-05-02 16:34:06 -07:00
Andrzej Kapolka
6f3b3acc86 Remove pushback entirely for other avatars. 2014-05-02 16:27:39 -07:00
Andrzej Kapolka
0b2f272abe Fix (well, partial fix) for ASCII FBX files exported from Makehuman. 2014-05-02 16:26:44 -07:00
Stephen Birarda
1fda012364 fix another casing issue in OAuthWebViewHandler 2014-05-02 16:22:12 -07:00
Stephen Birarda
53eddab43c fix typo for OAuth header include 2014-05-02 15:52:50 -07:00
Clément Brisset
5918899cf7 Merge pull request #2773 from ey6es/master 
Fix for head/eye rotation on models without separate heads.
 2014-05-02 15:43:08 -07:00
Atlante45
48facce85f coding standard 2014-05-02 15:34:07 -07:00
Atlante45
0b4516e09b editModels,js switched to use actual models instead of particles. 2014-05-02 15:32:29 -07:00
Andrzej Kapolka
f3948d5e62 If "collide with avatars" is off, don't attempt camera pushback. 2014-05-02 15:02:40 -07:00