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
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
Clément Brisset
f21f5aded9
Merge pull request #2819 from stojce/19507
...
Code Review for Job #19507
2014-05-12 10:59:58 -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
Philip Rosedale
4437ad9140
Merge pull request #2829 from talentraspel/19626
...
Fix for: #19626 - Fix the Windows 7 crash
2014-05-11 12:47:42 -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
Clément Brisset
45197c7c01
Merge pull request #2827 from PhilipRosedale/master
...
Updated guitar with more chords, key triggers
2014-05-10 11:30:07 -07: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
ea1bcd13a4
Updated guitar with more chords, key triggers
2014-05-09 17:39:03 -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
Philip Rosedale
711d5268bb
Merge pull request #2825 from PhilipRosedale/master
...
Fix bug with mirror settings not initialized
2014-05-09 15:32:07 -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
Brad Hefta-Gaub
55c92829de
Merge pull request #2824 from AndrewMeadows/inertia
...
cleanup - remove unused leap fingers
2014-05-09 10:47:48 -07:00
Andrew Meadows
217080fe1d
cleanup - remove unused leap fingers
2014-05-09 10:27:01 -07:00
AndrewMeadows
4e94d12da9
Merge pull request #2823 from PhilipRosedale/master
...
Finishing airGuitar, added autoloading guitar model
2014-05-09 08:48:50 -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
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
6ff17d5ed0
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-05-08 18:04:47 -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
Philip Rosedale
52d3c49fa7
Merge pull request #2820 from ey6es/master
...
Scripting interface for avatar attachments.
2014-05-08 17:21:11 -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
Andrzej Kapolka
f866828db2
Avatar attachment scripting bits.
2014-05-08 15:20:14 -07:00
Stojce Slavkovski
96a9a47871
minor code fixes
2014-05-08 20:54:28 +02:00
Stojce Slavkovski
863a8887d3
Merge branch 'master' of https://github.com/worklist/hifi into 19507
2014-05-08 20:29:26 +02:00
Brad Hefta-Gaub
cb14cc59c2
Merge pull request #2817 from PhilipRosedale/master
...
Clear visualization of hand/palm targets, improved audio scope
2014-05-08 11:13:06 -07:00
Stephen Birarda
304e30e9d8
Merge pull request #2818 from birarda/stop-sound
...
make sure shouldStop for injector defaults to false
2014-05-08 11:12:47 -07:00
Stephen Birarda
a8a53e35dd
make sure shouldStop for injector defaults to false
2014-05-08 11:12:16 -07:00
Stojce Slavkovski
a1c31522ba
Merge branch 'master' of https://github.com/worklist/hifi into 19507
2014-05-08 20:09:36 +02:00
Philip Rosedale
71789b65e7
remove debug
2014-05-08 11:02:35 -07:00
Ryan Huffman
fdaa42b219
Add hifi:// clickable links to chat
...
The handling also needed to be updated to handle domains correctly -
just routing to goToURL instead of gTo fixes this.
2014-05-08 07:54:49 -07:00
Ryan Huffman
ef67a72f23
Remove icon paths from runningScriptsWidget.ui
...
These icon paths are already set programmatically.
2014-05-08 07:22:55 -07:00
Philip Rosedale
4185faa82a
Tweaks to improve mouth and brow appearance when just audio driven
2014-05-08 01:06:26 -07:00
