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

5183 commits

Author SHA1 Message Date
Howard Stearns
4241f4b305 Convert all simple one-liners containing ') { ' to instead take up three lines. 2016-02-10 12:03:07 -08:00
howard-stearns
cecf2fb611 Up the number. 2016-02-08 17:00:29 -08:00
howard-stearns
d174e86347 fix batonName for entity script case 2016-02-08 16:45:25 -08:00
Howard Stearns
9670cf3fe3 Reference correct filename. 2016-02-08 09:37:56 -08:00
Howard Stearns
61e521bc63 Fix build (and remove unneeded test file). 2016-02-08 09:33:32 -08:00
Howard Stearns
4a50d7c456 Merge branch 'master' of https://github.com/highfidelity/hifi into virtualBaton 2016-02-07 18:41:04 -08:00
Howard Stearns
b08f364447 yes! 2016-02-07 18:29:10 -08:00
Howard Stearns
e52b910e53 connectionTest 2016-02-07 16:39:29 -08:00
Howard Stearns
b6472217c4 Clear accepted/bestPromise .winner when disconnected. 2016-02-07 16:08:40 -08:00
Howard Stearns
8b27b90566 Verify validId before reporting a winning reponse to a proposal. 2016-02-07 14:57:29 -08:00
Howard Stearns
1a0017900c noisy connectionTest 2016-02-07 14:10:55 -08:00
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
Babiuch, Ryan Nicholas
aab98db812 Merge branch 'master' of github.com:highfidelity/hifi 2016-02-05 12:49:38 -06:00
Babiuch, Ryan Nicholas
142ec76600 Merge branch 'master' of github.com:highfidelity/hifi 2016-02-04 08:18:47 -06:00
Howard Stearns
287d91d4b2 better 2016-02-03 20:57:35 -08:00
Bradley Austin Davis
c1d45b0c78 Remove declarative form creation from WindowScriptingInterface 2016-02-03 14:50:59 -08:00
Babiuch, Ryan Nicholas
786400eb53 Merge branch 'WorkingEnergy' 2016-02-03 14:53:28 -06:00
Babiuch, Ryan Nicholas
d7951f4300 Merge branch 'master' of github.com:highfidelity/hifi 2016-02-03 14:52:08 -06:00
Andrew Meadows
00f30201a7 Merge pull request #7003 from sethalves/save-held-adjustments 
automatically save adjustments to offsets of equipped items
 2016-02-03 12:21:17 -08:00
Brad Hefta-Gaub
839ce50bde Merge pull request #7018 from jherico/qml 
QML fixes
 2016-02-03 11:59:27 -08:00
Babiuch, Ryan Nicholas
3d727d76c2 Merge branch 'master' of github.com:highfidelity/hifi 2016-02-03 13:39:13 -06:00
Babiuch, Ryan Nicholas
3cb2f9c4b7 Exposed energy cost multiplier to scripting. 
- field: costMultiplier
 2016-02-03 13:29:42 -06:00
Howard Stearns
055de61ec6 update 2016-02-03 11:10:04 -08:00
Seth Alves
ad2a7bfc3c code review 2016-02-03 10:54:08 -08:00
Andrew Meadows
cd56d635e1 Merge pull request #7012 from sethalves/adjust-palm-position 
base palm position on finger joint rather than an offset from hand joint
 2016-02-03 10:34:39 -08:00
Babiuch, Ryan Nicholas
7dd5bca17f Bug fixes and debt reductions on energy calculations. 
- removed superfluous code interfacing with scripts
- favor floats over doubles in cost calculations
- default avatar energy is maximum float value for cases where energy script is not loaded in order to still manipulate entities.
 2016-02-03 10:46:28 -06:00
Seth Alves
30e97c2a76 run attachedEntitiesManager.js by default, but without a UI 2016-02-02 16:34:06 -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
Bradley Austin Davis
f24f2749e1 Make users.js show QML window for edit friends 2016-02-02 15:19:12 -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
Seth Alves
2501be16cb base palm position on finger joint rather than an offset from hand joint. double size of near-grab sphere 2016-02-01 18:11:27 -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
Seth Alves
e4ef3ae869 automatically save adjustments to offset of equipped items 2016-02-01 15:06:53 -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