Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 00:53:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
12641 commits 25 branches 0 tags 1.1 GiB
Commit graph

12641 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stojce Slavkovski
14fee3b727 trivial commit - trigger build 2014-05-06 08:27:46 +02:00
Stojce Slavkovski
13922171ea removed build warnings 2014-05-06 01:08:24 +02:00
Stojce Slavkovski
bcad49d0a9 Merge branch 'master' of https://github.com/worklist/hifi into 19597 2014-05-06 01:05:13 +02:00
Stojce Slavkovski
519b36240c build fix 2014-05-06 01:05:04 +02:00
Brad Hefta-Gaub
e59c4a9aa2 Merge pull request #2783 from AndrewMeadows/inertia 
improved avatar walking on voxels
 2014-05-05 15:49:44 -07:00
Stojce Slavkovski
a5c6d8d996 Merge branch 'master' of https://github.com/worklist/hifi into 19597 2014-05-06 00:24:49 +02:00
AndrewMeadows
1c9cc03693 Merge pull request #2784 from ZappoMan/modelserver 
LOD support to Models & Particles, and some other tweaks
 2014-05-05 15:13:18 -07:00
AndrewMeadows
1647c77728 Merge pull request #2782 from birarda/stats-fix 
fix commented out audio mixer stats
 2014-05-05 14:48:03 -07:00
ZappoMan
b10d9e3903 add LOD support for model and particle rendering 2014-05-05 14:26:51 -07:00
Andrew Meadows
39196501f1 removed some unhelpful comments 2014-05-05 14:23:50 -07:00
Stephen Birarda
14c7e28dc8 remove a comment for node stats in DS 2014-05-05 14:04:09 -07:00
Stephen Birarda
befe75a04c fix broken audio-mixer stats 2014-05-05 14:03:14 -07:00
Stephen Birarda
9ffd93a167 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-05 13:57:19 -07:00
Andrew Meadows
5ffd307926 Merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/avatar/MyAvatar.h
 2014-05-05 13:54:25 -07:00
Andrew Meadows
301c3c5649 don't ignore wall collisions when walking 
also reduced max walk speed
 2014-05-05 13:47:11 -07:00
Andrew Meadows
0c78449cf7 reduce movement speed when walking 2014-05-05 13:28:42 -07:00
Andrew Meadows
815262b802 update _lastFloorContactPoint 2014-05-05 13:06:55 -07:00
Stojce Slavkovski
09c385ba0d Merge branch 'master' of https://github.com/worklist/hifi into 19597 2014-05-05 21:46:17 +02:00
ZappoMan
ccadf3be57 Merge branch 'master' of https://github.com/worklist/hifi into modelserver 2014-05-05 12:39:36 -07:00
Brad Hefta-Gaub
5f2f3db153 Merge pull request #2780 from Atlante45/master 
Fixes
 2014-05-05 12:37:14 -07:00
Stojce Slavkovski
56e7900aa6 Merge fix 2014-05-05 21:36:05 +02:00
ZappoMan
3bb72c04a5 Merge branch 'master' of https://github.com/worklist/hifi into modelserver 2014-05-05 12:36:03 -07:00
ZappoMan
5aabd302fc tweaks to placeModelsWithHands 2014-05-05 12:35:49 -07:00
Andrew Meadows
ec65940212 remove debug #include <StreamUtils.h> 2014-05-05 12:34:56 -07:00
Andrew Meadows
6b129c86d0 reduce snagging when walking across voxel seams 2014-05-05 12:33:05 -07:00
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
Stojce Slavkovski
01ebefde11 Merge branch 'master' of https://github.com/worklist/hifi into 19597 2014-05-05 01:24:15 +02: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