Philip Rosedale
|
e6a8c79f9f
|
Added more arrow controls to move camera when in mirror mode, new guitar chords.
|
2014-05-07 16:51:22 -07:00 |
|
Philip Rosedale
|
f6aaaad211
|
removed some unneeded stuff
|
2014-05-06 22:44:36 -07:00 |
|
Philip Rosedale
|
fc962749c0
|
Arrow keys adjust distance from camera in mirror mode, air guitar script
|
2014-05-06 22:41:08 -07:00 |
|
Atlante45
|
9c9556914e
|
Slow down hydra move
|
2014-05-06 17:03:19 -07:00 |
|
Atlante45
|
abebb078b0
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-05-06 13:08:00 -07:00 |
|
Atlante45
|
61c2dd0468
|
Fixed orientation and offset issues
|
2014-05-06 13:07:31 -07:00 |
|
Philip Rosedale
|
53baf5652e
|
avatar look at indicator smaller grey ball
|
2014-05-05 18:03:25 -07:00 |
|
Philip Rosedale
|
da0b36ed5c
|
merge fix
|
2014-05-05 16:21:52 -07:00 |
|
Philip Rosedale
|
691b1d6069
|
Added lookAt rendering bubble
|
2014-05-05 16:19:09 -07:00 |
|
Brad Hefta-Gaub
|
e59c4a9aa2
|
Merge pull request #2783 from AndrewMeadows/inertia
improved avatar walking on voxels
|
2014-05-05 15:49:44 -07:00 |
|
Andrew Meadows
|
5ffd307926
|
Merge upstream/master into andrew/inertia
Conflicts:
interface/src/avatar/MyAvatar.h
|
2014-05-05 13:54:25 -07:00 |
|
ZappoMan
|
ccadf3be57
|
Merge branch 'master' of https://github.com/worklist/hifi into modelserver
|
2014-05-05 12:39:36 -07:00 |
|
ZappoMan
|
3bb72c04a5
|
Merge branch 'master' of https://github.com/worklist/hifi into modelserver
|
2014-05-05 12:36:03 -07:00 |
|
ZappoMan
|
5aabd302fc
|
tweaks to placeModelsWithHands
|
2014-05-05 12:35:49 -07:00 |
|
Atlante45
|
1ecf0e3b9d
|
Used wrong formula in previous commit
|
2014-05-05 11:43:58 -07:00 |
|
Atlante45
|
7855bf8e24
|
Fix scale issue in editVoxels.js (closes #2776)
|
2014-05-05 11:35:50 -07:00 |
|
Atlante45
|
0b4516e09b
|
editModels,js switched to use actual models instead of particles.
|
2014-05-02 15:32:29 -07:00 |
|
Atlante45
|
55ce204ee3
|
Merge branch 'master' of https://github.com/highfidelity/hifi into editModels_js
|
2014-05-02 14:50:52 -07:00 |
|
ZappoMan
|
8443bb0afc
|
fix a scale to fit bug, and add features to place models with hands
|
2014-05-02 13:19:33 -07:00 |
|
Atlante45
|
ab0a0165c7
|
Working version of editModels.js
|
2014-05-02 11:19:12 -07:00 |
|
Atlante45
|
4e88d66c95
|
Merge branch 'master' of https://github.com/highfidelity/hifi into editModels_js
|
2014-05-02 10:17:11 -07:00 |
|
ZappoMan
|
cc091c0bc9
|
added sample
|
2014-05-02 09:39:29 -07:00 |
|
ZappoMan
|
715e6b8e60
|
debugging model editing
|
2014-05-02 09:10:30 -07:00 |
|
AndrewMeadows
|
05e5277084
|
Merge pull request #2764 from ZappoMan/modelserver
Model Server, Renderer, Scripting, etc
|
2014-05-01 15:39:12 -07:00 |
|
Andrew Meadows
|
b4d3df47fb
|
Disable gravity on script start
|
2014-05-01 12:09:34 -07:00 |
|
Ryan Huffman
|
eccedda284
|
Add fileBrowserExample.js
|
2014-05-01 10:56:23 -07:00 |
|
ZappoMan
|
293963c546
|
implement snap to center in model
|
2014-05-01 09:02:41 -07:00 |
|
ZappoMan
|
bb6444f5a9
|
more hacking got it working
|
2014-05-01 07:30:56 -07:00 |
|
ZappoMan
|
85484affa9
|
hacking
|
2014-04-30 17:55:54 -07:00 |
|
Atlante45
|
8068a915aa
|
More work on editModels
|
2014-04-30 16:50:40 -07:00 |
|
ZappoMan
|
3322d1f7ff
|
example JS for models
|
2014-04-30 14:18:57 -07:00 |
|
Atlante45
|
8cad705e2d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into editModels_js
|
2014-04-30 11:13:07 -07:00 |
|
Ryan Huffman
|
65fd2a7724
|
Merge remote-tracking branch 'upstream/master' into 19612
Conflicts:
interface/src/Menu.cpp
|
2014-04-30 09:57:17 -07:00 |
|
Ryan Huffman
|
45beeaa8d5
|
Add dialog + location + window JS examples
|
2014-04-30 09:45:53 -07:00 |
|
ZappoMan
|
4aa96e1fbe
|
added support for returning accuracy of ray intersections and other octree tests that can fail due to getting lock
|
2014-04-29 15:10:28 -07:00 |
|
Atlante45
|
827e64ec0a
|
Merge branch 'master' of https://github.com/highfidelity/hifi into editModels_js
|
2014-04-29 14:56:36 -07:00 |
|
Atlante45
|
ef281e2a5f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into editModels_js
|
2014-04-29 11:01:57 -07:00 |
|
Andrew Meadows
|
2c7fcada3b
|
make gravity transitions faster
|
2014-04-29 10:00:12 -07:00 |
|
Andrew Meadows
|
4937a0af2e
|
add status button for local gravity
|
2014-04-28 17:29:44 -07:00 |
|
Andrew Meadows
|
c7dbc5984f
|
add local gravity option parameter for MyAvatar
|
2014-04-28 16:40:22 -07:00 |
|
Atlante45
|
0457f2035d
|
more editModels work
|
2014-04-28 14:02:09 -07:00 |
|
Andrew Meadows
|
ea2e96ac6f
|
toggle collision and gravity with timers
|
2014-04-28 13:02:54 -07:00 |
|
Andrew Meadows
|
a7c4b02f2d
|
merge new work into andrew/inertia
|
2014-04-28 09:52:06 -07:00 |
|
Atlante45
|
2224025b38
|
Merge branch 'master' of https://github.com/highfidelity/hifi into editModels_js
|
2014-04-25 16:42:09 -07:00 |
|
Andrew Meadows
|
b05a315b5a
|
merge upstream/master into andrew/inertia
Conflicts:
interface/src/avatar/MyAvatar.cpp
|
2014-04-25 14:52:44 -07:00 |
|
Andrew Meadows
|
39252a8339
|
swissArmyJetpack.js now toggles "obey gravity"
|
2014-04-25 14:17:39 -07:00 |
|
Andrew Meadows
|
afb12bcd70
|
add swissArmyJetpack.js
|
2014-04-24 19:12:23 -07:00 |
|
Atlante45
|
4927a77382
|
Some testing with editModels.js
|
2014-04-24 18:15:39 -07:00 |
|
Atlante45
|
9bdcfe6d04
|
Undo now fully support local subtrees
|
2014-04-24 11:01:12 -07:00 |
|
Thijs Wenker
|
ebc6f4e78e
|
Removed UTF-8 new line characters, QT script errors on those lines in Windows.
|
2014-04-23 14:40:06 +02:00 |
|