Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 08:33:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
32707 commits 25 branches 0 tags 1.1 GiB
Commit graph

32707 commits

This branch
This branch
All branches
Author SHA1 Message Date
James Pollack
1ff5f11e29 merge 2015-10-02 15:56:39 -07:00
James Pollack
9427ba1a5a ping pong gun 2015-10-02 15:56:26 -07:00
Brad Davis
224ef4a7c4 Merge pull request #5982 from ZappoMan/master 
add GLEW_STATIC to fix link warnings
 2015-10-02 15:42:09 -07:00
Brad Hefta-Gaub
627578826b Merge branch 'master' of https://github.com/highfidelity/hifi 2015-10-02 15:12:02 -07:00
Brad Hefta-Gaub
255689e24f add GLEW_STATIC to fix link warnings 2015-10-02 15:08:04 -07:00
Andrew Meadows
607cb9652e Merge pull request #5969 from kencooke/audio-src-sse2 
SSE2 optimization of new resampler.
 2015-10-02 15:07:03 -07:00
Howard Stearns
f6665a4ac6 Merge pull request #5839 from sethalves/transmit-joint-translation 
WARNING protocol change: Transmit joint translation
 2015-10-02 13:37:56 -07:00
Brad Hefta-Gaub
328467e019 Merge pull request #5909 from imgntn/particle_explorer 
[Scripts] Particle Explorer
 2015-10-02 12:40:36 -07:00
James Pollack
1c6e833028 cleanup weird function formatting, remove unused code, improve spacing for logical units 2015-10-02 12:31:55 -07:00
Brad Hefta-Gaub
9bb2ada0a7 Merge pull request #5964 from ericrius1/sprayPaint 
Added closePaint script and removed no longer used spray paint scripts
 2015-10-02 12:21:00 -07:00
Brad Hefta-Gaub
dce4d94f30 Merge pull request #5941 from ctrlaltdavid/particles-fix 
Fix particle radius, color, and alpha starts/finishes
 2015-10-02 11:40:47 -07:00
Anthony J. Thibault
c0be32d359 Fix for model offset when using Rig Animations. 2015-10-02 11:40:46 -07:00
Anthony J. Thibault
fc7b6dee84 Merge branch 'master' into transmit-joint-translation 2015-10-02 11:40:33 -07:00
Brad Hefta-Gaub
4c556dd43a Merge pull request #5962 from samcake/calvin 
Rendering the background elements after opaque and only work on the far pixels
 2015-10-02 11:38:45 -07:00
James Pollack
55178cdc91 Merge remote-tracking branch 'upstream/master' into particle_explorer 2015-10-02 11:31:14 -07:00
Brad Hefta-Gaub
5a0ff4b1a2 Merge pull request #5841 from ericrius1/toybox 
Toybox master reset script
 2015-10-02 11:27:43 -07:00
Brad Hefta-Gaub
c6c430ca76 Merge pull request #5977 from jherico/marge 
Fixing 2D overlay mouse interaction
 2015-10-02 11:11:04 -07:00
ericrius1
b595d916b6 fixed spacing issue 2015-10-02 11:10:08 -07:00
ericrius1
4dd2cf9cf5 Moved master reset script into new directory called unpublished scripts and changed relative pathing 2015-10-02 11:09:43 -07:00
Howard Stearns
639be1eef6 Merge pull request #5978 from AndrewMeadows/cleanup-sixense-calibration 
improved sixense/hydra calibration
 2015-10-02 10:50:05 -07:00
James Pollack
c6fa132dc2 cleanup 2015-10-02 10:44:26 -07:00
James Pollack
82828fdd14 reduce gravity and gun force so ball goes through less objects 2015-10-02 10:41:49 -07:00
Anthony J. Thibault
a1b54945d6 Compute the model offset in the rig, using the bind pose of the hips. 2015-10-02 10:34:34 -07:00
James Pollack
d1cbcf5554 roll back to full width window and set a min for emitRate so interface doesnt crash 2015-10-02 10:32:08 -07:00
ericrius1
f6c888599e Fixed a bug where particles weren't moving with can. 2015-10-02 10:22:48 -07:00
James Pollack
ea20fc9786 hack for it to work as a tool window 2015-10-02 10:08:10 -07:00
ericrius1
9f5a3066b8 changed masterResetEntity back to masterReset 2015-10-02 10:07:43 -07:00
ericrius1
71fe9b216c Removed extraneous masterReset script, and extra call to lightSwitches in correct script 2015-10-02 10:02:28 -07:00
Andrew Meadows
e9c71f3867 cleanup comments 2015-10-02 10:02:12 -07:00
ericrius1
a6df6c53f1 fixed more syntax errors 2015-10-02 09:55:41 -07:00
ericrius1
36f7bba87e Fixed some syntax errors, tweaked cat script so doesn't meow while it's already meowing 2015-10-02 09:53:30 -07:00
Andrew Meadows
50b2c8ae37 remove warnings in linux 2015-10-02 09:39:34 -07:00
Andrew Meadows
940b8eb529 improve some variable names 2015-10-02 09:39:13 -07:00
Andrew Meadows
98fe06be57 cleanup sixense/hydra calibration 2015-10-02 09:30:18 -07:00
Brad Davis
aa8979570c Working on 2D overlay mouse interaction 2015-10-02 00:35:37 -07:00
James B. Pollack
7c9d7ffefd single sysytem particle explorer with one way bindings is feature complete 2015-10-01 23:49:33 -07:00
James B. Pollack
d1432c51d5 Merge branch 'master' into particle_explorer 2015-10-01 21:21:52 -07:00
James B. Pollack
679fc1b5ad Merge branch 'master' of https://github.com/imgntn/hifi 2015-10-01 21:21:32 -07:00
Ken Cooke
3555e90cf6 Improved random generator for SIMD dither 2015-10-01 20:32:48 -07:00
Ken Cooke
e1e34b2ce5 Fix to allow arbitrary input/output buffers from caller. SIMD padding is no longer required. 2015-10-01 20:17:04 -07:00
samcake
71ad6195f2 Merge branch 'master' of https://github.com/highfidelity/hifi into calvin 2015-10-01 19:25:25 -07:00
samcake
690620d74d Cleaning code 2015-10-01 19:23:32 -07:00
James Pollack
4b1b53e189 end of dat 2015-10-01 19:01:10 -07:00
James B. Pollack
a3c91b12b9 Update cat.js 2015-10-01 18:56:38 -07:00
James B. Pollack
0ce6a305bd Update cat.js 2015-10-01 18:52:08 -07:00
James Pollack
6131875f67 set whichhand to null on release 2015-10-01 18:49:07 -07:00
James B. Pollack
d0e079ee9d Update cat.js 
add globals, lint the code
 2015-10-01 18:46:32 -07:00
samcake
3490e08521 Little improvments on the performance side to get the Stencil pass and the masking of the background under reasonable performances 2015-10-01 18:42:09 -07:00
James B. Pollack
55d20e9d4c Update cat.js 2015-10-01 18:41:24 -07:00
James B. Pollack
59c1c7ee6a Update masterReset.js 
remove file versioning
 2015-10-01 18:40:12 -07:00