Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-10 10:38:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
12945 commits 25 branches 0 tags 1.1 GiB
Commit graph

427 commits

Author SHA1 Message Date
ZappoMan
0a8dc78c96 tweaks to animation script example 2014-05-14 13:08:32 -07:00
ZappoMan
7c44162209 animated model example 2014-05-14 13:00:35 -07:00
ZappoMan
18de6dddec Merge branch 'master' of https://github.com/worklist/hifi into modelserver 2014-05-14 12:21:44 -07:00
Atlante45
53d7aeab4f Fixed typo 2014-05-14 12:02:38 -07:00
Atlante45
4f93858849 Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_handling_in_editModels 2014-05-14 10:41:29 -07:00
Atlante45
5ef71d6a35 Full mouse handling 2014-05-14 10:40:50 -07:00
Ryan Huffman
dca555a8d4 Merge branch 'master' of git://github.com/highfidelity/hifi into 19614 2014-05-14 09:58:59 -07:00
Ryan Huffman
02676848c6 Fix order of components in streetAreaExample.js 2014-05-14 09:58:04 -07:00
Atlante45
624ae4732f Fixes to PickRay check 2014-05-13 14:58:34 -07:00
Atlante45
701bc63bd1 Removed old toolbar 2014-05-13 14:34:08 -07:00
Atlante45
c59358ac96 First cut at editModels with the mouse 2014-05-13 14:10:01 -07:00
ZappoMan
a56567a369 add support for adjustable FPS 2014-05-13 09:27:31 -07:00
Atlante45
37700c6ad3 Fixed prompt size 2014-05-12 17:10:19 -07:00
Atlante45
261eefd05b Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_handling_in_editModels 2014-05-12 14:09:26 -07:00
ZappoMan
5309c5ad8b add more properties to animated models 2014-05-12 13:44:44 -07:00
ZappoMan
ed6f828b36 Merge branch 'master' of https://github.com/worklist/hifi into modelserver 2014-05-12 09:14:04 -07:00
Philip Rosedale
ea1bcd13a4 Updated guitar with more chords, key triggers 2014-05-09 17:39:03 -07:00
ZappoMan
106c8bffd8 first cut at animations in models 2014-05-09 16:08:06 -07:00
Atlante45
05283cd904 Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_handling_in_editModels 2014-05-09 11:43:33 -07:00
Philip Rosedale
a7f44bf207 double fisted gun action 2014-05-09 00:16:11 -07:00
Philip Rosedale
4a1672957e guitar is now auto-attached 2014-05-08 23:23:44 -07:00
Philip Rosedale
95f6bcbbd6 finish air guitar, gun initial position on hand tweak 2014-05-08 22:54:35 -07:00
Atlante45
cd78be7d25 Some work on mouse tools for editModels.js 2014-05-08 16:47:18 -07:00
Andrzej Kapolka
c02b708ee5 Provide the option to avoid making duplicate attachments. 2014-05-08 15:54:30 -07:00
Brad Hefta-Gaub
9c54576aca Merge pull request #2814 from PhilipRosedale/master 
More arrow controls to move camera in mirror mode, new guitar chords
 2014-05-07 20:02:28 -07:00
Philip Rosedale
e6a8c79f9f Added more arrow controls to move camera when in mirror mode, new guitar chords. 2014-05-07 16:51:22 -07:00
Philip Rosedale
4e1eaf8337 Merge pull request #2809 from Atlante45/mute_env 
Mute environment
 2014-05-07 16:18:23 -07:00
Atlante45
31aedb4aa8 fixed overlay not moving on resize in editModels.js 2014-05-07 14:39:26 -07:00
Philip Rosedale
f6aaaad211 removed some unneeded stuff 2014-05-06 22:44:36 -07:00
Philip Rosedale
fc962749c0 Arrow keys adjust distance from camera in mirror mode, air guitar script 2014-05-06 22:41:08 -07:00
Atlante45
9c9556914e Slow down hydra move 2014-05-06 17:03:19 -07:00
Atlante45
abebb078b0 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-06 13:08:00 -07:00
Atlante45
61c2dd0468 Fixed orientation and offset issues 2014-05-06 13:07:31 -07:00
Ryan Huffman
5a7b133d25 Fix dates in XMLHttpRequest js files 2014-05-06 11:38:12 -07:00
Ryan Huffman
e191b8acb8 Merge remote-tracking branch 'upstream/master' into 19614 2014-05-06 11:32:38 -07:00
Ryan Huffman
39e6e61a6d Add XMLHttpRequest tests and examples 2014-05-06 11:31:33 -07:00
Philip Rosedale
53baf5652e avatar look at indicator smaller grey ball 2014-05-05 18:03:25 -07:00
Philip Rosedale
da0b36ed5c merge fix 2014-05-05 16:21:52 -07:00
Philip Rosedale
691b1d6069 Added lookAt rendering bubble 2014-05-05 16:19:09 -07: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
Andrew Meadows
5ffd307926 Merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/avatar/MyAvatar.h
 2014-05-05 13:54:25 -07:00
ZappoMan
ccadf3be57 Merge branch 'master' of https://github.com/worklist/hifi into modelserver 2014-05-05 12:39:36 -07: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
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
0b4516e09b editModels,js switched to use actual models instead of particles. 2014-05-02 15:32:29 -07:00
Atlante45
55ce204ee3 Merge branch 'master' of https://github.com/highfidelity/hifi into editModels_js 2014-05-02 14:50:52 -07:00
ZappoMan
8443bb0afc fix a scale to fit bug, and add features to place models with hands 2014-05-02 13:19:33 -07:00
Atlante45
ab0a0165c7 Working version of editModels.js 2014-05-02 11:19:12 -07:00