Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-05 10:17:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
32492 commits 69 branches 57 tags 1.2 GiB
Commit graph

32492 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
4a4b9e1cd4 Merge pull request #5887 from thoys/patch-5 
[Scripts] createFlashlight.js - Close script after running
 2015-09-23 20:17:47 -07:00
samcake
46e9c463fc Merge pull request #5885 from ZappoMan/batchOptimizations 
Batch optimizations
 2015-09-23 19:30:51 -07:00
Brad Hefta-Gaub
5a80c4d0e7 Merge pull request #5886 from samcake/calvin 
Expose multi Draw Indirect in Batch (Hijack Austin's work...)
 2015-09-23 19:13:28 -07:00
James Pollack
7efd15c3a2 Update doll to stop screaming when released, use only one hand a a time, spatialize audio position 2015-09-23 18:01:18 -07:00
samcake
7d8f3661ad coding standard 2015-09-23 17:49:03 -07:00
samcake
b8e630a7a7 Less Warnigns 2015-09-23 17:46:10 -07:00
James Pollack
37ecd18054 put distant grab inside of conditional 2015-09-23 17:44:28 -07:00
James Pollack
82f178a353 tweaks 2015-09-23 17:43:08 -07:00
Brad Hefta-Gaub
432dc2055f gak 2015-09-23 17:38:59 -07:00
Brad Hefta-Gaub
9a0e5b9870 address Sam's concerns 2015-09-23 17:37:48 -07:00
ericrius1
81c175eabf toggle light switch 2015-09-23 17:34:37 -07:00
ericrius1
153a30de0d flip 2015-09-23 17:24:56 -07:00
Eric Levin
1c10b1dd24 Merge pull request #2 from imgntn/ericrius1-grabAPI 
Updates to handcontroller grab script
 2015-09-23 17:21:53 -07:00
Brad Hefta-Gaub
62c1e40127 CR repairs 2015-09-23 17:15:29 -07:00
Eric Levin
aa5a2aa741 Merge pull request #1 from imgntn/ericrius1-grabAPI 
Updates to handcontroller grab script
 2015-09-23 17:06:56 -07:00
David Rowe
a2c7b3bcc9 Orient particles to face camera but not roll with it 2015-09-23 17:00:07 -07:00
Howard Stearns
14bfdebdca Merge pull request #5883 from hyperlogic/tony/lean-threshold 
Better Head IK when in HMD mode
 2015-09-23 16:57:02 -07:00
James Pollack
381a24951e Update grab script to handle touching, better naming for non colliding grab functions 2015-09-23 16:56:46 -07:00
ZappoMan
65a079cb53 fix mac build 2015-09-23 16:48:34 -07:00
ericrius1
d0b5d62bb7 Updated master script to make jslint happy 2015-09-23 16:21:36 -07:00
samcake
9c44c3e4a4 Removing warnings 2015-09-23 16:19:34 -07:00
ericrius1
a1dccc2a92 Changed cat position 2015-09-23 16:13:31 -07:00
samcake
5176d51714 Merge and fix warnings 2015-09-23 16:05:53 -07:00
samcake
370b41895c Merge branch 'master' of https://github.com/highfidelity/hifi into calvin 2015-09-23 16:03:10 -07:00
Brad Hefta-Gaub
24e2215f14 fix mac/unix build 2015-09-23 15:47:52 -07:00
Thijs Wenker
6bb873d327 createFlashlight.js - Close script after running 
Close the createFlashlight.js script after running once to prevent a flashlight from being created each time you start Interface
 2015-09-24 00:43:50 +02:00
Philip Rosedale
75a9dd13be Merge pull request #5872 from kencooke/audio-src 
New low-latency sample rate conversion library
 2015-09-23 15:42:53 -07:00
Anthony J. Thibault
6b47373bcb Fix for precision error in AnimPose(glm::mat4) constructor. 
Really the culprit is GLMHelpers extractRotation().
I have a separate unit test that demonstrates the bug.
 2015-09-23 15:38:56 -07:00
samcake
5fd2992c28 sometimes, magic happens, and clean rebuilds... 2015-09-23 15:34:49 -07:00
samcake
83116fdd85 Fixed the code path with tseparate vertex format, still broken otherwise in the case of primitive instanced 2015-09-23 15:20:39 -07:00
ericrius1
276b0b71cb Added tin can to master script and changed its position 2015-09-23 14:52:59 -07:00
Seth Alves
27688fa55b get obj models to be visible again. textures don't work 2015-09-23 14:46:57 -07:00
Brad Hefta-Gaub
ef25876c9a implement vector caching for gpu::Batch 2015-09-23 14:46:47 -07:00
ericrius1
a2b0e66e13 Sound working for spraypaint 2015-09-23 13:36:00 -07:00
ericrius1
2c20a12f13 refactoring spraypaint to use new events 2015-09-23 13:34:21 -07:00
James Pollack
ba44390f79 Rename touch to grab non colliding 2015-09-23 13:20:21 -07:00
James Pollack
9736dee2d7 Merge branch 'grabAPI' of https://github.com/ericrius1/hifi into ericrius1-grabAPI 2015-09-23 13:12:45 -07:00
James Pollack
6b468ee87b Add the doll 2015-09-23 13:10:25 -07:00
ericrius1
b0923acc2f Reorg for pathing 2015-09-23 12:34:10 -07:00
samcake
acfb5a32bc Rename the nb parameters with num 2015-09-23 12:28:46 -07:00
ericrius1
6bd89f9689 Toys re-org 2015-09-23 12:22:18 -07:00
samcake
8735aa8003 Merging Austin pr that adds the multi draw indirect and also fix the seprate vertex format feature for windows and linux 2015-09-23 12:19:17 -07:00
ericrius1
4f96f2406b Merge branch 'master' into toybox 2015-09-23 12:14:23 -07:00
ericrius1
c7cb77a6ab moved spraycan into toybox folder, and added spraypaint sound 2015-09-23 12:08:28 -07:00
Ken Cooke
478eab3843 CR feedback 2015-09-23 12:07:17 -07:00
Brad Hefta-Gaub
c9d5caff51 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-09-23 11:55:52 -07:00
Anthony J. Thibault
0d7eae2d64 Fix slight translation error when rendering debug animation skeleton. 2015-09-23 11:42:55 -07:00
ericrius1
9818e2549c handControllerscript is now on par with master 2015-09-23 11:38:30 -07:00
ericrius1
cc69f51882 Cat meows when hand is close 2015-09-23 11:30:14 -07:00
ericrius1
a7facc9f3c Adding a mew sound to cat when user moves hand close 2015-09-23 11:10:27 -07:00