Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-17 00:18:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
13623 commits 25 branches 0 tags 1.1 GiB
Commit graph

536 commits

Author SHA1 Message Date
Stojce Slavkovski
2cde2f5303 use worklist for assets 2014-06-08 16:03:43 +02:00
Stojce Slavkovski
83b096ca1d myBalance 
- balance formatting
	- symbol layout changes
 2014-06-08 15:56:37 +02:00
Stojce Slavkovski
8de2bdfb99 expose account details via AccountScriptingInterface 2014-06-07 23:17:49 +02:00
Stojce Slavkovski
39c1daca43 Merge branch 'master' of https://github.com/worklist/hifi into 19755 2014-06-07 22:29:36 +02:00
Stojce Slavkovski
976b76ac85 myBalance new layout changes 2014-06-07 22:29:06 +02:00
Stojce Slavkovski
9810335adf Merge branch 'master' of https://github.com/worklist/hifi into 19755 2014-06-07 10:33:41 +02:00
Stojce Slavkovski
fea1433ced Add initial mybalance script 2014-06-07 10:32:36 +02:00
Atlante45
69adf8d0dd Removed extra debug, fix model jumping when releasing one of the two triggers. 2014-06-06 11:19:43 -07:00
Atlante45
dece3ea095 Merge branch 'master' of https://github.com/highfidelity/hifi into temp_branch 2014-06-06 10:26:49 -07:00
Atlante45
9322e1f71b More work on editModels 2014-06-05 17:36:56 -07:00
Philip Rosedale
6bef0c1a6a both left and right hands in animation 2014-06-05 17:03:58 -07:00
Atlante45
145a159233 Slight glow on laser intersection 2014-06-05 15:45:25 -07:00
Philip Rosedale
8bce7127aa support for both hands, but no script for now in the left one 2014-06-04 15:19:49 -07:00
Philip Rosedale
e8fa75b4f3 Added squeezeHands.js 2014-06-04 15:17:17 -07:00
Atlante45
79092e3e81 editModels now has 2 modes 2014-06-04 14:18:28 -07:00
Atlante45
15863198d1 change editModels icon 2014-06-04 13:52:31 -07:00
Atlante45
9ea53f8070 some testing with editModels 2014-06-04 11:38:46 -07:00
Philip Rosedale
c97f0da109 Merge remote-tracking branch 'upstream/master' 2014-06-03 17:08:40 -07:00
Philip Rosedale
038b0de46e starting fist squeezing 2014-06-03 17:08:24 -07:00
Philip Rosedale
f7cd4d78ad Fix crazylegs.js to newer joint names 2014-06-03 17:02:52 -07:00
barnold1953
90754e320d Curved Oculus overlay around camera as a semicircle 2014-06-02 16:05:07 -07:00
Brad Hefta-Gaub
6f5d2ba233 Merge pull request #2970 from Barnold1953/master 
Mirror mode fix, particleBirds.js
 2014-06-02 13:02:05 -07:00
Clément Brisset
2121648c7d Merge pull request #2972 from polac/19748 
Fixing the BUG #19748: Sit.js doesn't handle overlays correctly.
 2014-06-02 12:18:28 -07:00
Mika Impola
da3a272475 Fixing the BUG #19748: Sit.js doesn't handle overlays correctly. 2014-06-02 21:47:31 +03:00
barnold1953
e669f1d835 Fixed and tested particle birds 2014-06-02 11:41:50 -07:00
barnold1953
9e882957c4 Removed debug prints from particleBirds.js 2014-06-02 10:44:50 -07:00
barnold1953
7997946389 Added particleBirds.js example script 2014-06-02 09:43:01 -07:00
barnold1953
db578995a8 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-06-02 09:20:12 -07:00
ZappoMan
cad5e12aad make editVoxels.js and editModels.js play nice together with the delete menu item 2014-05-31 14:05:05 -07:00
ZappoMan
f92facea76 changed Models/Delete and Voxels/Delete to both use same menu item name of 'Delete' so that either option will correctly delete either. 2014-05-31 13:30:45 -07:00
ZappoMan
30a5048840 add editModels to defaultScripts 2014-05-31 13:24:23 -07:00
ZappoMan
22a8f88195 add support for Menu.menuExists() and menu.menuItemExists() 2014-05-31 13:24:07 -07:00
Brad Hefta-Gaub
a257af76dc Merge pull request #2966 from Atlante45/grab_attachements 
First pass at grabbing attachment
 2014-05-30 19:46:03 -07:00
Atlante45
4ffd51d9c4 First pass at grabbing attachment 2014-05-30 18:40:50 -07:00
Atlante45
2e5b45cfa1 print dressing 2014-05-30 17:48:35 -07:00
Atlante45
a661ea3179 Made API listing alphabetical, more clean and faster to print out. 2014-05-30 17:40:04 -07:00
Atlante45
2514906bd7 Fixed minor issue in currentAPI.js 2014-05-30 17:25:42 -07:00
Atlante45
e217ed7f75 Merge branch 'master' of https://github.com/highfidelity/hifi into list_current_js_api 2014-05-30 17:18:45 -07:00
Atlante45
9ca80cf4b3 Added script that lists the current JS API 2014-05-30 17:18:26 -07:00
Andrzej Kapolka
1c77d93914 Merge pull request #2959 from PhilipRosedale/master 
Add ability to toggle sit.js with "." key, for Oculus users
 2014-05-30 14:16:46 -07:00
Andrzej Kapolka
be9703d46f Merge pull request #2958 from Atlante45/click_drag_attach 
Update joints list everytime I try to attach
 2014-05-30 14:15:43 -07:00
Philip Rosedale
9d59251d27 add keyboard shortcut (“.”) to toggle sitting, so that Oculus user can sit 2014-05-30 10:47:51 -07:00
Atlante45
0b31971592 Update joints list everytime I try to attach 2014-05-30 10:42:54 -07:00
Brad Hefta-Gaub
c3b87504d9 Merge pull request #2957 from Atlante45/fix_for_editModel 
Fixed JS parse error
 2014-05-30 10:24:54 -07:00
Atlante45
a7f10798b2 Fixed JS parse error 2014-05-30 10:23:36 -07:00
barnold1953
06a9ac22e7 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-30 09:26:07 -07:00
Philip Rosedale
169e7d61fd Merge pull request #2954 from ctrlaltdavid/19715 
Code Review for Job #19715
 2014-05-29 20:03:24 -07:00
Atlante45
17e3bd6110 CR comments 2014-05-29 18:24:21 -07:00
Atlante45
b89d0a292c code cleanup 2014-05-29 15:56:46 -07:00
Atlante45
fd0c195132 Code cleanup 2014-05-29 15:55:17 -07:00