Mohammed Nafees
6be4633a97
Merge remote-tracking branch 'upstream/master' into 19801
2014-06-26 23:48:11 +05:30
Clément Brisset
463ac9cc74
Merge pull request #3078 from PhilipRosedale/master
...
Improved toy ball, JS calls for palm position, concertCamera.js
2014-06-26 11:03:48 -07:00
Clément Brisset
cd53b727d0
Merge pull request #3080 from AndrewMeadows/bug-fix
...
fix for avatar models with multiple roots
2014-06-26 10:54:03 -07:00
AndrewMeadows
dba9d33f86
Merge pull request #3075 from huffman/19644
...
Code Review for Job #19644
2014-06-26 09:39:20 -07:00
Andrew Meadows
0d18f2fbab
fix for avatar models with multiple roots
2014-06-26 09:12:44 -07:00
Philip Rosedale
c72e41dcd2
added Oculus angular velocity, moved sit icon up
2014-06-25 22:27:54 -07:00
Philip Rosedale
93b131d520
Fix build warning from wrong init order
2014-06-25 15:41:47 -07:00
Philip Rosedale
58d460da09
option to turn on/off string hair
2014-06-25 15:14:17 -07:00
Andrzej Kapolka
6480c678d2
Disable strict aliasing for safe type punning, fix potentially uninitialized
...
variable warning.
2014-06-25 13:46:13 -07:00
Philip Rosedale
40dee3b39e
Added JS calls for left/right estimated palm position on skeleton model, improved toy ball to use them
2014-06-25 05:24:22 -07:00
Philip Rosedale
88c01266ab
more hair tweaks, don’t render in 1P, improved toy ball
2014-06-25 03:29:08 -07:00
Philip Rosedale
95a66a06af
Merge branch 'master' of https://github.com/worklist/hifi
2014-06-25 02:57:54 -07:00
Ryan Huffman
3bec59fd33
Fix unindented line
2014-06-24 20:38:46 -07:00
Philip Rosedale
60c33c18c3
Expose mode shift period to JS, remove default value
2014-06-24 20:32:41 -07:00
Ryan Huffman
5ece424a45
Merge branch 'master' of git://github.com/highfidelity/hifi into 19644
...
Conflicts:
interface/ui/runningScriptsWidget.ui
2014-06-24 20:27:44 -07:00
Clément Brisset
b6a8949b4c
Merge pull request #3069 from binaryking/19765
...
Code Review for Job #19765
2014-06-24 17:49:42 -07:00
Stephen Birarda
5f4baaffa5
revert credit balance rounding
2014-06-24 16:25:41 -07:00
Philip Rosedale
81e7f8e0a5
Merge branch 'master' of https://github.com/worklist/hifi
2014-06-24 16:21:35 -07:00
Philip Rosedale
9eb91e2b44
tweaking params
2014-06-24 16:15:16 -07:00
Brad Hefta-Gaub
6d77d438ab
Merge pull request #3057 from AndrewMeadows/ragdoll
...
Ragdoll Part3: avatar shapes self collide (but don't yet affect the joint positions of MyAvatar)
2014-06-24 15:47:18 -07:00
Mohammed Nafees
d5d2107b97
Merge remote-tracking branch 'upstream/master' into 19765
2014-06-25 01:50:29 +05:30
Mohammed Nafees
7271f85041
Change font size values from pt to px in Chat Window.
2014-06-25 01:49:17 +05:30
Ryan Huffman
173be2c89d
Merge branch 'master' of git://github.com/highfidelity/hifi into 19644
2014-06-24 12:01:04 -07:00
Ryan Huffman
f249020d6d
Clean up redundant if statement
2014-06-24 11:50:54 -07:00
Ryan Huffman
89f43acb7f
Add a tooltip with the full path to running scripts
2014-06-24 11:47:14 -07:00
Ryan Huffman
652543cdca
Update _scriptEngineHash to work with duplicate running scripts
2014-06-24 11:46:35 -07:00
Philip Rosedale
556578b8dc
first pass - hair as vertlet strands
2014-06-24 09:30:11 -07:00
David Rowe
c40c5d78c8
Fix default audio devices on Windows
...
Windows 8 provides the full friendly device name, not just the first 31 characters.
2014-06-24 08:50:39 -07:00
Brad Hefta-Gaub
19195f9119
Merge pull request #3056 from birarda/master
...
fix rounding of credit balance in application title
2014-06-23 14:48:37 -07:00
Andrew Meadows
415dfd98aa
remove one line of cuft
2014-06-23 13:40:50 -07:00
Stephen Birarda
ed5c05a61b
fix rounding of credit balance in application title
2014-06-23 13:25:32 -07:00
Andrew Meadows
b5aca45ab6
smaller timescale for slaving shapes to skeleton
2014-06-23 12:59:38 -07:00
Brad Hefta-Gaub
18cd794542
Merge pull request #3055 from wangyix/master
...
Audio jitter buffer resizes depending on max inter-frame time gaps of incoming audio packets
2014-06-23 12:45:04 -07:00
Andrew Meadows
7f4ffb363b
merge upstream/master into andrew/ragdoll
2014-06-23 12:33:21 -07:00
Andrew Meadows
add556719c
fixed perf stats on phys simulation
2014-06-23 12:31:36 -07:00
Andrew Meadows
9713e3d513
remove some unused var warnings in Release build
2014-06-23 12:30:53 -07:00
Brad Hefta-Gaub
29a8307825
Merge pull request #3050 from ctrlaltdavid/fix_fullscreen_shortcut
...
Fix fullscreen toggle shortcut
2014-06-23 11:42:20 -07:00
Andrew Meadows
8ad2a679c4
move code to SkeletonModel::stepRagdollForward()
2014-06-23 11:16:18 -07:00
Andrew Meadows
9a2197a23c
draw skeleton shapes at at correct positions
2014-06-23 10:55:34 -07:00
wangyix
e5d7d471e3
removed debug code
2014-06-23 10:55:30 -07:00
Andrew Meadows
5e4d757e4e
merge upstream/master into andrew/ragdoll
2014-06-23 10:43:40 -07:00
Andrew Meadows
8986be5f1c
remove old collideAgaintsOurself() code
2014-06-23 10:36:31 -07:00
Andrew Meadows
eba03ddb8a
re-enable some basic avatar collisions
2014-06-23 10:05:51 -07:00
Andrew Meadows
8b24e9cd67
Update SkeletonModel::_boundingShape position
2014-06-23 09:39:14 -07:00
Andrew Meadows
b2ea8c0bf9
Compute more correct masses for ragdoll parts
...
also pin root ragdoll shape at the local-frame origin
for stability
2014-06-23 08:37:11 -07:00
Mohammed Nafees
803ea28f99
Do not close the Models Browser if double clicked on the loading message
2014-06-21 23:01:22 +05:30
Mohammed Nafees
1b186c3b92
Remove unnecessary lines of code.
2014-06-21 17:57:11 +05:30
Mohammed Nafees
1368c72725
Keep the filter line edit of the Models Browser disabled until the models list has been populated. This fixes interface from crashing in case the user types in the line edit and the list is not populated.
2014-06-21 17:55:19 +05:30
Mohammed Nafees
ad41f2da9a
Make changes to other UI forms as well
2014-06-21 16:27:13 +05:30
Ryan Huffman
108fa36d24
Disable the ability to load a script multiple times
...
It won't show up correctly in running scripts, and can cause it to end up running
in the background unnoticed.
Also added an error message for when a script doesn't load.
2014-06-20 16:32:42 -07:00
