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

12940 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrzej Kapolka
7bee0478be More work on integrating IK solution from Sixense. 2014-05-15 11:30: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
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
Ryan Huffman
a5c10220e6 Remove _ prefix from private methods in XMLHttpRequest 2014-05-14 10:16:04 -07:00
Ryan Huffman
c16654628a Add carriage return to escaped string in print() 2014-05-14 10:08:54 -07:00
Ryan Huffman
bd56ab911d Fix bug with js print() breaking on certain characters 
The message text needs to be escaped before beign evaluated.
 2014-05-14 10:05:04 -07:00
Brad Hefta-Gaub
fecd56d177 Merge pull request #2851 from AndrewMeadows/bispinor 
removal of FingerData revisited
 2014-05-14 10:02:16 -07:00
Stephen Birarda
efdc61c612 Merge pull request #2849 from stojce/19597 
added discourse key in shift operators
 2014-05-14 10:00:37 -07:00
Brad Hefta-Gaub
fab1fcb8b5 Merge pull request #2850 from huffman/19654 
19654 - Fix running scripts not properly updated when done programmatically
 2014-05-14 09:59:52 -07:00
Ryan Huffman
dca555a8d4 Merge branch 'master' of git://github.com/highfidelity/hifi into 19614 2014-05-14 09:58:59 -07:00
Brad Hefta-Gaub
f12d47181c Merge pull request #2844 from talentraspel/19652 
Changed start domain to sandbox. Changed start location to xyz: 6270, 21...
 2014-05-14 09:58:29 -07:00
Ryan Huffman
02676848c6 Fix order of components in streetAreaExample.js 2014-05-14 09:58:04 -07:00
Brad Hefta-Gaub
c397db3606 Merge pull request #2845 from talentraspel/19656 
No more hand movement when clicking with the mouse.
 2014-05-14 09:57:56 -07:00
Ryan Huffman
310f184978 Add getters for onTimeout and onReadyStateChange 2014-05-14 09:53:44 -07:00
Ryan Huffman
146b9958cb Fix style issue 2014-05-14 09:41:13 -07:00
Andrew Meadows
aad9d0441e merge upstream/master to andrew/bispinor 
Conflicts:
	interface/src/avatar/Hand.cpp
	interface/src/avatar/SkeletonModel.cpp
	libraries/avatars/src/HandData.cpp
	libraries/avatars/src/HandData.h
 2014-05-14 09:38:31 -07:00
Andrew Meadows
498f2843b0 Fix for bad hand rotations 2014-05-14 09:06:46 -07:00
Andrew Meadows
366e9c7d34 PalmDataA::getPalmDirection --> getNormal() 2014-05-14 09:05:54 -07:00
Andrew Meadows
d2d9ca8788 optimization: only compute baseTransform once 2014-05-14 09:04:59 -07:00
Stojce Slavkovski
8247e5a552 added discourse key in shift operators 2014-05-14 17:25:40 +02:00
Kai Ludwig
b01b144854 No more hand movement when clicking with the mouse. 2014-05-14 07:36:27 +02:00
Ryan Huffman
d59bedfa96 Fix running scripts not properly updated when done programmatically 
Add a slot to Application to receive ScriptEngine::finished signals.
Notify the Running scripts widget of stopped scripts so it can properly
move them to the recent scripts list.
 2014-05-13 22:25:08 -07:00
Kai Ludwig
19404fe0e5 Changed start domain to sandbox. Changed start location to xyz: 6270, 211, 6000. 
goHome behaviour is unchanged and will still just go to the start location keeping the currently select domain.
 2014-05-14 07:10:31 +02:00
Andrzej Kapolka
553e6d7313 Merge branch 'master' of https://github.com/highfidelity/hifi into priority 2014-05-13 16:11:22 -07:00
Leonardo Murillo
98c957f371 Merge pull request #2843 from ey6es/master 
Fix for Visage on Windows.
 2014-05-13 16:55:01 -06:00
Andrzej Kapolka
da70813002 On Windows, Visage takes the folder containing the license file, not the 
license file itself.
 2014-05-13 15:45:24 -07:00
Andrzej Kapolka
bca5636f9b Looks like "reflection" can be used as a synonym for "specular." 2014-05-13 15:05:00 -07:00
Atlante45
624ae4732f Fixes to PickRay check 2014-05-13 14:58:34 -07:00