Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 16:33:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
12965 commits 71 branches 56 tags 1.2 GiB
Commit graph

12965 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrzej Kapolka
e415006526 Fixed index of out bounds error, issue with head not being tracked in 
PrioVR.
 2014-05-15 18:22:57 -07:00
Andrzej Kapolka
e5ef65242f Merge branch 'master' of https://github.com/highfidelity/hifi into priority 2014-05-15 17:44:54 -07:00
Andrzej Kapolka
a544489f30 First cut at adding external joysticks to the mix. 2014-05-15 17:44:35 -07:00
AndrewMeadows
ecbe61e32a Merge pull request #2864 from Atlante45/fix_jittery_overlays 
Add ability to anchor an overlay
 2014-05-15 17:32:33 -07:00
AndrewMeadows
0f2cb46188 Merge pull request #2863 from ey6es/master 
Added alternate IK method for Hydras from code provided by Sixense.
 2014-05-15 17:29:27 -07:00
Andrzej Kapolka
946e2b5743 Avoid unused variable warnings in Xcode. 2014-05-15 17:15:25 -07:00
Andrzej Kapolka
6dd08ca1bf Working on joystick support using SDL. 2014-05-15 17:09:28 -07:00
Atlante45
61fd09e0bd Add ability to anchor an overlay 2014-05-15 16:24:31 -07:00
Andrzej Kapolka
301234a397 Tabs -> spaces. 2014-05-15 15:34:01 -07:00
Andrzej Kapolka
3eefb6a93e Rotation bits for alternate IK. 2014-05-15 15:32:32 -07:00
Philip Rosedale
074a6b7f38 Merge pull request #2861 from birarda/master 
send an updated address to data-server with domain (when changed)
 2014-05-15 14:01:39 -07:00
Philip Rosedale
e7e26aa475 Merge pull request #2860 from ey6es/priority 
PrioVR tweaks: average over two frames, use Faceshift head rotation when PrioVR one is unavailable.
 2014-05-15 13:31:05 -07:00
Stephen Birarda
8e9defad3e send an updated address to data-server with domain (when changed) 2014-05-15 12:18:24 -07:00
Andrzej Kapolka
8ee2642f0e Fixed compile error. 2014-05-15 12:10:59 -07:00
Andrzej Kapolka
c12f436a7c Try smoothing the PrioVR input over a couple of frames. 2014-05-15 11:47:11 -07:00
Andrzej Kapolka
f28ba72f75 When PrioVR is connected but head rotation is unavailable, use Faceshift 
rotation.
 2014-05-15 11:37:58 -07:00
Andrzej Kapolka
94988ed5e6 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-15 11:31:30 -07:00
Andrzej Kapolka
7bee0478be More work on integrating IK solution from Sixense. 2014-05-15 11:30:09 -07:00
Stephen Birarda
491e915c93 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-15 10:45:45 -07:00
AndrewMeadows
565f6b9491 Merge pull request #2858 from ZappoMan/modelserver 
Fix bug where sometimes models don't render
 2014-05-15 09:51:43 -07:00
Brad Hefta-Gaub
4c05f4f374 Merge pull request #2857 from ctrlaltdavid/interface_log_dir 
Fix interface log file location
 2014-05-15 08:58:53 -07:00
ZappoMan
0db242bbaa cleanup debug 2014-05-15 00:46:09 -07:00
ZappoMan
62eb8335e9 Merge branch 'master' of https://github.com/worklist/hifi into modelserver 2014-05-15 00:40:47 -07:00
ZappoMan
ca2d2c751c fixing models not rendering sometimes 2014-05-15 00:34:09 -07:00
Andrzej Kapolka
8388255542 Working on alternate IK mode. 2014-05-14 15:29:16 -07:00
Philip Rosedale
186f7766fc Merge pull request #2856 from ZappoMan/modelserver 
Animation Support in Models
 2014-05-14 15:03:49 -07:00
Philip Rosedale
d0df4f22cd Merge pull request #2855 from ey6es/priority 
Basic PrioVR integration (Windows only).
 2014-05-14 14:50:34 -07:00
David Rowe
dbfa60ff1b Fix interface log file location 
Put in \High Fidelity\Interface\Logs rather than \interface\Logs.
 2014-05-14 14:46:48 -07:00
ZappoMan
f6c1d3e635 clean up animations 2014-05-14 14:00:31 -07:00
Andrzej Kapolka
4346040520 Merge branch 'priority' of https://github.com/ey6es/hifi into priority 2014-05-14 13:56:04 -07:00
Andrzej Kapolka
2cc3720217 Merge branch 'master' of https://github.com/highfidelity/hifi into priority 2014-05-14 13:55:31 -07:00
Andrzej Kapolka
95c05a720d Tabs -> spaces. 2014-05-14 13:48:03 -07:00
Andrzej Kapolka
4cbe8a41db Add PrioVR to .gitignore. 2014-05-14 13:40:03 -07:00
Andrzej Kapolka
cf230d1cc3 PrioVR tweaks. 2014-05-14 13:36:26 -07:00
ZappoMan
fa20e8ff95 fix the agent support for scripting models 2014-05-14 13:17:10 -07:00
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
0c34d9e065 cleanup remove some debug 2014-05-14 12:59:59 -07:00
ZappoMan
18de6dddec Merge branch 'master' of https://github.com/worklist/hifi into modelserver 2014-05-14 12:21:44 -07:00
Brad Hefta-Gaub
e3373a473a Merge pull request #2854 from Atlante45/mouse_handling_in_editModels 
Mouse handling in edit models
 2014-05-14 12:07:37 -07:00
Atlante45
53d7aeab4f Fixed typo 2014-05-14 12:02:38 -07:00
Andrzej Kapolka
c99f3edbd8 Merge branch 'master' of https://github.com/highfidelity/hifi into priority 2014-05-14 11:01:10 -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
Brad Hefta-Gaub
8bb5b90f05 Merge pull request #2852 from huffman/19614 
Code Review for Job #19614
 2014-05-14 10:40:14 -07:00
Andrzej Kapolka
3db3154a5b Merge branch 'master' of https://github.com/highfidelity/hifi into priority 2014-05-14 10:29:58 -07:00
Andrzej Kapolka
498f9e73ac Merge branch 'master' of https://github.com/highfidelity/hifi into priority 
Conflicts:
	interface/src/avatar/SkeletonModel.cpp
 2014-05-14 10:23:44 -07:00
Brad Hefta-Gaub
f03e9f8364 Merge pull request #2841 from birarda/master 
use sheet modality so OAuth window doesn't take over full screen
 2014-05-14 10:23:43 -07:00
Brad Hefta-Gaub
6b03a12f03 Merge pull request #2853 from huffman/fix-print 
Fix bug with js print() breaking on certain characters
 2014-05-14 10:23:31 -07:00
Stephen Birarda
3bce9f542a Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-14 10:18:28 -07:00