Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-18 20:17:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
12901 commits 17 branches 0 tags 1.1 GiB
Commit graph

12901 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrzej Kapolka
c99f3edbd8 Merge branch 'master' of https://github.com/highfidelity/hifi into priority 2014-05-14 11:01:10 -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
Andrzej Kapolka
eceb600de7 More work on PrioVR integration. 2014-05-13 14:44:24 -07:00
Andrzej Kapolka
f2ba2a48f2 Merge branch 'master' of https://github.com/highfidelity/hifi into priority 2014-05-13 11:38:51 -07:00
Andrzej Kapolka
0321821b55 More work on PrioVR integration. 2014-05-13 11:38:24 -07:00
AndrewMeadows
20749b48da Merge pull request #2842 from AndrewMeadows/master 
Revert "Merge pull request #2834 from andrew/thermonuclear"
 2014-05-13 11:00:04 -07:00
Andrew Meadows
607094075c Revert "Merge pull request #2834 from andrew/thermonuclear" 
This reverts commit e088c3d115, reversing
changes made to d124c0319d.
 2014-05-13 10:38:56 -07:00
Stephen Birarda
debd76b2cb use sheet window modality so OAuth window doesn't take over full screen 2014-05-13 10:38:43 -07:00
Brad Hefta-Gaub
629a6d4440 Merge pull request #2838 from talentraspel/19651 
Stats area is now always right of mirror display
 2014-05-13 08:37:15 -07:00
Brad Hefta-Gaub
e088c3d115 Merge pull request #2834 from AndrewMeadows/thermonuclear 
remove leap fingers
 2014-05-13 08:04:40 -07:00
AndrewMeadows
d124c0319d Merge pull request #2840 from nivardus/menu-go-to-orientation 
Menu.cpp Typo: goToOrientation calling goToDestination.
 2014-05-13 07:50:54 -07:00
Bennett Goble
55d9614757 Menu.cpp Typo: goToOrientation calling goToDestination. 2014-05-13 00:58:49 -04:00
Leonardo Murillo
7a5f6ea0dd Merge pull request #2839 from murillodigital/master 
LibOVR changes
 2014-05-12 19:44:47 -06:00
Leonardo Murillo
c7e103e989 Not working with path_suffixes, testing something else 2014-05-12 19:43:56 -06:00
Andrzej Kapolka
4a0b4de178 Better instructions. 2014-05-12 17:55:07 -07:00
Andrzej Kapolka
6c58bec550 Untabbed. 2014-05-12 17:32:06 -07:00
Andrzej Kapolka
52a3c70bf5 Updates to PrioVR interface. 2014-05-12 17:11:02 -07:00
Leonardo Murillo
1869248351 Moving stuff around 2014-05-12 16:46:24 -06:00
Stephen Birarda
61b28f3f30 Merge pull request #2837 from murillodigital/master 
Change to Oculus find path in Windows
 2014-05-12 15:45:56 -07:00
Leonardo Murillo
415bc64ce9 Moving stuff around 2014-05-12 16:44:15 -06:00
Leonardo Murillo
8b15873488 Change to Oculus find path in Windows 2014-05-12 16:37:52 -06:00
Kai Ludwig
90d577a48c Stats area is now always right of mirror display, regardless if mirror display is enabled or not as there is always a remaining audio meter. 
Display, resize and click cases have been adapted by removing the condition for checking display status of mirror.
 2014-05-13 00:37:36 +02:00