Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-06 11:30:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
32492 commits 74 branches 59 tags 1.2 GiB
Commit graph

32492 commits

This branch
This branch
All branches
Author SHA1 Message Date
ericrius1
baf4777750 Can now hold spray paint can without painting unless squeezing hard 2015-09-24 17:13:45 -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
ericrius1
c2f1141d69 fix cat script 2015-09-24 16:40:20 -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
ericrius1
5ba8f15d9f test 2015-09-24 16:32:01 -07:00
James Pollack
be1952797c Changes to rotations 2015-09-24 16:31:59 -07:00
ericrius1
ce0a726eb9 Fixed spraypaint for new particles 2015-09-24 16:27:17 -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
Eric Levin
a453b7f7cd Merge pull request #5 from imgntn/ericrius1-grabAPI 
fix weird multi line thing
 2015-09-24 15:36:26 -07:00
Howard Stearns
266c69fc70 Disable the old-school Rig::inverseKinematics during reset. 2015-09-24 15:33:52 -07:00
James Pollack
bc6a0c08f9 Fix merge conflict 2015-09-24 15:29:44 -07:00
James Pollack
8dacd736df fix weird multi line thing 2015-09-24 15:27:26 -07:00
James Pollack
49d3b7e93b fix indentation 2015-09-24 15:26:19 -07:00
Ken Cooke
629ee7b0c1 Completely remove SOXR from cmake 2015-09-24 15:12:10 -07:00
Eric Levin
841814a870 Merge pull request #4 from imgntn/ericrius1-grabAPI 
Fixes formatting to coding standards.
 2015-09-24 15:10:56 -07:00
Eric Levin
a2dce17683 Merge pull request #3 from imgntn/ericrius1-grabAPI 
put distant grab inside of conditional
 2015-09-24 15:10:49 -07:00
James Pollack
9eb3b56e5d Remove space before and after function calls, add spaces btw functions 2015-09-24 15:03:02 -07:00
James Pollack
83a8636a36 Remove whitespace, batch entity edits 2015-09-24 14:49:28 -07:00
ericrius1
5da8b689c5 fix missing commas 2015-09-24 14:41:22 -07:00
ericrius1
4eb76b47a9 Merge remote-tracking branch 'origin/toybox' into toybox 
Conflicts:
	examples/toys/masterResetEntity.js
 2015-09-24 14:40:18 -07:00
ericrius1
536adf8981 testing paintcan 2015-09-24 14:39:11 -07:00
Howard Stearns
426ccabba7 Merge branch 'master' of https://github.com/highfidelity/hifi into apostrophe 2015-09-24 14:19:58 -07:00
Howard Stearns
bdbd9ab69e Merge pull request #5895 from AndrewMeadows/ik-repairs-005 
allow head translation when using hand IK in 3rd person screenie mode
 2015-09-24 14:12:05 -07:00
James Pollack
c1f8cbd1a3 Remove space before function calls, add spaces before functions 2015-09-24 14:07:15 -07:00
ericrius1
16f9140a08 updated master script so objects with fewer properties are on one line 2015-09-24 14:04:37 -07:00
James Pollack
b44d090be6 Merge remote-tracking branch 'upstream/master' 2015-09-24 13:34:51 -07:00
James Pollack
2883319fb0 Add potted plant, arm chair, and pillow 2015-09-24 13:33:43 -07:00
Andrew Meadows
59da684eb9 make IKTarget::setType() a one-liner 2015-09-24 13:15:03 -07:00
Thijs Wenker
6d4e4af0a5 ability to see Stats in JavaScript + example script which outputs the stats to the console/logviewer 2015-09-24 22:02:22 +02:00
Brad Hefta-Gaub
19d30bb08b Merge pull request #5890 from ctrlaltdavid/20691 
Orient particles to face camera but not roll with it
 2015-09-24 12:49:13 -07:00
Andrew Meadows
17e3e9394f allow head translation for 3rd person screenie IK 2015-09-24 12:38:46 -07:00
James Pollack
ec5bfff183 Merge branch 'toybox' of https://github.com/ericrius1/hifi into ericrius1-toybox 2015-09-24 12:09:17 -07:00
ericrius1
203af7cbba Merge branch 'master' into toybox 2015-09-24 12:03:21 -07:00
ericrius1
8609769c20 cat now listens for touch event from controller 2015-09-24 11:58:54 -07:00
ericrius1
1e1cfb6aae Flipped lights so up is lights on and vica versa 2015-09-24 10:15:50 -07:00
ericrius1
f334651a57 deleted handControllerGrab 2015-09-24 10:05:27 -07:00
Clément Brisset
cb1f5d4e8a Merge pull request #5894 from ZappoMan/fixWarning 
More warnings fixes
 2015-09-24 18:35:50 +02:00
Brad Hefta-Gaub
2eaeb26b2a fix GetVersionEx warning 2015-09-24 09:14:51 -07:00
Brad Hefta-Gaub
776acf2182 ignore gverb warnings 2015-09-24 09:07:43 -07:00
Andrew Meadows
bac2a24c01 Merge pull request #5893 from ZappoMan/fixWarning 
more warning fixes
 2015-09-24 09:01:58 -07:00
Brad Hefta-Gaub
5e82b9c433 more warning fixes 2015-09-24 08:26:56 -07:00
Brad Hefta-Gaub
ba73acf3b4 Merge pull request #5843 from ctrlaltdavid/20681 
Replace point and vector particle emitter with spheroid emitter
 2015-09-24 08:19:49 -07:00
David Rowe
3d44fdfdf5 Fix warnings 2015-09-23 21:18:23 -07:00
Brad Hefta-Gaub
c6ac54b031 Merge pull request #5884 from sethalves/fix-obj-models 
get obj models to be visible again.  textures don't work
 2015-09-23 20:43:25 -07:00
Brad Hefta-Gaub
d14820d3ef Merge pull request #5880 from thoys/20668 
Worklist job #20668 - JS: Add option to listen audio from camera
 2015-09-23 20:40:32 -07:00