Commit graph

33606 commits

Author SHA1 Message Date
Brad Davis
d9c534f404 Merge pull request #6236 from thoys/js-vec3-fixes
Scripting - Fix Vec3 properties and added multiplyVbyV function
2015-10-29 22:45:25 -07:00
Howard Stearns
96900dab25 Merge pull request #6195 from CrackerHax/master
Added AvatarList features for creating userlists in AC scripts
2015-10-29 22:11:57 -07:00
James B. Pollack
846310f9fb Merge pull request #6208 from ericrius1/closePaintModel
Added to the whiteboard model, and some bug fixes
2015-10-29 17:05:20 -07:00
Thijs Wenker
35e03d662d fix the constants of Vec3 , const glm::vec3& UNIT_***() weren't accessible in javascript. Solved it by making them properties that are CONSTANT. Also added function to multiply a vec3 by a vec3 called multiplyVbyV since overloading it over multiply gave me some problems 2015-10-30 00:58:32 +01:00
ericrius1
6bdf66534f light tweak 2015-10-29 16:53:03 -07:00
Ryan Huffman
fef39b5dc8 Merge pull request #6235 from Atlante45/master
Check keyLight is defined before accessing it.
2015-10-29 16:49:49 -07:00
Atlante45
8b46ed7dff Check keyLight is defined 2015-10-29 16:42:48 -07:00
Howard Stearns
6613a0e0a6 Merge pull request #6234 from hyperlogic/tony/new-grab-anim
New left and right grab animations.
2015-10-29 16:42:36 -07:00
ericrius1
b6b71e7e76 increased range and intensity of light 2015-10-29 16:40:50 -07:00
Anthony J. Thibault
047614b2eb New left and right grab animations. 2015-10-29 16:18:39 -07:00
Clément Brisset
bf7911e517 Merge pull request #6232 from Atlante45/master
edit.js fix
2015-10-29 15:39:20 -07:00
Atlante45
c237072195 edit.js fix 2015-10-29 15:29:12 -07:00
ericrius1
020566b76a no deleting 2015-10-29 14:14:15 -07:00
samcake
1b6a2ff56f Merge pull request #6231 from Atlante45/master
edit.js fix
2015-10-29 14:13:29 -07:00
Atlante45
904326cd1c edit.js fix 2015-10-29 14:11:27 -07:00
Andrew Meadows
9bc44d678b Merge pull request #6228 from ZappoMan/scriptCleanup
removed old metavoxel example, since the api is no longer available
2015-10-29 13:26:11 -07:00
Brad Hefta-Gaub
3c11cf2926 Merge pull request #6226 from kencooke/master
Workaround for audio having channels swapped under Qt 5.5.1
2015-10-29 13:25:41 -07:00
Andrew Meadows
fa96349155 Merge pull request #6229 from birarda/sleep-dt-loop
guard timeElapsed for simulateKinematicMotion to max 1s
2015-10-29 13:23:57 -07:00
Ken Cooke
1eabb924f1 Fixed the logic to be correct 2015-10-29 12:53:47 -07:00
Stephen Birarda
fb55f0becb guard timeElapsed for simulateKinematicMotion to max 1s 2015-10-29 12:50:34 -07:00
Andrew Meadows
0c5b4115ed Merge pull request #6221 from huffman/physics-substep-fix
Physics substep fix
2015-10-29 12:39:15 -07:00
Brad Hefta-Gaub
1c2973f17d removed old metavoxel example, since the api is no longer available 2015-10-29 12:34:24 -07:00
Ken Cooke
4d576d7aaf Fix typo 2015-10-29 12:23:36 -07:00
Ken Cooke
143b9c663f Quick fix for audio having channels swapped under Qt 5.5.1. 2015-10-29 12:21:28 -07:00
Brad Hefta-Gaub
3bbba99e2b Merge pull request #6178 from samcake/color
Refactor the KeyLIght properties in their own group
2015-10-29 10:44:44 -07:00
samcake
517387621a Fixing the keyLIght Direction ui for edit.js and fix the case for D to d 2015-10-29 10:40:28 -07:00
Eric Levin
42fb683085 Merge pull request #6184 from imgntn/toybox_sounds
Add Arcade Game Sound To Toybox
2015-10-29 10:24:23 -07:00
Eric Levin
53f588ddc1 Merge pull request #6188 from imgntn/toybox_reset_buttons
Add Reset Buttons for Basketballs and Targets to Toybox
2015-10-29 10:24:12 -07:00
Ryan Huffman
49877c2dff Move _hasOutgoingChanges in onSubStep to previous location 2015-10-29 10:19:18 -07:00
Seth Alves
ac1055c3e0 Merge pull request #6214 from howard-stearns/goToPosition
Don't go to wrong position on startup/teleport.
2015-10-29 10:15:26 -07:00
samcake
025422792d Fixing the keyLIght Direction ui for edit.js 2015-10-29 10:13:28 -07:00
Seth Alves
10717dc364 Merge pull request #6154 from howard-stearns/safe-avatar-list-access
Safe avatar list access
2015-10-29 10:12:34 -07:00
Andrew Meadows
d33530f5d0 Merge pull request #6209 from howard-stearns/guard-rendering-of-avatar-collision-hull
Don't render avatar's renderBoundingCollisionShapes before data is there
2015-10-29 09:34:26 -07:00
Andrew Meadows
f9012d5051 Merge pull request #6187 from sethalves/fix-actions-ttl
fix actions bug
2015-10-29 09:30:21 -07:00
Brad Hefta-Gaub
21decaaf8e Merge pull request #6218 from ctrlaltdavid/20719
20719 Fix audio stats dialog box not being sized properly
2015-10-29 08:16:56 -07:00
Brad Hefta-Gaub
d324771f6b Merge pull request #6219 from howard-stearns/fix-avatar-draw-mesh-toggle
Fix Developer->Avatar->Draw Mesh
2015-10-28 23:16:51 -07:00
Howard Stearns
697b9fb60b Merge pull request #6205 from hyperlogic/tony/eye-lookat-fix
Fixes locally rendered eye gaze
2015-10-28 21:39:54 -07:00
Howard Stearns
5b6a8eddf9 Merge pull request #6216 from hyperlogic/tony/bug-eyed-mery-fix
FBXReader: More deterministic loading behavior
2015-10-28 21:31:57 -07:00
Howard Stearns
8c395209e8 Fix Developer->Avatar->Draw Mesh
MyAvatar::setEnableMeshVisible -> Model::setVisibleInScene sets a flag that no one was looking at any more.
2015-10-28 21:23:35 -07:00
Anthony J. Thibault
5e73af9272 Rig: Removed dt from updateFromEyeParameters() 2015-10-28 18:10:41 -07:00
samcake
fd7582ad31 Merge branch 'master' of https://github.com/highfidelity/hifi into color 2015-10-28 17:58:04 -07:00
Anthony J. Thibault
7367f2a28c FBXReader: remove debugging logs 2015-10-28 17:55:06 -07:00
Brad Hefta-Gaub
db3d8c4956 Merge pull request #6213 from Atlante45/master
Fix ScriptEngine crash
2015-10-28 17:40:05 -07:00
samcake
630cdb8a9d Modify the html presentiong the zone enity properties to match the internal new representation 2015-10-28 17:29:06 -07:00
David Rowe
568e5536b8 Control bandwidth stats dialog sizing similarly 2015-10-29 13:18:43 +13:00
David Rowe
4cb5ccab90 Fix audio stats dialog not being sized properly 2015-10-29 13:18:27 +13:00
Atlante45
136747929e Fix typo 2015-10-28 17:11:46 -07:00
Howard Stearns
ba7d46b556 Merge branch 'master' of https://github.com/highfidelity/hifi into guard-rendering-of-avatar-collision-hull 2015-10-28 16:58:56 -07:00
Anthony J. Thibault
5acb088c46 FBXReader: More deterministic loading behavior
This makes iteration over meshes and connections between them deterministic.
[QHash](http://doc.qt.io/qt-5/qhash.html#details) and QMultiHash do not guarantee consistent iteration order.
This is problematic for the FBXReader because it could result in different behavior each time a model was loaded.

Specifically, This was causing a bug with some avatars that contained multiple-bind poses.
The bind pose returned to the application from the FBXReader would be different on different runs.
This PR doesn't add support for multiple-bind poses, but it does make the choice of which
bind pose is chosen deterministic.

This non-determinism was the cause of the Mery avatar having "bug-eyes" 1/12 times.
2015-10-28 16:57:27 -07:00
samcake
a5b95d7307 Fixing the entity properties view with the new properties group 2015-10-28 16:46:56 -07:00