Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-29 17:02:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
41961 commits 71 branches 56 tags 1.2 GiB
Commit graph

5954 commits

Author SHA1 Message Date
samcake
6d6f0398f5 TRying to create a graph :) 2016-03-23 17:52:06 -07:00
Menithal
12ecd592ab Added Refresh Buttons to entityProperties 
Pressing buttons next to the url bar will now allow for content to have an
automatic unix timestamp to be applied / updated to the end of the url.
Applies for all url entity Properties
 2016-03-24 01:14:48 +02:00
samcake
851cbb1c46 change 2016-03-23 16:07:41 -07:00
samcake
138a996013 First draft of monitoring the memeory consumption 2016-03-23 15:46:17 -07:00
David Rowe
454ba50dc1 Tidying 2016-03-24 10:03:47 +13:00
David Rowe
55fd861b69 Style scrollbars 2016-03-24 09:43:08 +13:00
ericrius1
e38a8755b0 Merge remote-tracking branch 'upstream/master' 2016-03-23 13:33:58 -07:00
David Rowe
0f352b77b2 Tidying 2016-03-23 21:25:02 +13:00
David Rowe
ca90ab7597 Fix initial sort indicators 2016-03-23 21:08:25 +13:00
David Rowe
054d575ed2 Report number of entities found or selected in entities table footer 2016-03-23 20:50:08 +13:00
PhilipRosedale
7e658896e6 update header 2016-03-22 22:39:55 -07:00
PhilipRosedale
472dd07625 airship from hack project 2016-03-22 22:39:22 -07:00
David Rowe
86354d0165 Table border 2016-03-23 17:34:33 +13:00
David Rowe
6684bbf404 Table header separators 2016-03-23 16:48:41 +13:00
David Rowe
c7712f2d05 Entities table styling 2016-03-23 16:16:03 +13:00
ericrius1
8ce23e2345 simple baton test 2016-03-22 17:41:29 -07:00
ericrius1
7450a2ea3a update 2016-03-22 17:38:56 -07:00
ericrius1
e5364fd186 update 2016-03-22 17:33:18 -07:00
ericrius1
60bb77fd34 unload baton 2016-03-22 17:12:42 -07:00
ericrius1
107479039a update 2016-03-22 17:10:04 -07:00
ericrius1
608821b50b simple baton 2016-03-22 17:06:49 -07:00
ericrius1
ad5a111b85 simple baton 2016-03-22 17:04:47 -07:00
David Rowe
89d4bea73e Restyle search filter and radius in Entity List tab 2016-03-23 12:22:09 +13:00
ericrius1
dfffe5f431 more removal 2016-03-22 15:02:44 -07:00
ericrius1
a0e8e00357 removed cache defeating code and fixed whitespace 2016-03-22 15:02:00 -07:00
David Rowe
b5d71d1ee1 Restyle top row of buttons in Entity List tab 2016-03-23 10:05:22 +13:00
ericrius1
918c61c166 removed extra code from virtualBaton 2016-03-22 10:34:10 -07:00
ericrius1
c9c5d3d8bc removed VRVJ files 2016-03-22 10:32:04 -07:00
ericrius1
94283904b8 update 2016-03-22 10:26:13 -07:00
ericrius1
1c876fe110 update 2016-03-22 10:16:49 -07:00
ericrius1
f043b27a56 hardcoded num avatars 2016-03-22 10:12:44 -07:00
ericrius1
130eb6b619 working for one; 2016-03-22 10:07:59 -07:00
ericrius1
bc8a8ac703 fix syntax error 2016-03-22 10:00:44 -07:00
ericrius1
2bb11c5dc6 unload baton 2016-03-22 09:59:10 -07:00
Thijs Wenker
d47e8eb999 Fix setting colors in ParticleExplorer without having the particle entity disappear. Handles Hex strings as well as color arrays. 2016-03-22 17:39:57 +01:00
David Rowe
53b86a0b55 Move the "no entities found" message into the entities list table 2016-03-22 20:02:57 +13:00
David Rowe
42b606c09d Merge branch 'master' into 20855 2016-03-22 18:51:07 +13:00
David Rowe
02a62766e0 Size entities list to dialog and scroll when necessary 
Also add a footer.
 2016-03-22 18:03:12 +13:00
ericrius1
2dce75bfb0 baton sound 2016-03-21 17:22:18 -07:00
Philip Rosedale
c8816f8e76 Merge pull request #7389 from Menithal/on-grab-fix 
Grab.js: Update Position on Mouse Grab Start
 2016-03-21 17:10:00 -07:00
ericrius1
adeaa9475e num 2016-03-21 16:49:55 -07:00
ericrius1
9c18d6c016 change name 2016-03-21 16:47:51 -07:00
ericrius1
efd56ac22a spawner 2016-03-21 16:45:23 -07:00
ericrius1
51508b467c uupdate 2016-03-21 15:59:03 -07:00
ericrius1
98e43a8d0f more logging 2016-03-21 15:54:47 -07:00
ericrius1
b4509e428b bugs 2016-03-21 15:37:20 -07:00
ericrius1
81901dc73d log change 2016-03-21 15:04:57 -07:00
ericrius1
b8cb71e16a debug 2016-03-21 15:02:39 -07:00
ericrius1
7659aed97a dont delete the entity when spawner script shutdown 2016-03-21 14:42:53 -07:00
ericrius1
b4e400f3aa baton sound logging updates 2016-03-21 14:42:28 -07:00
ericrius1
493a91fa27 with debug box 2016-03-21 14:32:22 -07:00
ericrius1
e5b2483604 sound seems to be working" 2016-03-21 14:09:02 -07:00
ericrius1
68dc5a8251 just playing on start update 2016-03-21 13:57:54 -07:00
ericrius1
b7534fbd57 basics of virtual baton 2016-03-21 13:52:26 -07:00
ericrius1
6c5ad187a0 Merge remote-tracking branch 'upstream/master' 2016-03-21 11:51:38 -07:00
Brad Hefta-Gaub
6822f0643b Merge pull request #7397 from zzmp/fix/ambient-url-listener 
Add back ambientURL listener in editor
 2016-03-21 08:49:43 -07:00
Seth Alves
b600000307 refactor code a bit 2016-03-20 17:59:15 -07:00
Seth Alves
21c688390c make voxels.js buttons work, again 2016-03-20 17:40:03 -07:00
David Rowe
01685b2d44 Change entity editor tab name 2016-03-19 14:58:12 +13:00
David Rowe
3fa678a652 Style tabs and background 2016-03-19 14:52:40 +13:00
Zach Pomerantz
105b4e16a9 Add back ambientURL listener in editor 2016-03-18 16:18:41 -07:00
James B. Pollack
ce932640bd Merge pull request #7353 from huffman/fix-keylight-edit 
Fix keylight direction naming and usage in edit.js
 2016-03-18 12:35:48 -07:00
Menithal
066c517dd7 Grab.js: Update Position on Mouse Grab Start 
Fixes grab event issue where if the object is moving, the position does
not update until the user has moved their mouse.

This commit makes sure that the moment the user starts dragging on a
object that isnt grabbed by another, the position is immediately updated
instead of waiting for the user to move their mouse.
 2016-03-18 08:59:07 +02:00
David Rowe
6a2cb393fa Make copy of style.css as starting point for restyling entities editor 2016-03-18 16:56:08 +13:00
David Rowe
ebe13b7b93 Fix edit toolbar's upload button 2016-03-17 14:44:57 +13:00
David Rowe
62b24e6626 Explicitly enable button-down behavior in scripts 2016-03-17 11:49:49 +13:00
David Rowe
004a694741 Make toolbar buttons "click" 2016-03-17 11:25:37 +13:00
David Rowe
df870d6e82 Merge branch 'master' into 20852 2016-03-17 10:35:26 +13:00
Andrew Meadows
7acc56bf00 Merge pull request #7359 from zzmp/feat/bg-gpu-timer 
Add a DrawBackgroundDeferred gpu timer
 2016-03-16 07:58:53 -07:00
David Rowe
46a953885f Increase size of frame around and between buttons 
Makes easier to click and drag toolbar to new position.
 2016-03-16 11:43:11 +13:00
David Rowe
3a28772729 Regularize toolbar margins and make draggable from all four sides 2016-03-16 10:29:26 +13:00
David Rowe
a5e0d93dd5 Update directory, edit, and marketplace toolbar buttons 2016-03-16 10:29:25 +13:00
David Rowe
3991c984a8 Remove voxels button from edit.js toolbar 2016-03-16 10:29:23 +13:00
Seth Alves
2b73b2c6d8 debugging 2016-03-15 13:50:23 -07:00
ericrius1
9d24887ff4 Merge remote-tracking branch 'upstream/master' 2016-03-15 13:50:23 -07:00
Seth Alves
df0d96c276 Merge branch 'master' of github.com:highfidelity/hifi into equip-via-thumb 2016-03-15 09:36:11 -07:00
Seth Alves
9df8c4e969 add velocity argument to release 2016-03-15 09:00:01 -07:00
Brad Hefta-Gaub
11c318305f Merge pull request #7340 from sethalves/edit-js-grabbable 
edit.js has checkboxes for grabbable pseudo-properties
 2016-03-14 18:58:37 -07:00
Brad Hefta-Gaub
447918d148 Merge pull request #7348 from hyperlogic/tony/cppcheck-fixes 
Avatar & Animation cppcheck static analysis fixes
 2016-03-14 18:58:25 -07:00
Zach Pomerantz
0ea70f234f Add bg gpu timer display 2016-03-14 17:53:48 -07:00
Clément Brisset
e38c08ebd9 Merge pull request #7335 from imgntn/photosphere 
Add Photo Sphere Example
 2016-03-14 16:56:17 -07:00
Seth Alves
8b5b6f5a20 added HOLD state which uses presets but isn't persistent when button is released 2016-03-14 16:39:09 -07:00
Seth Alves
7e5a1e73e5 equip/de-equip with thumb button rather than bumper. trigger and bumper do the same thing 2016-03-14 15:25:59 -07:00
Ryan Huffman
850fb51f72 Fix keylight direction naming and usage 2016-03-14 14:45:00 -07:00
Seth Alves
a7a8bd2256 Merge branch 'master' of github.com:highfidelity/hifi into edit-js-grabbable 2016-03-14 13:54:02 -07:00
Seth Alves
d811c4f6b5 dynamic is the same as grabbable-by-default 2016-03-14 11:39:56 -07:00
Seth Alves
1f8a55da3a dynamic is the same as grabbable-by-default 2016-03-14 11:36:44 -07:00
Chris Collins
e577658315 Merge pull request #7333 from PhilipRosedale/testSound 
playTestSound.js - better clip for testing/showing audio
 2016-03-14 08:44:28 -07:00
Anthony Thibault
1e94d9bdf5 interface/src/avatar: cppcheck fixes 2016-03-13 18:56:15 -07:00
Brad Davis
798d2a73db Merge pull request #7326 from ZappoMan/toggleOverlay 
Various Overlay, Menu, and Away Mode bug fixes
 2016-03-13 11:44:19 -07:00
James B. Pollack
96bc17cd5e Update photo_sphere.js 2016-03-12 16:01:10 -08:00
Seth Alves
cca4a93b2b don't full up userData with default grabbable data 2016-03-12 14:09:52 -08:00
Seth Alves
be51040420 grabbable controlls are working 2016-03-12 13:20:04 -08:00
Seth Alves
f1992af38e started to add grabbable psuedo properties to edit.js 2016-03-12 13:20:00 -08:00
James B. Pollack
b0109133c0 add git handle 2016-03-11 22:02:49 -08:00
James B. Pollack
cecebc9ae4 add example 2016-03-11 22:01:01 -08:00
PhilipRosedale
9823ecffa7 new test sound script 2016-03-11 17:00:44 -08:00
Brad Hefta-Gaub
6083706151 CR feedback 2016-03-11 16:47:16 -08:00
Brad Hefta-Gaub
082bb8c4b8 auto-show reticle on mouse click 2016-03-11 12:49:42 -08:00
Brad Hefta-Gaub
e341419090 enter away mode when you remove the Vive HMD 2016-03-11 11:56:39 -08:00
Brad Hefta-Gaub
d32611a7f9 make away show overlays if they are hidden when you enter away 2016-03-11 11:45:52 -08:00
Brad Hefta-Gaub
d1c024fb39 Merge pull request #7286 from zzmp/fix/skybox-tex 
Clean up skybox rendering
 2016-03-11 08:50:23 -08:00
Brad Hefta-Gaub
d8d500c318 Merge pull request #7291 from ericrius1/uniformBugRepro 
Rapid uniform change test
 2016-03-11 08:45:52 -08:00
Zach Pomerantz
25607709a5 Add test for skybox 2016-03-10 22:52:07 -08:00
James B. Pollack
aa884d9e3b spatial 2016-03-10 22:45:44 -08:00
ericrius1
f3c9b49262 Merge remote-tracking branch 'upstream/master' 2016-03-10 13:50:57 -08:00
Brad Hefta-Gaub
509abbf1d4 remove inspect.js from default scripts 2016-03-10 13:31:27 -08:00
ericrius1
5ba96cb07c removed print statements 2016-03-10 12:47:31 -08:00
Brad Hefta-Gaub
6ed1ad10a1 remove hmdDefaults and hmdControls scripts, since they are borked 2016-03-10 12:12:24 -08:00
ericrius1
8fe926e535 added print statements 2016-03-10 11:41:12 -08:00
ericrius1
2af4dd90e1 updated shader links to be s3 2016-03-10 11:40:09 -08:00
Zach Pomerantz
f37049059e Finish name changes for rapidProceduralChange 2016-03-10 10:19:52 -08:00
Brad Hefta-Gaub
1547fc15aa Merge pull request #7305 from PhilipRosedale/editHandles 
Adjust edit handle sizes
 2016-03-10 09:46:43 -08:00
Zach Pomerantz
3cd0f0d237 Drive skybox off of timer 2016-03-09 19:34:48 -08:00
Zach Pomerantz
d89d89fd08 Add all entities and skybox 2016-03-09 18:35:03 -08:00
PhilipRosedale
c11487735f Adjust grab handle sizes 2016-03-09 17:46:38 -08:00
PhilipRosedale
6017db0f31 Adjust grab handle sizes 2016-03-09 17:43:44 -08:00
Chris Collins
ddb09ec222 Merge pull request #7285 from hyperlogic/tony/hand-controller-move-improvements 
Hand controller mouse improvements
 2016-03-09 16:34:35 -08:00
Seth Alves
fbbc27213d Merge pull request #7287 from PhilipRosedale/fireflies 
Fireflies
 2016-03-09 15:20:27 -08:00
James B. Pollack
7c44556234 Merge pull request #7301 from ericrius1/growingPlant 
Remove prematurely added VRVJ folder from examples folder
 2016-03-09 15:17:17 -08:00
ericrius1
05d26be300 delete file 2016-03-09 15:15:20 -08:00
ericrius1
7b20fdcc1a add file before delete 2016-03-09 15:14:51 -08:00
ericrius1
974189b546 deleted cartridge spawner 2016-03-09 15:10:35 -08:00
PhilipRosedale
5230d3a705 Added header 2016-03-09 14:45:26 -08:00
Seth Alves
143d8a0929 Merge pull request #7267 from ericrius1/growingPlant 
Plant that blooms flowers when it is watered by a water can
 2016-03-09 11:28:38 -08:00
ericrius1
c59a58a833 changing color of visual component to match sound cartridge 2016-03-09 11:22:47 -08:00
ericrius1
d65dcf7142 no more velocity 2016-03-09 11:11:20 -08:00
ericrius1
170dd418f8 chaged shader link 2016-03-09 10:35:11 -08:00
ericrius1
1a09c5d19f test script for uniform change 2016-03-09 10:33:18 -08:00
Anthony J. Thibault
e1a3c5b618 Fix for vertical pitch offset. 
Also, added hysteresis to the controller selection, to prevent flapping back and forth between controllers when they are at rest.
 2016-03-09 10:31:58 -08:00
ericrius1
8903a61c6e basic shader 2016-03-09 10:24:46 -08:00
ericrius1
41df11f614 spacing 2016-03-09 09:55:15 -08:00
PhilipRosedale
4728eeb862 less of them 2016-03-08 20:22:29 -08:00
PhilipRosedale
5487c4cdab Firefly script 2016-03-08 19:42:11 -08:00
ericrius1
deb2c5af63 parenting visual to sound entity 2016-03-08 18:30:27 -08:00
Anthony J. Thibault
deb17e1f93 Merge branch 'master' into tony/hand-controller-move-improvements 2016-03-08 17:45:50 -08:00
Anthony J. Thibault
f82dc4569e handControllerMouse.js: removed non-uniform scaling. 
If your controller moves in a circle, the mouse pointer should as well.
 2016-03-08 15:59:17 -08:00
Anthony J. Thibault
ce5d83d551 handConttollerMouse.js: improved comments 2016-03-08 15:32:12 -08:00
Anthony J. Thibault
27fb7a3143 handControllerMouse: improve determination of which controller is moving the most 
That controller will have exclusive control of the mouse reticle.
 2016-03-08 15:14:37 -08:00
Brad Hefta-Gaub
d879300413 Merge pull request #7277 from sethalves/edit-vs-mouse-grab 
Edit vs mouse grab
 2016-03-08 14:19:40 -08:00
Seth Alves
40bc66c154 Merge pull request #7272 from imgntn/shapetype 
"Collision Shape Type" in edit.js instead of "Shape Type"
 2016-03-08 11:34:42 -08:00
ericrius1
9edc8aa5aa searching for name 2016-03-08 11:34:00 -08:00
ericrius1
503d2874ab initial vr vj set up 2016-03-08 10:59:01 -08:00
Seth Alves
04e36f925a use local message 2016-03-08 10:30:49 -08:00
Seth Alves
0b6f52f508 use local messaging to disable mouse-grab when edit.js is active 2016-03-08 10:27:34 -08:00
James B. Pollack
9db528d7a3 Merge pull request #7273 from imgntn/nomarketplaceinfo 
DIsable Right Click Marketplace Info for now from edit.js
 2016-03-08 09:08:29 -08:00
James B. Pollack
482964d8ad hide this for now 2016-03-07 20:37:14 -08:00
James B. Pollack
8381b1d2fd collision shape type 2016-03-07 20:21:14 -08:00
Anthony J. Thibault
26b4c904f3 handControllerMouse.js: transform hand controllers into sensor frame 2016-03-07 18:42:52 -08:00
ericrius1
7b69aa375e moved plant to home folder 2016-03-07 18:18:38 -08:00
James B. Pollack
fbe640e351 the model was different so adjust things 2016-03-07 16:38:15 -08:00
Anthony J. Thibault
0d62b10a8f Added Mat4 support to script 
Also, hooked up MyAvatar.sensorToWorldMatrix access to script.
 2016-03-07 16:16:14 -08:00
ericrius1
d4bc83f408 cleanup and bug fixes 2016-03-07 16:16:06 -08:00
Andrew Meadows
dfe0575237 Merge pull request #7260 from imgntn/newponggun 
New Ping Pong Gun Model
 2016-03-07 15:51:59 -08:00
ericrius1
3dc39600cd stop pouring on release 2016-03-07 15:32:40 -08:00
ericrius1
b9bd4cae93 better water effect 2016-03-07 14:58:59 -08:00
James B. Pollack
2d554f4b40 Merge pull request #7249 from ericrius1/playaFireworks 
Playa fireworks and associated tutorial
 2016-03-07 14:32:06 -08:00
ericrius1
ca747bb4e9 fixed dates 2016-03-07 14:29:17 -08:00
James B. Pollack
567039ef82 Update createPingPongGun.js 2016-03-07 14:28:16 -08:00
ericrius1
caca60c039 added headers to tutorial code 2016-03-07 14:09:21 -08:00
ericrius1
cdd4fdb03e slower growth 2016-03-07 14:04:45 -08:00
Seth Alves
e8001d0346 Merge pull request #7264 from imgntn/flashlightbrightfix 
Make the flashlight brighter
 2016-03-07 14:04:02 -08:00
James B. Pollack
9cd0762040 brighter 2016-03-07 12:26:21 -08:00
James B. Pollack
247ebb380b Merge pull request #7253 from hyperlogic/tony/distance-holding-fixes 
HandControllerGrab: fixes for distance holding
 2016-03-07 12:12:58 -08:00
Anthony Thibault
b096e062e6 Merge pull request #7250 from ZappoMan/smallFix 
fix a couple bugs in this script
 2016-03-07 09:13:58 -08:00
Chris Collins
86f60671a7 Merge pull request #7254 from ZappoMan/hackathonMusicPlayer 
Music Player
 2016-03-07 09:01:58 -08:00
James B. Pollack
830a61b874 update 2016-03-06 15:04:47 -08:00
James B. Pollack
9a860bd31a update ping pong gun model url 2016-03-06 15:01:35 -08:00
Brad Hefta-Gaub
78b608b970 Merge pull request #7225 from PhilipRosedale/hydraReticle 
Hand controller drives mouse, does not take over if set down
 2016-03-06 13:33:02 -08:00
Brad Hefta-Gaub
168fd2d72f read playlist URL from userData 2016-03-05 01:07:20 -08:00
Brad Hefta-Gaub
2f92a4cccd first cut at music player 2016-03-05 00:45:25 -08:00
Anthony J. Thibault
076b0b42d7 HandControllerGrab: fixes for distance holding 
Because controller poses are in avatar space, there is no need
to apply delta avatar position changes and rotation changes.
 2016-03-04 20:36:32 -08:00
ericrius1
65c8f7cc45 flowers growing 2016-03-04 17:55:45 -08:00
ericrius1
3ad2d1aa9b flowers spawning and growing correctly 2016-03-04 17:32:29 -08:00
ericrius1
ef437b7f99 flowers staying in place 2016-03-04 16:48:55 -08:00
PhilipRosedale
87e7dd9ce3 add vive button mapping 2016-03-04 16:16:05 -08:00
ericrius1
17dec9446a flowers are growing when watered 2016-03-04 16:15:37 -08:00
Brad Hefta-Gaub
6d56a0d051 more CR feedback 2016-03-04 15:55:08 -08:00
Brad Hefta-Gaub
2b4d206eca more CR feedback 2016-03-04 15:54:28 -08:00
Brad Hefta-Gaub
e776bf5819 CR feedback 2016-03-04 15:47:50 -08:00
Brad Hefta-Gaub
d8e7c60ce0 CR feedback 2016-03-04 15:47:25 -08:00
Brad Hefta-Gaub
3f85daf276 Merge branch 'master' of https://github.com/highfidelity/hifi into hackathonLightening 2016-03-04 15:31:32 -08:00
Brad Hefta-Gaub
add7f54af3 remove debug line 2016-03-04 15:29:32 -08:00
Brad Hefta-Gaub
21b66354ef remove debug line 2016-03-04 15:28:49 -08:00
Brad Hefta-Gaub
c9cd8eeba6 fix a couple bugs 2016-03-04 15:27:43 -08:00
Philip Rosedale
cb8e2b7018 Merge pull request #7246 from AndrewMeadows/stable-ik 
recover stability of arm IK
 2016-03-04 14:38:59 -08:00
Atlante45
3a5165ab66 Add json import for game entity 2016-03-04 11:54:03 -08:00
Atlante45
ab5a29b076 Bit of cleanup 2016-03-04 11:50:12 -08:00
PhilipRosedale
e01524abbe fix for clicking 2016-03-04 11:24:35 -08:00
Andrew Meadows
9bf4a30a23 fix typo in example script 2016-03-04 10:57:06 -08:00
Atlante45
f62a3ed8f6 Remove tabs 2016-03-04 10:46:30 -08:00
Atlante45
0364703f86 Move script to toybox 2016-03-03 17:29:11 -08:00
Atlante45
10d55666f2 Changed coin value 2016-03-03 12:23:50 -08:00
Atlante45
b00ff7a81c Display score and save high scores 2016-03-03 12:19:01 -08:00
Atlante45
d1f7cf6387 Added freeze on loss and points architecture 2016-03-03 10:51:37 -08:00
Atlante45
442bd22f46 New sounds + coins!!! 2016-03-03 09:56:11 -08:00
Atlante45
f582222389 Couple additional features 2016-03-03 03:24:12 -08:00
Brad Hefta-Gaub
a752f55deb example of a rainy day/night zone 2016-03-03 02:25:41 -08:00
Atlante45
d5d5eaaf9c Fix cooldown 2016-03-02 23:42:27 -08:00
Atlante45
bef2885957 Couple bounding box fixes 2016-03-02 22:25:30 -08:00