Andrew Meadows
|
0c78449cf7
|
reduce movement speed when walking
|
2014-05-05 13:28:42 -07:00 |
|
Andrew Meadows
|
815262b802
|
update _lastFloorContactPoint
|
2014-05-05 13:06:55 -07:00 |
|
Andrew Meadows
|
ec65940212
|
remove debug #include <StreamUtils.h>
|
2014-05-05 12:34:56 -07:00 |
|
Andrew Meadows
|
6b129c86d0
|
reduce snagging when walking across voxel seams
|
2014-05-05 12:33:05 -07:00 |
|
Andrew Meadows
|
ddc9408a55
|
commit implementation of deleteLastCollision()
|
2014-05-05 12:32:23 -07:00 |
|
Andrew Meadows
|
f6b2b43376
|
forget collision for this failure case
|
2014-05-05 12:31:36 -07:00 |
|
Andrew Meadows
|
d2f858100e
|
add CollisionList::deleteLastCollision()
|
2014-05-05 12:30:38 -07:00 |
|
Andrew Meadows
|
0cecef6441
|
fix "nearly but not quite" edge/corner collisions
|
2014-05-05 10:01:31 -07:00 |
|
Andrew Meadows
|
b097eed1aa
|
fix sphere-cube collisions at edges (really)
|
2014-05-05 08:47:02 -07:00 |
|
Andrew Meadows
|
1d64262067
|
whoops, committed wrong file. Rolling back.
|
2014-05-05 08:46:35 -07:00 |
|
Andrew Meadows
|
6cc8d53a6d
|
fix sphere-cube collisions at edges
|
2014-05-04 22:14:05 -07:00 |
|
Andrew Meadows
|
0e3d66caf6
|
fix incorrect rescale of vec3
|
2014-05-02 22:27:52 -07:00 |
|
Andrew Meadows
|
c8e56a97cc
|
fix sphere-cube collisions, with tests
|
2014-05-02 21:47:27 -07:00 |
|
Andrew Meadows
|
5ac301a77e
|
set the _lastFloorContactPoint
|
2014-05-02 11:17:46 -07:00 |
|
Andrew Meadows
|
d8cb84080c
|
stop avatar integration when standing at rest
|
2014-05-02 10:43:10 -07:00 |
|
Andrew Meadows
|
9ceda573cc
|
sphere-cube: add the penetration don't subtract it
|
2014-05-02 10:39:27 -07:00 |
|
Andrew Meadows
|
22bf10a9e7
|
repair addThrust() API so hydraMove.js works
|
2014-05-01 16:18:55 -07:00 |
|
Andrew Meadows
|
b4d3df47fb
|
Disable gravity on script start
|
2014-05-01 12:09:34 -07:00 |
|
Andrew Meadows
|
8d4dca31c5
|
add velocity model for controlling avatar motion
|
2014-05-01 12:05:34 -07:00 |
|
Andrew Meadows
|
db9221da6e
|
fix misspelled slot
|
2014-04-30 10:38:42 -07:00 |
|
Andrew Meadows
|
34aaf98b53
|
cleanup around how boundary shape is computed
|
2014-04-29 15:16:50 -07:00 |
|
Andrew Meadows
|
4e34d0339d
|
set position in ctor that takes endpoints
and some cleanup
|
2014-04-29 15:15:53 -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
|
ae3b58a33f
|
use setGravity() instead of setting it directly
|
2014-04-28 16:46:16 -07:00 |
|
Andrew Meadows
|
c7dbc5984f
|
add local gravity option parameter for MyAvatar
|
2014-04-28 16:40:22 -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 |
|
Andrew Meadows
|
b05a315b5a
|
merge upstream/master into andrew/inertia
Conflicts:
interface/src/avatar/MyAvatar.cpp
|
2014-04-25 14:52:44 -07:00 |
|
Brad Hefta-Gaub
|
b0a561198b
|
Merge pull request #2721 from Atlante45/improved_undo
Handle subtrees with undo
|
2014-04-25 14:32:49 -07:00 |
|
Andrew Meadows
|
39252a8339
|
swissArmyJetpack.js now toggles "obey gravity"
|
2014-04-25 14:17:39 -07:00 |
|
Andrew Meadows
|
c2f1507df1
|
move AVATAR_MOTION_OBEY_GRAVITY to libs
|
2014-04-25 14:16:42 -07:00 |
|
Andrew Meadows
|
357aac833e
|
expose AVATAR_MOTION_OBEY_GRAVITY const to JS
|
2014-04-25 14:15:40 -07:00 |
|
Andrew Meadows
|
2d5bfc81cd
|
add Vec3.distance(Vec3, Vec3) for JS
|
2014-04-25 14:14:34 -07:00 |
|
Andrew Meadows
|
ecae89489e
|
mispelled slot
|
2014-04-25 14:13:44 -07:00 |
|
Clément Brisset
|
c2a91b4ee9
|
Merge pull request #2732 from ZappoMan/fixtimestamps
improved guards against extremely unlikely packets
|
2014-04-25 13:55:13 -07:00 |
|
Clément Brisset
|
f0a87c1072
|
Merge pull request #2733 from birarda/master
pass the owner scope for oauth token requests
|
2014-04-25 13:42:00 -07:00 |
|
Atlante45
|
3143e10bd8
|
CR
|
2014-04-25 13:33:59 -07:00 |
|
Stephen Birarda
|
8e12c0d8e5
|
pass the owner scope to auth requests
|
2014-04-25 13:22:18 -07:00 |
|
ZappoMan
|
7c1b5ba092
|
Merge branch 'master' of https://github.com/worklist/hifi into fixtimestamps
Conflicts:
libraries/shared/src/SharedUtil.cpp
|
2014-04-25 13:14:52 -07:00 |
|
Brad Hefta-Gaub
|
588128ea53
|
Merge pull request #2731 from Atlante45/fix_for_non_fired_timestamp_timer
Fix timestamp timer not fired
|
2014-04-25 13:02:19 -07:00 |
|
Atlante45
|
8b4a910040
|
Fix timestamp timer not fired
|
2014-04-25 12:19:18 -07:00 |
|
Atlante45
|
860766fb49
|
Merge branch 'master' of https://github.com/highfidelity/hifi into improved_undo
|
2014-04-25 11:41:43 -07:00 |
|
ZappoMan
|
6acdf9cd6c
|
fix issues with bad timestamps
|
2014-04-25 11:21:02 -07:00 |
|
Andrew Meadows
|
f91c098589
|
merge
|
2014-04-24 19:13:22 -07:00 |
|
Andrew Meadows
|
afb12bcd70
|
add swissArmyJetpack.js
|
2014-04-24 19:12:23 -07:00 |
|
Philip Rosedale
|
9884d74f60
|
Merge pull request #2728 from Atlante45/fix_audio_jitter
Fix audio jitter
|
2014-04-24 18:25:16 -07:00 |
|
Atlante45
|
cf7fe2306b
|
Fix audio jitter
|
2014-04-24 18:10:51 -07:00 |
|
Philip Rosedale
|
c66805e2fb
|
Merge pull request #2727 from Atlante45/fix_error_from_remove_gettimeofday
Fix error introduced with gettimeofday removing + spelling mistake
|
2014-04-24 17:40:47 -07:00 |
|
Atlante45
|
01637e8037
|
Fix error introduced with gettimeofday removing + spelling mistake
|
2014-04-24 17:37:48 -07:00 |
|