Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-10 13:58:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
38701 commits 74 branches 59 tags 1.2 GiB
Commit graph

38701 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
bc86298097 merge from upstream 2016-02-01 07:01:12 -08:00
Thijs Wenker
8f6e7018bd Fix for Hydra scaling 
This PR fixes the hydra (and probably other hand controllers) while scaling.

Testing notes:
- Enable your hydra's
- Grow your avatar (x5 or x10) (With the `+` key)
- Spreading your arms in a T-pose should work without any scaling issues
- Reset your scale using the `=` key
 2016-01-31 23:39:43 +01:00
James B. Pollack
ef380ca38c Merge pull request #6989 from ctrlaltdavid/20796 
Restart at last location after crash
 2016-01-30 20:10:58 -08:00
James B. Pollack
499e6d9804 update readme 2016-01-30 20:04:51 -08:00
James B. Pollack
7767dfb213 remove high freq messages 2016-01-30 19:59:56 -08:00
Anthony Thibault
6813f692da doppelganger.js: mirror joint rotations & translations about x-axis 
It's not pretty, mostly due to the lack of JavaScript access to the skeleton parent linkage information,
and lack of conversions between absolute and relative-to-parent joint rotations/translations.
 2016-01-30 16:16:26 -08:00
James B. Pollack
3e43821a52 remove doc file from scripts dir 2016-01-30 12:44:45 -08:00
James B. Pollack
fb6fcab078 add simple headers to all files 2016-01-30 12:28:48 -08:00
James B. Pollack
7d0eb79115 sanatize files and remove unused messages stuff 2016-01-30 12:13:40 -08:00
James B. Pollack
514edee3f1 cleanup and fix script paths to get random movement working again 2016-01-30 11:53:10 -08:00
Brad Davis
ffe7a0eaf1 Merge pull request #6978 from PhilipRosedale/flocking 
Fish Tank flocking example - FlockOfFish.js
 2016-01-29 21:37:09 -05:00
Seth Alves
6697b5ae5f get multi-near-grabs working again 2016-01-29 18:36:22 -08:00
Seefo
07043d537f Fixed Ubuntu warnings 2016-01-29 21:11:44 -05:00
Seth Alves
9a16bc7d22 when a parented equip or grab releases and the object should fall, give it a little velocity so bullet doesn't consider it static 2016-01-29 18:01:57 -08:00
Seth Alves
0c5c682887 unmuddle saved state in Settings and userData 2016-01-29 17:38:24 -08:00
Philip Rosedale
1766f3fc23 remove debug 2016-01-29 17:20:22 -08:00
Philip Rosedale
ca459e0bd6 Merge branch 'master' of https://github.com/highfidelity/hifi into flocking 2016-01-29 17:18:35 -08:00
Philip Rosedale
11890badd8 Changes per PR suggestions 2016-01-29 17:16:48 -08:00
Seefo
0fad9b6755 Changed literals to follow coding standard 2016-01-29 20:07:45 -05:00
James B. Pollack
16f353719b Merge pull request #6969 from ericrius1/textEntityProps 
Moves text properties to top of Entity Properties panel
 2016-01-29 17:02:31 -08:00
Seefo
56c3a37cdd Fixed indentation 2016-01-29 19:59:28 -05:00
James B. Pollack
0e036d3e2c cellscience 2016-01-29 16:58:49 -08:00
ericrius1
559fb9cbde fixed merge conflicts 2016-01-29 16:42:10 -08:00
Seefo
77050b13dc Adjusted default pitch/yaw speed 2016-01-29 19:41:34 -05:00
Seth Alves
464f74fc1b don't attempt to distance-grab non-physical objects 2016-01-29 16:37:19 -08:00
Seefo
33a01819e3 Fixed indentation 2016-01-29 19:36:23 -05:00
Seefo
ffa6687af3 Added setting dialogs for camera pitch and yaw 2016-01-29 19:34:57 -05:00
ericrius1
c54711614e Merge remote-tracking branch 'upstream/master' 2016-01-29 16:33:51 -08:00
Ryan Huffman
4ed38c4104 Merge pull request #6986 from birarda/injector-restart 
fix for injector restart not restarting
 2016-01-29 16:27:34 -08:00
howard-stearns
ceed571c82 Look harder for head, log if not found, and compute what we need 
regardless.
 2016-01-29 16:02:58 -08:00
Ryan Huffman
bab27e6b79 Merge pull request #6957 from birarda/audio-mixer-coma 
force AC assignment stop during DOS, process events for rapid injectors
 2016-01-29 15:56:58 -08:00
Seefo
22044db0b1 Readded center avatar in view option now that third person camera is fixed 2016-01-29 18:48:49 -05:00
Ryan Huffman
acf96a401f Fix marketplace imports failing silently if edit.js not running 2016-01-29 15:48:08 -08:00
David Rowe
e07baf916b Fixed a typo noticed in passing 2016-01-30 12:30:21 +13:00
David Rowe
a5bc1cfd19 Periodically store avatar location 2016-01-30 12:27:47 +13:00
David Rowe
d2cdbebc94 Store avatar location after a teleport 2016-01-30 12:26:50 +13:00
David Rowe
be4022983b Don't store avatar location immediately after a host change 
Because the avatar location is 0,0,0 rather than the end target.
 2016-01-30 12:25:56 +13:00
Seth Alves
9ca89172f6 change grab script to equip with parenting rather than action. various other changes to messaging. added initial version of attachedEntitiesManager.js. updated toybox scripts to track messaging changes 2016-01-29 15:17:46 -08:00
Seth Alves
f554e25e36 Merge branch 'master' of github.com:highfidelity/hifi into equip-via-parenting 2016-01-29 15:15:28 -08:00
Stephen Birarda
d7990bf88a reset hasSentFirstFrame to false for double frame on first send 2016-01-29 14:55:08 -08:00
Andrew Meadows
de54a0ac4b remove cruft 2016-01-29 14:51:24 -08:00
Stephen Birarda
d3028606c5 retart the nextFrame and frameTimer on injector restart 2016-01-29 14:47:27 -08:00
James B. Pollack
cb2fbd7e7f clear octree interval 2016-01-29 14:29:27 -08:00
Andrew Meadows
14ec1b6295 reduce hand IK coupling to hip position 2016-01-29 14:28:56 -08:00
Andrew Meadows
a98459dfa8 minor IK optimization: changed accumulators only 2016-01-29 14:28:56 -08:00
Andrew Meadows
449d566d2a properly track lowestMovedIndex 2016-01-29 14:28:56 -08:00
Andrew Meadows
48f6a9c05f fix IK looping error after minor refactor 2016-01-29 14:28:56 -08:00
Andrew Meadows
7b3f688a17 pull CCD IK solution pass into protected method 2016-01-29 14:28:56 -08:00
James B. Pollack
5e5c6158bb show how to use an ac to spawn and respawn entities 2016-01-29 14:22:21 -08:00
Ryan Huffman
9a2af26906 Fix 'Import Entities' causing error when cancelling 2016-01-29 14:12:27 -08:00