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

5451 commits

Author SHA1 Message Date
Brad Hefta-Gaub
d1e1067e5a allow hydra mouse to know the correct size of screen to target 2016-02-18 22:30:31 -08:00
Zach Pomerantz
2dd1cf2f15 Update Render.fromJSON to Render.load 2016-02-18 18:21:26 -08:00
ericrius1
33a232edde got rid of magic numbers 2016-02-18 18:17:37 -08:00
Zach Pomerantz
981d4d37ca Update render/debug.js 
- Add a toggle for the entire UI
- Set items sliders minimums to -1
- Fix off-by-one with debug buffer radios
 2016-02-18 17:45:55 -08:00
ericrius1
d0660fc90a logging 2016-02-18 16:17:22 -08:00
ericrius1
bc0216633e more logging 2016-02-18 16:10:12 -08:00
ericrius1
c3a687e294 ac test 2016-02-18 16:06:53 -08:00
Zach Pomerantz
b68213f9bf Reintroduce grid to edit.js 2016-02-18 15:48:25 -08:00
ericrius1
b0664b587f bumped injector count 2016-02-18 15:39:38 -08:00
ericrius1
efbb5ec967 updated test 2016-02-18 12:14:30 -08:00
ericrius1
ec1c7925c0 updated logging 2016-02-18 12:02:22 -08:00
ericrius1
1d9b3fadaf more logging 2016-02-18 12:00:24 -08:00
ericrius1
eabeb98076 injector load 2016-02-18 11:50:26 -08:00
Brad Hefta-Gaub
0467930c57 Merge branch 'master' of https://github.com/highfidelity/hifi into hmdHacking 
Conflicts:
	examples/controllers/handControllerGrab.js
 2016-02-18 10:30:43 -08:00
Chris Collins
e3ae2baa7b Merge pull request #7123 from ericrius1/editProps 
added collidesWith property to entities list
 2016-02-18 09:11:18 -08:00
James B. Pollack
acaa824cb5 but only position 2016-02-18 09:00:39 -08:00
James B. Pollack
e6662edcb4 revert step size change 2016-02-18 08:57:06 -08:00
ericrius1
5f5af9c6a0 fixed edit bug 2016-02-17 17:45:57 -08:00
James B. Pollack
89039747a2 Update entityProperties.html 
lowercase 'static' like other props
 2016-02-17 16:22:14 -08:00
ericrius1
19cd3ec152 checkboxes working 2016-02-17 13:12:17 -08:00
Seth Alves
64e50c5329 keep search-line from freezing during a far-trigger 2016-02-17 12:35:23 -08:00
Seth Alves
69caf1df4d fix far-trigger 2016-02-17 12:04:25 -08:00
ericrius1
94fdf6b091 checkboxes working 2016-02-17 11:59:14 -08:00
ericrius1
f85916e808 checkbox keeps getting checked... 2016-02-17 10:27:53 -08:00
ericrius1
0f8f67ef0b removing dynamic. need to add others 2016-02-16 19:34:32 -08:00
James B. Pollack
f2445e81e0 Merge pull request #7110 from ericrius1/particlesInEdit2 
Particles in edit
 2016-02-16 18:33:01 -08:00
ericrius1
168fb67d67 making collidesWith a checkbox 2016-02-16 18:19:12 -08:00
ericrius1
ce2d76d3f3 made export settings a text area 2016-02-16 17:57:09 -08:00
ericrius1
7a3443968d added collides with property 2016-02-16 15:55:11 -08:00
ericrius1
c43500f38a added textures field to particle explorer 2016-02-16 15:36:03 -08:00
ericrius1
023fd0607d added alpha start 2016-02-16 15:29:42 -08:00
ericrius1
d9d0e78dc5 button close 2016-02-16 15:21:18 -08:00
Chris Collins
05b9d88f08 Merge pull request #7108 from imgntn/moreprecision 
More precision for edit.js
 2016-02-16 15:03:10 -08:00
ericrius1
bf21bc2d48 reworked exporting properties 2016-02-16 14:06:02 -08:00
ericrius1
ad43e4ff6d Fixed multiple particle tabs appearing 2016-02-16 12:56:34 -08:00
Brad Hefta-Gaub
a25581c656 clean up reticle scripting to be exposed through Reticle object (implemented int ApplicationCompositor) 2016-02-16 12:11:58 -08:00
ericrius1
46907f446b Listening for page loaded event instead of set timeout === less lag 2016-02-16 11:42:01 -08:00
ericrius1
46679b29f7 particle tab deleted when particle system deleted 2016-02-16 11:11:58 -08:00
Andrew Meadows
f932999b2c Merge pull request #7113 from zzmp/rm/draw-on-hud 
Remove drawOnHUD property from 3d overlays
 2016-02-16 09:44:05 -08:00
Andrew Meadows
7dbb42c339 Merge pull request #7109 from zzmp/fix/edit-image-color 
Remove image color in edit.js
 2016-02-16 09:27:06 -08:00
Zach Pomerantz
8c01d5f82b Remove camera tool's 3d hud overlays 2016-02-15 14:03:57 -08:00
Chris Collins
bf52d30216 Merge pull request #7107 from ericrius1/spraypaintFix 
Fix for spraypaint orientation
 2016-02-15 13:45:12 -08:00
ericrius1
f98941e80f switching between particle entities 2016-02-15 12:52:05 -08:00
ericrius1
85d8fc2944 particle image 2016-02-15 11:56:41 -08:00
Zach Pomerantz
b8e8859761 Remove image color in edit.js 
This removes the warning generated by ImageOverlay.qml
for the unhandled property, color.
 2016-02-15 11:51:11 -08:00
James B. Pollack
72186f916c more precision 2016-02-15 11:35:28 -08:00
ericrius1
80a368933f Fix for spraypaint orientation 2016-02-15 11:13:06 -08:00
ericrius1
3adc88aa70 need to fix icon 2016-02-15 11:11:23 -08:00
ericrius1
e4d4044a2b particleExplorer works in edit tab 2016-02-15 09:41:47 -08:00
samcake
545f276fdf Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-15 09:29:00 -08:00
ericrius1
b92c5555fe Merge branch 'master' into particlesInEdit2 2016-02-15 09:14:37 -08:00
Brad Hefta-Gaub
376c23f1a3 Merge pull request #7100 from imgntn/edit_props 
Hide hyperlink property for web entities
 2016-02-12 18:29:35 -08:00
Brad Davis
b5cba79f0c Merge pull request #7095 from ZappoMan/hmdHacking 
Various bug fixes in related to HMD overlay support
 2016-02-12 17:50:42 -08:00
Brad Hefta-Gaub
48fe638312 Merge pull request #7104 from howard-stearns/update-orbitingSound 
update-orbitingSound.js
 2016-02-12 17:44:47 -08:00
Howard Stearns
9a3972c43f wait for sound to download 2016-02-12 17:42:44 -08:00
Brad Hefta-Gaub
d85a8a4fb9 Merge pull request #7103 from jherico/render-rate 
Don't drop to half the vsync rate when we can't keep up
 2016-02-12 17:11:03 -08:00
Brad Hefta-Gaub
df6437236e some CR feedback 2016-02-12 16:13:12 -08:00
Howard Stearns
25671fbefe Update orbitingSound.js to use a sample file that exists and setOptions function. 2016-02-12 16:01:23 -08:00
Brad Davis
908e153c36 Don't drop to half the vsync rate when we can't keep up 2016-02-12 15:57:27 -08:00
samcake
e3307d91ad Fix the debugging tool to be able to freeze the frustum for scene fetch and culling 2016-02-12 14:59:43 -08:00
James B. Pollack
c469fc6a29 hide hyperlink property for web entities 2016-02-12 14:30:21 -08:00
Chris Collins
3321265ae7 Merge pull request #7086 from howard-stearns/clear-away-on-buttons 
Clear pause/away on controller button press
 2016-02-12 12:56:42 -08:00
Brad Hefta-Gaub
1160ecb335 improvements in HMD UI behavior 2016-02-12 10:51:33 -08:00
samcake
5acfd5ff53 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-12 09:59:48 -08:00
Seth Alves
94bc1764a8 fix auto-updating of adjustments to worn or equipped entities 2016-02-12 06:58:44 -08:00
Seth Alves
ca5525cc3f if an entity already was near-picked, don't do a distance-to-center check on it. 2016-02-12 06:58:14 -08:00
samcake
f12030c1a4 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-11 18:41:02 -08:00
howard-stearns
7c4e31687c simpler/better/more reliable (peek) 2016-02-11 13:27:56 -08:00
Chris Collins
c6bc91f8b2 Merge pull request #7084 from jherico/toolTabs 
Allow closed tabs to delete properly
 2016-02-11 13:20:20 -08:00
howard-stearns
0d8404e7e8 interact more safely with mappings 2016-02-11 13:05:47 -08:00
howard-stearns
93d72833bf Merge branch 'master' of https://github.com/highfidelity/hifi into clear-away-on-buttons 2016-02-11 12:10:53 -08:00
Brad Davis
2ee1f18e06 Allow closed tabs to delete properly 2016-02-11 10:27:24 -08:00
Chris Collins
a4afa03fe5 Merge pull request #7077 from sethalves/clean-up-grab-signaling 
Clean up grab signaling + various fixes
 2016-02-11 10:20:56 -08:00
samcake
31230e81bb Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-11 10:05:58 -08:00
samcake
99e9b3ecdd Merge pull request #7043 from zzmp/fix/render-ui 
Revamp the render engine ui
 2016-02-11 09:57:51 -08:00
Zach Pomerantz
3bace3cdbb Rework the qml for brevity 2016-02-11 08:48:01 -08:00
Zach Pomerantz
9c5881345a Disable the AO gpuTimer pending cpp fix 2016-02-11 08:48:00 -08:00
Zach Pomerantz
dbc59ccc2b Revamp render engine debug JS script 2016-02-11 08:47:59 -08:00
Seth Alves
880aedd444 update to track grab-script changes 2016-02-10 19:01:25 -08:00
Seth Alves
ecf22cd8b8 update toybox toys to use changed grab entityMethod calls 2016-02-10 18:22:20 -08:00
howard-stearns
a2ca0e8470 initial exploration 2016-02-10 17:01:11 -08:00
Seth Alves
8e16bda7bb start to clean up grab generated signals 2016-02-10 16:40:50 -08:00
Andrew Meadows
d121dab937 Merge pull request #7057 from sethalves/grab-then-equip 
Grab then equip
 2016-02-10 14:16:31 -08:00
Brad Hefta-Gaub
d7db08d150 Merge pull request #7042 from howard-stearns/virtualBaton 
Virtual baton
 2016-02-10 13:48:34 -08:00
Howard Stearns
989192e9fd Make randomize clearer. 2016-02-10 12:53:05 -08:00
Howard Stearns
31d72ffb8d 2 is magic. 2016-02-10 12:17:58 -08:00
Howard Stearns
4241f4b305 Convert all simple one-liners containing ') { ' to instead take up three lines. 2016-02-10 12:03:07 -08:00
Seth Alves
9d21c3d549 Merge branch 'master' of github.com:highfidelity/hifi into grab-then-equip 2016-02-10 11:35:25 -08:00
samcake
9326aebf20 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-10 09:38:54 -08:00
Ken Cooke
a875542142 Merge pull request #7053 from birarda/integrate-new-hrtf 
Integrate the new audio HRTF in AudioMixer
 2016-02-10 07:34:50 -08:00
Seth Alves
c2cbca88cb allow grabbing with one hand and then equipping with other 2016-02-09 16:54:32 -08:00
samcake
da158bcd85 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-09 15:52:28 -08:00
Seth Alves
43592fd699 Merge pull request #7048 from hyperlogic/tony/avatar-on-moving-platform 
Better avatar animation when attached to a moving entity
 2016-02-09 14:30:02 -08:00
samcake
b1b08bf2f7 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-09 09:24:55 -08:00
Anthony J. Thibault
072172b1a2 SpatiallyNestable: now with velocity support! 
Moved velocity and angularVelocity into the SpatiallyNestable base class.

Entity velocity and angularVelocity properties are now relative to their parent, similar to the way position and orientation work for entities.

MyAvatar rig animations now use SpatiallyNestable to convert velocity into local frame to drive the animation state machine.
 2016-02-08 19:43:23 -08:00
samcake
40e49b2376 Starting to remove empty bricks and empty cells 2016-02-08 18:23:29 -08:00
ericrius1
3acc077bbd replaced sound url for example entity 2016-02-08 17:47:57 -08:00
howard-stearns
cecf2fb611 Up the number. 2016-02-08 17:00:29 -08:00
ericrius1
85ddb7100c fixed gap range bug 2016-02-08 16:51:04 -08:00
howard-stearns
d174e86347 fix batonName for entity script case 2016-02-08 16:45:25 -08:00
ericrius1
b60ba0c5a7 can now change loop 2016-02-08 16:22:05 -08:00
Anthony J. Thibault
97bcc54360 CharacterController: separate target velocity from parent velocity. 
Also, disable damping on the rigidBody used by the CharacterController.
 2016-02-08 16:01:36 -08:00
Stephen Birarda
445662f5ae clean sweep of old now unused audio files 2016-02-08 15:38:12 -08:00
ericrius1
bad4a5d601 changed ac script to take into account duration 2016-02-08 12:49:56 -08:00
ericrius1
193857f344 added explanatory comment about format of interval time 2016-02-08 11:51:52 -08:00
samcake
ad3f3a6dcf Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-08 10:30:54 -08:00
ericrius1
2a7a81f01c Merge branch 'master' into acSoundSearcher 2016-02-08 10:07:05 -08:00
ericrius1
4ab3bd204d no comment 2016-02-08 10:05:11 -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
Brad Hefta-Gaub
c28612ea9a Merge pull request #7037 from sethalves/dressing-room 
Dressing room + grab fixes
 2016-02-08 09:19:29 -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
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