Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-03 23:03:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
38650 commits 76 branches 59 tags 1.2 GiB
Commit graph

5155 commits

Author SHA1 Message Date
Howard Stearns
8f714980df debuggable 2016-02-07 13:49:46 -08:00
Howard Stearns
7b39700136 one ring to rule 2016-02-07 13:33:21 -08:00
Howard Stearns
dc50efe7ec final? 2016-02-07 10:42:43 -08:00
Howard Stearns
287d91d4b2 better 2016-02-03 20:57:35 -08:00
Howard Stearns
055de61ec6 update 2016-02-03 11:10:04 -08:00
Howard Stearns
59f1cdfc18 Reinit bestPromise with each proposal. 2016-02-02 16:18:33 -08:00
Howard Stearns
03244fbeb5 fix promise-sending. 2016-02-02 15:37:22 -08:00
Howard Stearns
fbcacbe14a simpler betterNumber test. 2016-02-02 14:31:32 -08:00
Howard Stearns
3d01b3ec2b watchdog 2016-02-02 14:15:03 -08:00
Howard Stearns
61393818fe Merge branch 'master' of https://github.com/highfidelity/hifi into virtualBaton 2016-02-02 13:41:54 -08:00
Howard Stearns
38443af437 typo 2016-02-02 13:36:40 -08:00
Howard Stearns
cdff3323fb typo 2016-02-02 13:25:42 -08:00
Howard Stearns
d0af2220dc Virtual baton. 2016-02-02 13:20:41 -08:00
Ryan Huffman
57d92bcfa6 Stop creation of GridTool altogether in edit.js 2016-02-02 10:13:24 -08:00
Ryan Huffman
dad36b73fc Disable gridTool in edit.js 2016-02-02 09:57:52 -08:00
James B. Pollack
d25dbfff9f Merge pull request #6993 from hyperlogic/tony/mirrored-doppelganger 
doppelganger.js: mirror joint rotations & translations about x-axis
 2016-02-01 19:09:42 -08:00
James B. Pollack
43844dd0be Merge pull request #7008 from ericrius1/editPropsDecimals 
Fixed bug where lack of 0 as prefix for numbers would throw an error
 2016-02-01 17:35:44 -08:00
ericrius1
1387f5f322 Fixed bug where lack of 0 as prefix for numbers would throw an error 2016-02-01 16:44:55 -08:00
Seth Alves
3209ac4f68 use controller hand rotation rather than IK hand rotation in grab script 2016-02-01 15:42:32 -08:00
Brad Hefta-Gaub
9361c1655e Merge pull request #6980 from howard-stearns/performance-stats-repro-scripts 
Performance stats repro scripts
 2016-02-01 13:52:53 -08:00
Seth Alves
2207588c01 merge from upstream 2016-02-01 13:19:45 -08:00
howard-stearns
ae10d4343c Add data for a 2k triangle model. 2016-02-01 11:47:33 -08:00
Seth Alves
9dc6f08ae2 Merge pull request #6995 from imgntn/removeHighFreqMsg 
Remove high frequency messages from grab script
 2016-02-01 11:44:43 -08:00
Howard Stearns
d8069b6dbf Whitespace and jslinting. 2016-02-01 11:28:51 -08:00
Howard Stearns
11d80cdc94 Merge branch 'master' of https://github.com/highfidelity/hifi into performance-stats-repro-scripts 2016-02-01 10:38:13 -08:00
Seth Alves
9a4431560f Merge branch 'master' of github.com:highfidelity/hifi into equip-via-parenting 2016-02-01 09:14:53 -08:00
Seth Alves
fb33131ac5 Merge pull request #6985 from imgntn/entitySpawnerAC 
Show how to use an AC to spawn / respawn entities
 2016-02-01 07:05:07 -08:00
Seth Alves
6927f9f503 Merge pull request #6984 from huffman/fix-edit-import-cancel 
Fix 'Import Entities' causing error when cancelling
 2016-02-01 07:04:36 -08:00
Seth Alves
f5ccf19f41 Merge pull request #6982 from howard-stearns/update-away-for-image-overlay 
Update away.js to use an image instead of text.
 2016-02-01 07:04:11 -08:00
Seth Alves
bc86298097 merge from upstream 2016-02-01 07:01:12 -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
Seth Alves
6697b5ae5f get multi-near-grabs working again 2016-01-29 18:36:22 -08: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
ericrius1
559fb9cbde fixed merge conflicts 2016-01-29 16:42:10 -08:00
Seth Alves
464f74fc1b don't attempt to distance-grab non-physical objects 2016-01-29 16:37:19 -08: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
James B. Pollack
cb2fbd7e7f clear octree interval 2016-01-29 14:29:27 -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
Brad Davis
c4794dd0d5 Fix entity properties HTML 2016-01-29 13:41:43 -08:00
Howard Stearns
a117e73ea4 Update away.js to use an image instead of text. 2016-01-29 11:56:08 -08:00
howard-stearns
5376ba9b7d update to match lod doc 2016-01-29 11:27:27 -08:00
Philip Rosedale
a72c49793e speedups per code review 2016-01-29 10:57:17 -08:00