Andrzej Kapolka
553e6d7313
Merge branch 'master' of https://github.com/highfidelity/hifi into priority
2014-05-13 16:11:22 -07: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
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
Andrew Meadows
607094075c
Revert "Merge pull request #2834 from andrew/thermonuclear"
...
This reverts commit e088c3d115d124c0319d
2014-05-13 10:38:56 -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
Bennett Goble
55d9614757
Menu.cpp Typo: goToOrientation calling goToDestination.
2014-05-13 00:58:49 -04: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
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
Andrzej Kapolka
e0486b2654
Starting on PrioVR integration.
2014-05-12 15:25:25 -07:00
AndrewMeadows
3e78d63e34
Merge pull request #2833 from stojce/19597
...
fixed mention sounds dir for deployment
2014-05-12 14:33:21 -07:00
AndrewMeadows
5a0f4e99a5
Merge pull request #2832 from ey6es/master
...
After uploading new models, refresh locally cached versions so that the change is immediately apparent.
2014-05-12 14:32:23 -07:00
Andrew Meadows
a1a5372b74
add missing glPushMatrix()
2014-05-12 14:07:33 -07:00
Andrzej Kapolka
8541df9c32
Remember attachment parameters per joint (as well as the last joint used) so
...
that the gun script correctly allows both guns' positions to be tweaked.
2014-05-12 12:16:30 -07:00
Andrew Meadows
46ec3accfd
merge upstream/master into andrew/thermonuclear
2014-05-12 11:55:59 -07:00
Stojce Slavkovski
7ffb700564
fixed mention sounds dir for deployment
2014-05-12 20:55:24 +02:00
Andrew Meadows
cea472b730
remove the last of Leap specific cruft
2014-05-12 11:48:56 -07:00
Andrew Meadows
efb3edf400
Store sixense data in meters not millimeters
2014-05-12 11:39:21 -07:00
Andrew Meadows
49dedb72c9
remove FingerData class and related cleanup
2014-05-12 11:09:12 -07:00
Andrzej Kapolka
47268fef32
Fixed kooky conditional.
2014-05-12 11:06:14 -07:00
Andrzej Kapolka
501d071eb1
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-05-12 11:04:50 -07:00
Andrzej Kapolka
e1266ef74d
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-05-12 10:48:41 -07:00
Stojce Slavkovski
070d996096
change key missing message
2014-05-12 19:47:41 +02:00
Stojce Slavkovski
ff9daa257c
Merge branch 'master' of https://github.com/worklist/hifi into 19507
2014-05-12 19:42:44 +02:00
Clément Brisset
1d8b4432ff
Merge pull request #2831 from huffman/fix-ui-images
...
#19647 Fix missing file warning
2014-05-12 09:34:12 -07:00
Stojce Slavkovski
c835f2183e
Merge branch 'master' of https://github.com/worklist/hifi into 19507
2014-05-12 18:32:46 +02:00
Clément Brisset
db9f2c563b
Merge pull request #2830 from huffman/19645
...
Code Review for Job #19645
2014-05-12 08:58:06 -07:00
Kai Ludwig
3e1d0536c1
Fix for: #19626 - Fix the Windows 7 crash
...
The image data for glTexImage2D is size=width x height without any borders. So there must be a border of 0 given when calling glTexImage2D, otherwise there is not enough image data causing crashes when textures get loaded.
The effect occurs reproducible on Win7 with ATI cards. Maybe their OpenGL-Implementation is less robust ...
2014-05-11 16:18:46 +02:00
Stojce Slavkovski
3b7e0814fe
CR fixes
2014-05-11 09:57:43 +02:00
Stojce Slavkovski
ac8d27ee3a
Merge branch 'master' of https://github.com/worklist/hifi into 19507
2014-05-11 09:53:22 +02:00
Andrzej Kapolka
363f545f7c
After uploading, refresh the uploaded files so that they are immediately
...
redownloaded.
2014-05-09 17:50:08 -07:00
Philip Rosedale
6a5affba3d
Merge pull request #2826 from ey6es/master
...
Fix for scripts' not correctly removing/reattaching on restart, don't render head attachments in first person mode.
2014-05-09 15:32:50 -07:00
Andrzej Kapolka
3329cb7638
Set the LOD distance on attachments (controls the load priority, too).
2014-05-09 15:25:48 -07:00
Andrzej Kapolka
0474375a39
Don't render head attachments in first person mode.
2014-05-09 15:13:58 -07:00
Philip Rosedale
e1717b1c53
Fix bug with mirror settings not initialized
2014-05-09 15:02:47 -07:00
Andrzej Kapolka
b9fecb8b92
Wait for scripts to finish before restarting them.
2014-05-09 14:34:13 -07:00
Stojce Slavkovski
9aa9b08397
Merge branch 'master' of https://github.com/worklist/hifi into 19507
2014-05-09 19:55:18 +02:00
Andrew Meadows
217080fe1d
cleanup - remove unused leap fingers
2014-05-09 10:27:01 -07:00
Philip Rosedale
8c5a1c7bc8
Merge pull request #2822 from ey6es/master
...
Save attachment data for skeleton/attachment combinations so that they persist even when the attachment isn't present, and users can tweak script-attached models.
2014-05-08 19:42:57 -07:00
Philip Rosedale
14bab0adbc
Merge pull request #2821 from AndrewMeadows/inertia
...
avatar walks up ledges
2014-05-08 19:40:09 -07:00
Andrzej Kapolka
c424f6ce69
Save attachment data for attachment model/skeleton model combinations, let
...
scripts use those saved parameters so that you can tweak the location of
(for example) the gun and have it saved appropriately.
2014-05-08 18:00:41 -07:00
Andrew Meadows
d725be37d0
merge upstream/master into andrew/inertia
2014-05-08 17:11:55 -07:00
Andrew Meadows
f019e2366e
Add lift for walking up stairs
...
Also some fixes for freeing avatars trapped in voxel collisions
2014-05-08 17:10:02 -07:00
Andrzej Kapolka
acab09b89a
Update billboard when attachments change.
2014-05-08 16:23:15 -07:00
Andrzej Kapolka
c02b708ee5
Provide the option to avoid making duplicate attachments.
2014-05-08 15:54:30 -07:00
Stojce Slavkovski
96a9a47871
minor code fixes
2014-05-08 20:54:28 +02:00
