Commit graph

32253 commits

Author SHA1 Message Date
James B. Pollack
46dbf45e07 add custom dat.gui build with basic array support, add vec3 support client side (only one-way at the moment) as folder example 2015-09-27 14:45:42 -07:00
James B. Pollack
6e00070b5e working 2 way generics 2015-09-27 11:48:52 -07:00
James B. Pollack
e029ee2a57 working two-way generic with visibility toggle as example 2015-09-27 10:44:52 -07:00
James B. Pollack
88d6af3914 improve generic implementation 2015-09-27 10:18:59 -07:00
James B. Pollack
c824d569e0 change generic box spawn position 2015-09-26 23:41:28 -07:00
James B. Pollack
c60701d49a headers 2015-09-26 23:27:24 -07:00
James B. Pollack
4f7e7e1d5f start generic two-way implementation, fix some typos 2015-09-26 23:24:00 -07:00
James B. Pollack
06a6462636 add function for manually updating display 2015-09-26 14:14:21 -07:00
James B. Pollack
7a59a7dc43 add two-way code but dont enable 2015-09-26 14:10:30 -07:00
James B. Pollack
5013e98b6c cleanup, comments 2015-09-26 12:47:22 -07:00
James B. Pollack
22515a9375 fix naming, match initial properties 2015-09-26 12:40:46 -07:00
James B. Pollack
51de351c50 convert tabs to spaces 2015-09-26 12:28:15 -07:00
James B. Pollack
f953456007 comments 2015-09-26 12:21:55 -07:00
James B. Pollack
f3c13f5d69 do grouping differently so names look better 2015-09-26 12:18:20 -07:00
James B. Pollack
f84762f2d7 remove old gui file 2015-09-26 12:02:59 -07:00
James B. Pollack
46fabf964d cleanup 2015-09-26 11:54:57 -07:00
James B. Pollack
a0b3bd91a3 cleanup logging 2015-09-26 11:40:31 -07:00
James B. Pollack
d8e7cd89ad Cleanup, comments 2015-09-26 11:27:58 -07:00
James B. Pollack
57aca0c418 New way to do two-way bindings between dynamically created GUI and in-world object properties. Uses partcile system properties, specifically. 2015-09-26 11:18:22 -07:00
James B. Pollack
a49c4756dd Merge remote-tracking branch 'highfidelity/master' 2015-09-26 11:10:45 -07:00
James B. Pollack
ad42b4da51 Merge branch 'master' of https://github.com/imgntn/hifi 2015-09-26 11:09:55 -07:00
Howard Stearns
a820682816 Merge pull request #5901 from hyperlogic/tony/gangsta-lean
Threshold based walking/leaning while in HMD.
2015-09-25 15:51:39 -07:00
Howard Stearns
9e001f0b4b Merge pull request #5903 from AndrewMeadows/ik-repairs-006
enforce target rotation during IK calculations
2015-09-25 15:50:59 -07:00
James B. Pollack
a6c3a601ae Merge pull request #5896 from thoys/20672
Worklist job #20672 - Create a script to record a users stats
2015-09-25 15:30:55 -07:00
Andrew Meadows
a97f556958 enforce IK target rotation 2015-09-25 15:13:57 -07:00
Thijs Wenker
5fc053cf97 Merge pull request #1 from imgntn/thoys-20672
Update stat collection to occur in batches
2015-09-26 00:04:25 +02:00
James Pollack
2c0c2a0979 Merge remote-tracking branch 'upstream/master' into thoys-20672 2015-09-25 14:49:31 -07:00
Anthony J. Thibault
402573dbf1 Remove unused local 2015-09-25 14:11:33 -07:00
James Pollack
9626bed8ca Merge remote-tracking branch 'upstream/master' 2015-09-25 12:24:39 -07:00
Thijs Wenker
9ed1397a63 Merge branch 'master' of https://github.com/worklist/hifi into 20672 2015-09-25 21:09:38 +02:00
Anthony J. Thibault
fc9b270951 Merge branch 'master' into tony/gangsta-lean 2015-09-25 11:36:58 -07:00
Eric Levin
135e2683a6 Merge pull request #5902 from ctrlaltdavid/particles-fixes
Particles fixes
2015-09-25 10:56:18 -07:00
James Pollack
1051416ed7 Change stat collection to batch stats together to make fewer network calls 2015-09-25 10:33:16 -07:00
James Pollack
54419301f3 Merge branch '20672' of https://github.com/thoys/hifi into thoys-20672 2015-09-25 10:01:33 -07:00
Andrew Meadows
4f0bd08b62 Merge pull request #5900 from ZappoMan/batchOptimizations
more work on batch optimzation
2015-09-25 09:00:38 -07:00
Andrew Meadows
7822d58164 Merge pull request #5870 from howard-stearns/apostrophe
Apostrophe key resets animation state.
2015-09-25 08:50:19 -07:00
James B. Pollack
857a7f8a83 Merge remote-tracking branch 'upstream/master' 2015-09-24 22:19:02 -07:00
David Rowe
d233d3f81b Fix particle emitter corner cases 2015-09-24 19:17:02 -07:00
David Rowe
629128c17f Fix particle emit directions for point emitter 2015-09-24 19:16:28 -07:00
David Rowe
d063f3488d Back out fromSpherical code addition 2015-09-24 19:14:26 -07:00
Anthony J. Thibault
474c847ef1 Updated constants and units. 2015-09-24 18:00:59 -07:00
Anthony J. Thibault
20d784ba39 Threshold based walking while in HMD.
This is a blend of the previous 'sitting' and 'standing' HMD modes.
Basically, when you move your head within a small range (20cm) your
avatar will lean appropriately, however when you cross that threshold
your body will move underneath you, re-centering your head above the body.

While this occurs the avatar should play the appropriate walking animations.
2015-09-24 17:54:32 -07:00
Brad Hefta-Gaub
85b2322acc more work on batch optimzation 2015-09-24 17:11:14 -07:00
James B. Pollack
b2bbaf4e7b Merge pull request #5899 from ericrius1/grabAPI
Fixed a one line bug
2015-09-24 16:52:43 -07:00
Eric Levin
6ea07f1e41 Merge pull request #6 from imgntn/ericrius1-grabAPI
re add allTouchedIDs object
2015-09-24 16:39:13 -07:00
James Pollack
fd43956502 re add allTouchedIDs object 2015-09-24 16:35:59 -07:00
Brad Hefta-Gaub
8a8da58dfd Merge pull request #5898 from kencooke/audio-src
Completely remove SOXR from cmake
2015-09-24 15:59:23 -07:00
Brad Hefta-Gaub
c75284ccde Merge pull request #5891 from imgntn/doll_updates_1
[Scripts] Doll Updates
2015-09-24 15:58:57 -07:00
Brad Hefta-Gaub
8fef47a488 Merge pull request #5873 from ericrius1/grabAPI
[Scripts] handControllerGrab.js now handles touches.  Also handles grabs on non-colliding objects
2015-09-24 15:58:14 -07:00
Brad Hefta-Gaub
be4fda3493 Merge pull request #5882 from imgntn/flashlight_updates_2
[Scripts] Flashlight Updates
2015-09-24 15:56:22 -07:00