Seth Alves
|
7f8411d947
|
reference count grabs on an entity
|
2015-10-05 14:15:38 -07:00 |
|
Seth Alves
|
635c83dad1
|
reset gravity and ignore-for-collisions after grabs have released
|
2015-10-05 13:39:01 -07:00 |
|
Seth Alves
|
7f84e882c5
|
attempt to keep ignoreForCollisions the same before and after grab
|
2015-10-05 13:06:39 -07:00 |
|
Seth Alves
|
8f924f0be4
|
merge from upstream
|
2015-10-05 13:05:37 -07:00 |
|
Andrew Meadows
|
1ead20683c
|
Merge pull request #5976 from sethalves/fix-action-deletes
Fix action deletion/addition when more than one interface are involved
|
2015-10-05 12:31:01 -07:00 |
|
Seth Alves
|
993111d22f
|
code review
|
2015-10-05 11:28:59 -07:00 |
|
Seth Alves
|
8c25f2e16c
|
Merge branch 'master' of github.com:highfidelity/hifi into kinematic-grab
|
2015-10-05 09:09:01 -07:00 |
|
Seth Alves
|
a42bb5f533
|
Merge pull request #5981 from ericrius1/sprayCanFix
No longer removing non-existent entities from spray paint can; color …
|
2015-10-02 17:56:51 -07:00 |
|
Seth Alves
|
26310d8ce4
|
kill gravity in near-held objects
|
2015-10-02 17:54:09 -07:00 |
|
Seth Alves
|
6a770a870b
|
set correct type in kinematic hold
|
2015-10-02 17:31:45 -07:00 |
|
Seth Alves
|
89c848d8c8
|
fix up kinematic hold
|
2015-10-02 17:14:53 -07:00 |
|
Howard Stearns
|
fdba55e56e
|
Merge pull request #5973 from ctrlaltdavid/20698
Fix Reload Content menu item not reloading FST files
|
2015-10-02 16:43:11 -07:00 |
|
Howard Stearns
|
a5a7c16466
|
Merge pull request #5789 from highfidelity/revert-5777-revert-5769-edit-js-adjustment
edit.js adjustment
|
2015-10-02 16:28:54 -07:00 |
|
Howard Stearns
|
8153ad7f44
|
Merge pull request #5967 from AndrewMeadows/collision-group-hack
allow physical objects to be set collisionless
|
2015-10-02 16:08:52 -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 |
|
Seth Alves
|
cf8955a8c5
|
kinematic grab
|
2015-10-02 15:27:01 -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 |
|
Seth Alves
|
a737b4024d
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-action-deletes
|
2015-10-02 13:57:24 -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 |
|
Seth Alves
|
67cc944afc
|
fix double free problem
|
2015-10-02 13:27:45 -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 |
|
ericrius1
|
0497de47ea
|
No longer removing non-existent entities from spray paint can; color tweaks to paint stream
|
2015-10-02 12:40:14 -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 |
|
Seth Alves
|
c0e8b02a2f
|
fix what happens when a distance grab is blocked because someone else already has it
|
2015-10-02 12:25:34 -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 |
|
Seth Alves
|
880d92ee64
|
try to fix double-distance-grabbing lockout
|
2015-10-02 11:46:48 -07:00 |
|
Seth Alves
|
5b970e6b1a
|
try to fix double-distance-grabbing lockout
|
2015-10-02 11:43:19 -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 |
|
Seth Alves
|
bb5abeeabb
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-action-deletes
|
2015-10-02 10:57:56 -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 |
|
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 |
|