ZappoMan
|
2a281298f0
|
fix grenades
|
2014-10-13 14:36:17 -07:00 |
|
ZappoMan
|
c7d544cd58
|
wire up collision signals
|
2014-10-13 14:36:06 -07:00 |
|
ZappoMan
|
bb0479b466
|
removing particles from scripts
|
2014-10-13 14:19:57 -07:00 |
|
ZappoMan
|
fe759859e7
|
removing particles
|
2014-10-13 14:11:20 -07:00 |
|
ZappoMan
|
c36bcf2d7e
|
removing particles
|
2014-10-13 14:11:11 -07:00 |
|
ZappoMan
|
4c85e9f581
|
removing particles
|
2014-10-13 14:10:57 -07:00 |
|
Atlante45
|
bbd1afc55c
|
Switch hash to an array
|
2014-10-13 13:50:06 -07:00 |
|
David Rowe
|
958acfcfe0
|
Fix version logging include to include build number and write in log
|
2014-10-13 13:23:31 -07:00 |
|
David Rowe
|
bd9451d4c6
|
Log Oculus SDK version used in build
|
2014-10-13 13:20:24 -07:00 |
|
ZappoMan
|
45a5768750
|
highlight grabber handles on hover
|
2014-10-13 12:19:38 -07:00 |
|
AndrewMeadows
|
01ec12549e
|
Merge pull request #3588 from ZappoMan/editToolsImprovements
add debugging for ryan's rotate problems
|
2014-10-13 11:39:14 -07:00 |
|
ZappoMan
|
2b6cd6d29a
|
add debugging for ryan's rotate problems
|
2014-10-13 11:33:06 -07:00 |
|
Atlante45
|
6a66f65282
|
Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones
|
2014-10-13 11:10:45 -07:00 |
|
Atlante45
|
6d03590c00
|
If no advanced settings, don't show button
|
2014-10-13 11:10:37 -07:00 |
|
Atlante45
|
8fab184ed1
|
Remove audio settings from advanced
|
2014-10-13 11:10:11 -07:00 |
|
Atlante45
|
6bde4b8324
|
Move break
|
2014-10-13 10:24:01 -07:00 |
|
AndrewMeadows
|
d90d30ad9f
|
Merge pull request #3585 from ZappoMan/editToolsImprovements
various edit tool fixes
|
2014-10-13 10:12:47 -07:00 |
|
AndrewMeadows
|
3d888b6c27
|
Merge pull request #3584 from huffman/sdl-update
Update to SDL2
|
2014-10-13 09:37:16 -07:00 |
|
Philip Rosedale
|
99e596ae7e
|
really remove file
|
2014-10-13 17:35:00 +01:00 |
|
Philip Rosedale
|
c4000eb468
|
fix windows error
|
2014-10-13 17:33:01 +01:00 |
|
AndrewMeadows
|
1f09d07ac9
|
Merge pull request #3583 from ey6es/metavoxels
Added ray/dual contour intersection testing, cursors on dual contour surfaces, "material brush" for dual contour surfaces.
|
2014-10-13 09:25:46 -07:00 |
|
David Rowe
|
c6bf09f509
|
Fix model uploading for the case that haven't uploaded model before
|
2014-10-13 08:35:52 -07:00 |
|
Philip Rosedale
|
18979adf23
|
remove startup debug from buckyballs
|
2014-10-12 20:42:53 -07:00 |
|
Philip Rosedale
|
e5f93d00ac
|
remove unused utility functions
|
2014-10-12 20:42:15 -07:00 |
|
Philip Rosedale
|
dc09572776
|
remove unused functions
|
2014-10-12 20:17:20 -07:00 |
|
Philip Rosedale
|
bc6346c257
|
Removed unused constant, class
|
2014-10-12 20:14:51 -07:00 |
|
Philip Rosedale
|
a054408abb
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-10-12 17:04:37 -07:00 |
|
ZappoMan
|
8c85c3261e
|
draw tickmarks for current roation correctly for pitch and roll as well
|
2014-10-10 22:11:27 -07:00 |
|
ZappoMan
|
a08ddecc3a
|
fix shifting tickmarks
|
2014-10-10 22:06:12 -07:00 |
|
ZappoMan
|
e6d7add5dc
|
display tickmarks on the current rotation overlay
|
2014-10-10 21:57:10 -07:00 |
|
ZappoMan
|
caac5881bf
|
correctly handle unselect and dont show highlight when other tool is active
|
2014-10-10 21:39:05 -07:00 |
|
ZappoMan
|
f21ff76a38
|
dont allow stretching below a minimum dimension
|
2014-10-10 21:23:56 -07:00 |
|
ZappoMan
|
dfff16d9e8
|
make sure to not select other entities when clicking on a grab handle of a selected entity
|
2014-10-10 21:12:28 -07:00 |
|
Ryan Huffman
|
42479b1ae2
|
Add joystickWithName for PrioVR
|
2014-10-10 18:03:08 -07:00 |
|
Andrzej Kapolka
|
d1c6aef953
|
Fixed my swizzle!
|
2014-10-10 17:36:21 -07:00 |
|
Andrzej Kapolka
|
1d4d36444f
|
Bumped the metavoxel version number.
|
2014-10-10 17:34:16 -07:00 |
|
Ryan Huffman
|
a24b5c24a9
|
Update max axis value to reflect maximum negative value
|
2014-10-10 17:28:09 -07:00 |
|
Andrzej Kapolka
|
1f63656a14
|
Comment fix.
|
2014-10-10 17:25:25 -07:00 |
|
Andrzej Kapolka
|
dc8dc112c9
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-10-10 17:19:24 -07:00 |
|
Andrzej Kapolka
|
60da0f1567
|
Allow drawing cursor on dual contour surface, wired up material paint tool.
|
2014-10-10 17:18:52 -07:00 |
|
ZappoMan
|
cdafba603d
|
use axis aligned bounding box for highlight and selection box instead of non-axis aligned box
|
2014-10-10 17:11:27 -07:00 |
|
ZappoMan
|
82a9429414
|
add boundingBox.dimensions to entity properties
|
2014-10-10 17:10:27 -07:00 |
|
Philip Rosedale
|
9be2b33971
|
Hair draped for masks and driven by audio loudness
|
2014-10-10 17:06:11 -07:00 |
|
Ryan Huffman
|
1c2a971638
|
Update gamepad.js to use new Joysticks interface
|
2014-10-10 17:03:25 -07:00 |
|
Ryan Huffman
|
762cc71d31
|
Update to SDL2
|
2014-10-10 17:03:10 -07:00 |
|
Brad Hefta-Gaub
|
324ddb2a2f
|
Merge pull request #3581 from birarda/remove-cara
remove cara face tracking, cleanup some warnings
|
2014-10-10 16:09:35 -07:00 |
|
Atlante45
|
d8c60a78bb
|
Fix stupid variable swap
|
2014-10-10 15:32:29 -07:00 |
|
Andrzej Kapolka
|
1911cfd0be
|
Basic ray/voxel intersection testing up and running.
|
2014-10-10 15:11:37 -07:00 |
|
Stephen Birarda
|
21114d5f56
|
Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel
|
2014-10-10 14:30:43 -07:00 |
|
Stephen Birarda
|
df6f4d4c95
|
remove cara face tracking, cleanup warnings
|
2014-10-10 14:17:52 -07:00 |
|