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

5340 commits

Author SHA1 Message Date
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
Eric Levin
0932df621a Changed MIN_TIME_INTERVAL to be in milliseconds 2016-02-05 22:15:16 -08:00
Eric Levin
053f163b92 Changed wait time of avatar list query to entity query to update time so avatar positions don't pile up 2016-02-05 22:13:25 -08:00
ericrius1
6d64da2df7 expiration time is 5 seconds now 2016-02-05 17:28:55 -08:00
ericrius1
4c33c6e171 clean up 2016-02-05 17:13:29 -08:00
samcake
e5f3805d0e Fixing the item insert in cell criteria for subcell and adding debgging tool 2016-02-05 16:49:43 -08:00
ericrius1
1c54de6f57 better logging 2016-02-05 16:11:43 -08:00
ericrius1
a5c037b23f possible bug fix for sound not playing on avatar rentry 2016-02-05 16:09:30 -08:00
ericrius1
208007c9d8 log 2016-02-05 15:43:15 -08:00
Seth Alves
d567020283 trying to zero velocity during an equiped adjustment 2016-02-05 15:01:46 -08:00
Seth Alves
07c70a1ba2 refix double action grabs 2016-02-05 14:25:46 -08:00
Seth Alves
b1267f9d37 try to put things back when a double-parent equip is released. if an equpped object is pulled too far from a hand, automatically unequip it. 2016-02-05 13:53:45 -08:00
ericrius1
609ddda74e adjusting for interval and interval spread 2016-02-05 13:49:44 -08:00
ericrius1
a65c869239 removed commenting 2016-02-05 13:36:31 -08:00
ericrius1
120c5ac370 Able to switch url sounds 2016-02-05 13:35:45 -08:00
ericrius1
355f60f088 Not adding deleted avatars to the list of avatars to use for querying 2016-02-05 11:07:21 -08:00
Babiuch, Ryan Nicholas
aab98db812 Merge branch 'master' of github.com:highfidelity/hifi 2016-02-05 12:49:38 -06:00
samcake
57b6ad3c54 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-05 09:23:31 -08:00
ericrius1
aa49db9992 updating sound volume 2016-02-04 19:21:12 -08:00
Seth Alves
ae6a5aa286 add some debugging to handControllerGrab 2016-02-04 18:10:43 -08:00
Seth Alves
27711a04b9 Merge branch 'master' of github.com:highfidelity/hifi into dressing-room 2016-02-04 18:10:03 -08:00
ericrius1
9b0e20d82b stopping sound injector if sound was looping 2016-02-04 17:57:25 -08:00
ericrius1
f6a091b941 basic of new design working 2016-02-04 17:41:52 -08:00
ericrius1
16af9b9e31 deleting sound entity if it hasn't been around for a while 2016-02-04 17:12:25 -08:00
ericrius1
c8704234b1 basic setup for new design 2016-02-04 16:19:23 -08:00
ericrius1
8591de4873 getting avatar position 2016-02-04 11:57:22 -08:00
samcake
cc7f03e7e4 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-04 10:29:41 -08: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
ericrius1
e3fe20c818 query octree right away 2016-02-03 13:50:10 -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
Seth Alves
56679c6a1d Merge branch 'master' of github.com:highfidelity/hifi into dressing-room 2016-02-03 12:50:52 -08: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
ericrius1
03f90c2070 fixed potential bug 2016-02-03 12:11:09 -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
samcake
edbcef20d4 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-03 09:44:05 -08:00
Seth Alves
e0ab6b6716 Merge branch 'dressing-room' of github.com:imgntn/hifi into dressing-room 2016-02-03 09:30:21 -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
ericrius1
a95176be8f added 0 prefix to nums 2016-02-02 18:22:39 -08:00
samcake
cb59cccc0c Adding 2 lists per brick now, the subcelItems and the regular items, trying to use it, probably buggy 2016-02-02 18:10:56 -08:00
ericrius1
89d235e2c2 First cut complete 2016-02-02 18:09:26 -08:00
ericrius1
e6a1300cd9 random interval spread 2016-02-02 17:28:21 -08:00
ericrius1
c26d7e61b5 interval is working 2016-02-02 17:18:24 -08:00
ericrius1
1bfe14c70e If sound is already downloaded, it's fetched from cache 2016-02-02 16:38:14 -08: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
ericrius1
964763b88c caching sounds 2016-02-02 15:54:37 -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
James B. Pollack
0587981a20 add doppleganger features 2016-02-02 15:07:38 -08:00
ericrius1
d08bdb371a receiving push messages from entity script 2016-02-02 14:50:30 -08:00
Howard Stearns
fbcacbe14a simpler betterNumber test. 2016-02-02 14:31:32 -08:00
Seth Alves
260d27f4d7 increase drop-on-joint radius. fix bug that kept from dropping on hips (index 0). save adjustments if in dressing room 2016-02-02 14:31:20 -08:00
Howard Stearns
3d01b3ec2b watchdog 2016-02-02 14:15:03 -08:00
ericrius1
0aa68328c8 adding sound entity script 2016-02-02 13:59:56 -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
ericrius1
93220c3b01 two sounds 2016-02-02 10:51:10 -08:00
ericrius1
20d1ba11c3 Basic ac sound playing and entity searching 
Injecting sounds from entity
 2016-02-02 10:37:23 -08:00
Ryan Huffman
57d92bcfa6 Stop creation of GridTool altogether in edit.js 2016-02-02 10:13:24 -08:00
Seth Alves
3bbecf5c8b Merge branch 'adjust-palm-position' of github.com:sethalves/hifi into dressing-room 2016-02-02 10:04:35 -08:00
Seth Alves
53e3f5a5d1 Merge branch 'save-held-adjustments' of github.com:sethalves/hifi into dressing-room 2016-02-02 10:04:15 -08:00
Ryan Huffman
dad36b73fc Disable gridTool in edit.js 2016-02-02 09:57:52 -08:00
Seth Alves
fec479d70a Merge branch 'master' of github.com:highfidelity/hifi into dressing-room 2016-02-02 09:25:11 -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
c570f4af67 Merge branch 'master' of github.com:highfidelity/hifi into dressing-room 2016-02-01 16:15:42 -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
ericrius1
25d5904d2d trying to destroy web window 2016-02-01 15:23:54 -08:00
Seth Alves
e4ef3ae869 automatically save adjustments to offset of equipped items 2016-02-01 15:06:53 -08:00
ericrius1
0bd6d22611 going to destroy entire page and recreate 2016-02-01 14:46:09 -08:00
Seth Alves
793b0f400f Merge branch 'master' of github.com:highfidelity/hifi into dressing-room 2016-02-01 14:35:37 -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
ericrius1
81f95c6fc7 better starting values for particles 2016-02-01 12:48:40 -08:00
ericrius1
84f862d9c1 receiving web event from particle gui 2016-02-01 12:23:39 -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
aa6742a844 merge from james/removeHighFreqMsg 2016-02-01 10:01:50 -08:00
Seth Alves
d034850c49 Merge branch 'equip-via-parenting' of github.com:sethalves/hifi into dressing-room 2016-02-01 09:59:52 -08:00
Seth Alves
182ae22b44 merge James' doppelganger changes into Tony's 2016-02-01 09:58:35 -08:00
Seth Alves
6ca17a904a merge James' doppelganger changes into Tony's 2016-02-01 09:58:24 -08:00
Seth Alves
a65ff76da1 Merge branch 'tony/mirrored-doppelganger' of github.com:hyperlogic/hifi into dressing-room 2016-02-01 09:56:52 -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
Babiuch, Ryan Nicholas
47f7d55e2c Working energy usage for entity manipulation. 
- Working example in examples/example/ui/MyEnergyBar.js
 2016-02-01 08:32:52 -06: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
ericrius1
f9a76a7502 Merge branch 'master' into particlesInEdit2 2016-01-29 17:20:48 -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
James B. Pollack
43f3b6409a Merge pull request #6966 from ericrius1/zoneEntityProps 
Moves zone props to top of entity properties panel
 2016-01-29 09:34:04 -08:00
Philip Rosedale
ee95f7906b Fish flocking example 2016-01-29 00:59:06 -08:00
Philip Rosedale
9f95a9de89 Limits on distance and mass for far grabbing 2016-01-29 00:52:59 -08:00
Brad Hefta-Gaub
8efe15cb21 Merge pull request #6963 from jherico/qmlOverlays 
Make all 2D overlays QML-based
 2016-01-28 23:33:30 -08:00
ericrius1
6be550a144 resolved conflicts 2016-01-28 17:08:24 -08:00
ericrius1
1a7887520d in progress 2016-01-28 16:38:24 -08:00
Brad Davis
5b817ccc21 Make all 2D overlays QML 2016-01-28 16:03:26 -08:00
James B. Pollack
96ddb9febb Merge pull request #6970 from ericrius1/webEntityURL 
Moved source URL up to top of entity properties panel
 2016-01-28 16:02:21 -08:00
ericrius1
804f82f2f1 good progress- can create particle entity from menu 2016-01-28 15:57:35 -08:00
ericrius1
0511ff70ac particle panel in tool window 2016-01-28 14:34:19 -08:00
ericrius1
628158e2fb Merge branch 'master' into zoneEntityProps 2016-01-28 13:26:10 -08:00
ericrius1
c30109ec29 trying to sync again 2016-01-28 13:21:48 -08:00
ericrius1
2acc88261f added particles 2016-01-28 13:14:36 -08:00
Howard Stearns
33226796ff Merge pull request #6964 from ericrius1/editHref 
Validate href entity property (hifi:// only)
 2016-01-28 12:29:18 -08:00
ericrius1
98453c085b Moved source URL up to top of entity properties panel 2016-01-28 12:08:21 -08:00
Andrew Meadows
3e35a5fc2d Merge pull request #6937 from ctrlaltdavid/20790 
Make entity properties be undefined after entity is unloaded
 2016-01-28 11:59:01 -08:00
ericrius1
3fff5868e8 Fix syntax error 2016-01-28 11:57:33 -08:00
ericrius1
40c66a94be Moves text props to top of Entity Props panel 2016-01-28 11:44:50 -08:00
ericrius1
191e6090e7 Moves zone props to top of entity props panel 2016-01-28 11:36:23 -08:00