Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 07:11:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
33699 commits 75 branches 59 tags 1.2 GiB
Commit graph

3769 commits

Author SHA1 Message Date
Brad Hefta-Gaub
c3ee419ad7 Merge pull request #6086 from imgntn/flashlight_life 
[Scripts] Add lifetime to lights created by flashlight
 2015-10-15 17:42:57 -07:00
ericrius1
97fe0170cb glowing box for black color 2015-10-15 17:09:41 -07:00
samcake
2ad6c2067b MErging maybe finally ?????? 2015-10-15 14:43:15 -07:00
ericrius1
e8b6b32572 Remembering whiteboards last color between sessions 2015-10-15 14:12:15 -07:00
Brad Davis
80c962a4cc Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-15 12:27:53 -07:00
ericrius1
dc6875f5b5 Strokes moving forward to avoid zfighting and incorrect overlaps 2015-10-15 11:50:23 -07:00
ericrius1
3b59bffb79 Deleting only strokes from the whiteboard where the erase button was clicked on 2015-10-15 11:38:18 -07:00
samcake
cdfe9788d1 Merging 2015-10-15 10:49:08 -07:00
Seth Alves
c884f466bc adjust timing of action refresh 2015-10-15 10:40:58 -07:00
ericrius1
55c68e0509 Merge branch 'master' into whiteboard 2015-10-15 10:08:32 -07:00
James B. Pollack
d8c979b9d4 add lifetime to lights created by flashlight 2015-10-15 10:07:21 -07:00
Seth Alves
c96f7562f2 Merge branch 'master' of github.com:highfidelity/hifi into groundwork-for-hold-action-changes 2015-10-15 09:28:57 -07:00
Thijs Wenker
c99573ea64 Fixed support for calling setJointMumblers with joint name. Walk.js runs smooth now! 2015-10-15 15:35:35 +02:00
Thijs Wenker
8111432088 Merge branch 'master' of https://github.com/worklist/hifi into JS_Rotation_FIX 2015-10-15 14:50:20 +02:00
samcake
12e103c90c Get json creating the mappings from js 2015-10-14 17:41:39 -07:00
ericrius1
87439a049e Made color indicator thinner 2015-10-14 17:22:46 -07:00
Brad Davis
e39219c2b5 Fixes and PR comments 2015-10-14 16:51:52 -07:00
ericrius1
5082ac4583 Added color status bar 2015-10-14 16:46:23 -07:00
ericrius1
4c709cba35 Fixed color indicator position 2015-10-14 16:17:57 -07:00
ericrius1
cfca0fe8c0 Adding a color indicator to whiteboard 2015-10-14 15:58:18 -07:00
Eric Levin
0b92bc11f6 fixed spacing 2015-10-14 13:26:10 -07:00
ericrius1
eb7b720945 got rid of whitespace 2015-10-14 13:24:22 -07:00
ericrius1
db5f7cac8d Fixed name of whiteboard entity script URL 2015-10-14 12:03:10 -07:00
ericrius1
c63ef10c67 got rid of query string 2015-10-14 11:50:35 -07:00
ericrius1
0991be3255 got rid of printing statements 2015-10-14 11:44:47 -07:00
ericrius1
22615dae07 Don't delete board on script close 2015-10-14 11:43:05 -07:00
ericrius1
6cd9bf407f Reverted handControllerGrab 2015-10-14 11:40:06 -07:00
ericrius1
7fb6b7e272 Reverted hand controller 2015-10-14 11:31:09 -07:00
ericrius1
d072a2efd3 laser pointer now showing up all the time 2015-10-14 11:26:38 -07:00
ericrius1
1a9c1110c0 Fixed gap between strokes 2015-10-14 11:17:54 -07:00
ericrius1
20d1a2440c Ignoring unknown types in collision 2015-10-14 11:15:49 -07:00
Brad Davis
f051a84dc6 Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-14 10:54:32 -07:00
ericrius1
caacbcbe78 Adjust erase box position 2015-10-14 10:40:55 -07:00
Seth Alves
2a9b1c0fc3 fix refresh of hold action 2015-10-14 09:31:29 -07:00
Seth Alves
698a4001a8 Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes 2015-10-14 06:18:02 -07:00
Brad Davis
0c31fb1b1b Merge pull request #6069 from ZappoMan/controllers 
Hack in NewControllers into the JS layer of interface to allow testing
 2015-10-13 19:08:26 -07:00
ericrius1
8e21999e44 erasing board 2015-10-13 16:54:37 -07:00
ericrius1
e42bbbc10d Adding erase board feature to whiteboard 2015-10-13 16:41:05 -07:00
ericrius1
2c8b85bb5c Displaying overlay laser pointer, user must past threshold to paint 2015-10-13 16:13:24 -07:00
ericrius1
4c877e8204 Changing color when grabbing colored boxes 2015-10-13 15:46:10 -07:00
ericrius1
b54b488b9e Adding in color selecting 2015-10-13 15:23:02 -07:00
ericrius1
a3f948acf8 Adding entity script to each color box 2015-10-13 15:00:38 -07:00
Seth Alves
755b971906 tweak 2015-10-13 14:31:52 -07:00
ericrius1
ad61b89abd setting up colors, adding some functions to utils.js 2015-10-13 14:16:28 -07:00
ericrius1
b490f9e2c1 Drawing line width based on trigger squeeze 2015-10-13 13:33:24 -07:00
ericrius1
470c8f7ef8 Painting on whiteboard with no judder 2015-10-13 11:31:56 -07:00
James B. Pollack
0f2ad8dd49 Merge branch 'wall_targets_2' into invert_solids 2015-10-13 10:15:48 -07:00
Brad Hefta-Gaub
8e8ba15aaa Merge pull request #6065 from sethalves/reorder-sims 
grab changes
 2015-10-13 08:35:38 -07:00
Ryan Huffman
9a9bdbbc44 hack in mappings to interface 2015-10-12 17:59:58 -07:00
ericrius1
04f0d792bb Reverted grab back to 5 hz 2015-10-12 17:36:53 -07:00
ericrius1
33ff21f376 Got rid of debug message in handControllerGrab script 2015-10-12 17:36:07 -07:00
ericrius1
fb040426eb added explanatory comment 2015-10-12 17:34:50 -07:00
ericrius1
f93b1d3325 Correctly whitelisting entities for ray picking 2015-10-12 17:05:34 -07:00
James B. Pollack
02620c4b0d make targets ungrabbable 2015-10-12 16:59:42 -07:00
Seth Alves
f0ce698d78 switch back to springy grab 2015-10-12 16:57:20 -07:00
James B. Pollack
47471e837f reset targets once they have stopped moving 2015-10-12 16:31:36 -07:00
ericrius1
8d39f9c760 Syntax fixes 2015-10-12 15:02:03 -07:00
James B. Pollack
84f0c404ad fix bug related to camera lock for entity orbit and pan 2015-10-12 14:55:52 -07:00
ericrius1
d01dda9c81 Adding in functionality to include only specified Ids in ray picking 2015-10-12 14:40:11 -07:00
ericrius1
8dddf0e17a Added findRayIntersection, and confirmed judder grew a lot worse 2015-10-12 11:15:04 -07:00
ericrius1
96fd634138 Pre- ray cast 2015-10-12 11:02:47 -07:00
ericrius1
56a2aa101c baseline judder test for whiteboard painting- pre entity ray test 2015-10-12 10:44:18 -07:00
ericrius1
fb4aad1f32 adding whiteboard 2015-10-12 10:11:46 -07:00
Thijs Wenker
a6da91ee35 Fix walk.js script 2015-10-12 19:03:34 +02:00
Brad Davis
8024d9f017 Merge pull request #6055 from ZappoMan/newControllerInterface 
implement StandardController and expose it to JS as Controller.Standard.*
 2015-10-11 16:10:42 -07:00
Brad Hefta-Gaub
0986f86c34 implement StandardController and expose it to JS as Controller.Standard.* 2015-10-11 14:55:07 -07:00
Brad Hefta-Gaub
e09fe30f05 damn you visual studio 2015-10-11 14:02:33 -07:00
Brad Hefta-Gaub
b5b4c2153a temp fix to get editing working again 2015-10-11 14:00:35 -07:00
Brad Hefta-Gaub
83bf8c8742 Merge branch 'master' of https://github.com/highfidelity/hifi into newControllerInterface 2015-10-10 09:43:07 -07:00
Brad Hefta-Gaub
b7b2c30eaa Merge pull request #6049 from sethalves/less-picky 
grab script picks less
 2015-10-10 09:41:49 -07:00
Seth Alves
5c95306e8e merge from upstream 2015-10-10 09:34:13 -07:00
Brad Hefta-Gaub
ded677e90f Merge branch 'master' of https://github.com/highfidelity/hifi into newControllerInterface 2015-10-10 09:33:55 -07:00
Brad Hefta-Gaub
25481e0a25 Merge pull request #6038 from Atlante45/asset-drop 
Asset file drop
 2015-10-10 09:32:58 -07:00
Brad Hefta-Gaub
63f3156a61 add Controler.Actions 2015-10-09 21:23:19 -07:00
Brad Hefta-Gaub
d3ee9b0f39 more work on exposing device inputs as JavaScript named constants 2015-10-09 20:58:23 -07:00
Seth Alves
7824d03e11 grab script picks 5x per second rather than 60x 2015-10-09 17:56:32 -07:00
Seth Alves
c6c44e8b81 add a userdata flag that allows toggling of the ignoreForCollisions entity property when an item is held. 2015-10-09 15:42:30 -07:00
Atlante45
75f0a6442f ModelEntities spawned with no dimension autoresize 2015-10-09 12:23:19 -07:00
James B. Pollack
3e2b32530a Update pingPongGun.js 
Gun force shouldn't be so low.
 2015-10-09 10:47:20 -07:00
James B. Pollack
1332b8bef6 remove logging 2015-10-08 17:58:58 -07:00
James B. Pollack
772ea16c71 cleanup 2015-10-08 17:52:33 -07:00
James B. Pollack
ad6fdc813f alignment, targets, sounds, master script 2015-10-08 17:50:41 -07:00
James B. Pollack
62728aa507 alignments 2015-10-08 16:16:11 -07:00
James B. Pollack
d77abc2aba Merge branch 'wall_targets' of https://github.com/imgntn/hifi into wall_targets 2015-10-08 14:08:09 -07:00
James B. Pollack
b1db1db6da Merge remote-tracking branch 'upstream/master' into wall_targets 2015-10-08 14:06:23 -07:00
Ryan Huffman
26c40adecb Merge pull request #6023 from ZappoMan/animationGroupSettings 
Fixes to isEmitting for ParticleEffects
 2015-10-08 12:24:36 -07:00
Brad Hefta-Gaub
f141026990 CR feedback 2015-10-08 11:48:48 -07:00
Brad Hefta-Gaub
a8d1622481 CR feedback 2015-10-08 11:47:54 -07:00
ericrius1
6921e0f022 Aligned targets on wall in toybox 2015-10-08 11:38:02 -07:00
Brad Hefta-Gaub
9f0721c08b Merge pull request #6020 from ericrius1/grabFarNonColliding 
Added grab far events for non physical objects
 2015-10-08 09:56:22 -07:00
ericrius1
aac372cc8a Fixed styling errors 2015-10-08 09:53:06 -07:00
Brad Hefta-Gaub
39f2241eac fix coding standard issue 2015-10-08 09:46:43 -07:00
Brad Hefta-Gaub
bb10d8a7d5 more work on rationalizing particle properties 2015-10-07 20:08:30 -07:00
Brad Hefta-Gaub
b479dd0a12 Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings 2015-10-07 19:55:01 -07:00
Brad Hefta-Gaub
02a24712ca fix isEmitting property for particle effects, cleaned up some particle property editing in edit.js 2015-10-07 19:52:29 -07:00
James B. Pollack
7a7b16f0a2 wall targets 2015-10-07 18:16:58 -07:00
ericrius1
efc2dfb68f Added grab far events for non physical objects 2015-10-07 18:06:37 -07:00
David Rowe
131b4ed004 Merge branch 'master' into 20699 
Conflicts:
	libraries/entities/src/EntityItemProperties.cpp
	libraries/entities/src/ParticleEffectEntityItem.cpp
 2015-10-07 15:08:07 -07:00
Brad Hefta-Gaub
7a85e5b7a7 rename frameIndex to currentFrame 2015-10-07 13:02:58 -07:00
Brad Hefta-Gaub
ef054ffc6d Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings 
Conflicts:
	libraries/networking/src/udt/PacketHeaders.cpp
	libraries/networking/src/udt/PacketHeaders.h
 2015-10-07 11:27:50 -07:00
Brad Hefta-Gaub
6eeb64b032 CR feedback 2015-10-07 11:23:24 -07:00
Eric Levin
f01d4dde42 Merge pull request #6003 from imgntn/basketball_rack 
[Scripts] Basketball rack
 2015-10-07 10:59:20 -07:00
David Rowe
4624649b1b Sanitize particle properties, fix crashes 2015-10-07 08:57:55 -07:00
Brad Hefta-Gaub
05fd62ac51 Merge pull request #6009 from jherico/homer 
Enabling programmatic access to the IPD scale
 2015-10-07 01:43:10 -07:00
Brad Davis
eff5a4c395 Picking fixes in the HMD 2015-10-06 22:56:48 -07:00
Brad Davis
19fb4e92a6 Enabling programmatic access to the IPD scale 
Conflicts:
	interface/src/Application.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/scripting/HMDScriptingInterface.cpp
	interface/src/scripting/HMDScriptingInterface.h
 2015-10-06 19:08:17 -07:00
James B. Pollack
7aab34975f code quality 2015-10-06 17:08:51 -07:00
Brad Hefta-Gaub
34fa5b43fc Merge pull request #5991 from imgntn/knockover_blocks 
[Scripts] Test Block Spawner for Blockers Game
 2015-10-06 17:03:29 -07:00
Brad Hefta-Gaub
0e5f4bc4c9 Merge pull request #5983 from ericrius1/lightFixes 
Light fixes in toybox
 2015-10-06 17:02:17 -07:00
James B. Pollack
4788480186 reset balls if they move too far 2015-10-06 16:48:34 -07:00
Brad Hefta-Gaub
016bf4011d cleanup 2015-10-06 16:07:36 -07:00
Atlante45
76e0006732 Remove forgotten cursorVisible 2015-10-06 15:58:35 -07:00
Brad Hefta-Gaub
be79101a93 Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings 2015-10-06 15:20:37 -07:00
James B. Pollack
cda1b418ae cleanup 2015-10-06 11:29:41 -07:00
James B. Pollack
5f2112b8a5 finish rack and add to master script, reorganize all bball related scripts 2015-10-06 11:28:36 -07:00
Andrew Meadows
2c276bb13e Merge pull request #5986 from sethalves/kinematic-grab 
Kinematic grab
 2015-10-06 10:30:06 -07:00
Brad Davis
8090bc8e8d Revert "Enabling programmatic access to the IPD scale" 2015-10-06 10:16:42 -07:00
Eric Levin
0afaf84e2a Merge pull request #5979 from imgntn/ping_pong_gun 
[Script] Updates to Ping Pong Gun
 2015-10-06 09:47:53 -07:00
James B. Pollack
152fdb8112 physical rack 2015-10-06 09:44:00 -07:00
Seth Alves
febdb52b26 Merge branch 'master' of github.com:highfidelity/hifi into kinematic-grab 2015-10-06 09:20:13 -07:00
James B. Pollack
6cc3077d67 end of day 2015-10-05 18:29:35 -07:00
James B. Pollack
1b241ea05e Update createTestBlocks.js 2015-10-05 18:13:51 -07:00
James B. Pollack
41b2f82be5 midway 2015-10-05 17:43:44 -07:00
Brad Hefta-Gaub
a554f3afb7 Merge pull request #5996 from cozza13/20701 
CR for Job #20701 - Create a menu for HMD stereo and mono eye switching/
 2015-10-05 17:22:36 -07:00
Brad Hefta-Gaub
d95fe3ddb7 Merge pull request #5989 from jherico/homer 
Enabling programmatic access to the IPD scale
 2015-10-05 17:22:19 -07:00
Chris Collins
c0a881ec52 added the correct call 
added the correct call
 2015-10-05 15:37:04 -07:00
Chris Collins
1e01d6bd8f Add the ability to switch between mono and stereo in HMD 
Add the ability to switch between mono and stereo in HMD
 2015-10-05 15:30:53 -07:00
Brad Hefta-Gaub
8c8e83dc8e more debugging on animation.running 2015-10-05 14:17:12 -07:00
Seth Alves
7f8411d947 reference count grabs on an entity 2015-10-05 14:15:38 -07:00
James B. Pollack
daf97b0b9d header fixes 2015-10-05 14:12:18 -07:00
James B. Pollack
839301bf05 remove cleanup to make blocks persistent 2015-10-05 13:41:20 -07:00
Seth Alves
635c83dad1 reset gravity and ignore-for-collisions after grabs have released 2015-10-05 13:39:01 -07:00
James B. Pollack
e528125af2 add test blocks for blockers game 2015-10-05 13:38:48 -07:00
James B. Pollack
43f69a0be9 initial knockover blocks 2015-10-05 13:23:19 -07:00
James B. Pollack
1ba31a840a Merge branch 'master' into knockover_blocks 2015-10-05 13:09:15 -07:00
Seth Alves
7f84e882c5 attempt to keep ignoreForCollisions the same before and after grab 2015-10-05 13:06:39 -07:00
Seth Alves
8f924f0be4 merge from upstream 2015-10-05 13:05:37 -07:00
Andrew Meadows
1ead20683c Merge pull request #5976 from sethalves/fix-action-deletes 
Fix action deletion/addition when more than one interface are involved
 2015-10-05 12:31:01 -07:00
James B. Pollack
65ae811c9c make ping pong balls bigger and slower, change out gun model and adjust tip calculations, increase volume, add to master reset script 2015-10-05 11:16:55 -07:00
James B. Pollack
588a256304 Merge branch 'master' into ping_pong_gun 2015-10-05 10:54:21 -07:00
Seth Alves
8c25f2e16c Merge branch 'master' of github.com:highfidelity/hifi into kinematic-grab 2015-10-05 09:09:01 -07:00
Brad Davis
725ed26ac2 Enabling programmatic access to the IPD scale 2015-10-04 16:55:49 -07:00
ZappoMan
6f86b0f550 particle fixes 2015-10-04 15:23:17 -07:00
Brad Hefta-Gaub
accdd8c86a add animation properties to edit properties 2015-10-02 19:15:24 -07:00
Seth Alves
a42bb5f533 Merge pull request #5981 from ericrius1/sprayCanFix 
No longer removing non-existent entities from spray paint can; color …
 2015-10-02 17:56:51 -07:00
Seth Alves
26310d8ce4 kill gravity in near-held objects 2015-10-02 17:54:09 -07:00
Brad Hefta-Gaub
abdd9a6da4 Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings 2015-10-02 17:28:06 -07:00
Seth Alves
89c848d8c8 fix up kinematic hold 2015-10-02 17:14:53 -07:00
ericrius1
38a66bc915 syntax fixes 2015-10-02 16:53:13 -07:00
Howard Stearns
a5a7c16466 Merge pull request #5789 from highfidelity/revert-5777-revert-5769-edit-js-adjustment 
edit.js adjustment
 2015-10-02 16:28:54 -07:00