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

6425 commits

Author SHA1 Message Date
Andrew Meadows
ec65940212 remove debug #include <StreamUtils.h> 2014-05-05 12:34:56 -07:00
Andrew Meadows
6b129c86d0 reduce snagging when walking across voxel seams 2014-05-05 12:33:05 -07:00
Atlante45
31b5c39f16 Fix warnings 2014-05-05 11:17:11 -07:00
Atlante45
7f7cd6f654 Fix for OS X Fullscreen (closes #2414) 2014-05-05 11:15:55 -07:00
Andrzej Kapolka
e898b4a900 More attachment bits. 2014-05-04 17:24:15 -07:00
Andrzej Kapolka
53a2760905 More attachment bits. 2014-05-04 16:24:23 -07:00
Stojce Slavkovski
01ebefde11 Merge branch 'master' of https://github.com/worklist/hifi into 19597 2014-05-05 01:24:15 +02:00
Andrzej Kapolka
e0400dbd9c Working on allowing attachment models to be uploaded. 2014-05-04 15:23:31 -07:00
Andrzej Kapolka
2bc605e193 Merge pull request #2779 from PhilipRosedale/master 
Remove dead ‘play slaps’ code
 2014-05-04 13:33:03 -07:00
Stojce Slavkovski
37664d3877 Merge branch 'master' of https://github.com/worklist/hifi into 19597 2014-05-04 18:32:01 +02:00
Philip Rosedale
ab0e854336 Removed session UUID from interface title bar 2014-05-03 11:33:39 -07:00
Philip Rosedale
eb991b60ce Remove dead ‘play slaps’ code 2014-05-03 09:08:26 -07:00
Andrzej Kapolka
3a4dfb92f6 Let's try using the neck parent rotation, rather than the neck, to fix 
separate heads.
 2014-05-02 19:37:42 -07:00
Stephen Birarda
7921d33716 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-02 17:47:48 -07:00
Andrzej Kapolka
b458cd1297 Default joint mappings for Makehuman models. 2014-05-02 17:29:38 -07:00
Andrzej Kapolka
93cb5fc330 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-02 17:21:51 -07:00
Philip Rosedale
9aac74035c Merge pull request #2771 from birarda/oauth-ds 
restrict access to domains using user roles retreived from data-web
 2014-05-02 17:09:52 -07:00
Andrzej Kapolka
4c49d00683 Scale adjustment for Makehuman models. 2014-05-02 17:01:07 -07:00
Stephen Birarda
1f35c07420 more repairs to OAuth signal/slot connection 2014-05-02 16:58:06 -07:00
Stephen Birarda
2dacc81960 use old signal/slot notation in OAuthWebViewHandler 2014-05-02 16:47:49 -07:00
Philip Rosedale
4c2a1426a9 Merge pull request #2775 from Atlante45/editModels_js 
Edit models js
 2014-05-02 16:34:26 -07:00
Stephen Birarda
59ad09bfda fix another missed casing issue 2014-05-02 16:34:06 -07:00
Andrzej Kapolka
6f3b3acc86 Remove pushback entirely for other avatars. 2014-05-02 16:27:39 -07:00
Stephen Birarda
1fda012364 fix another casing issue in OAuthWebViewHandler 2014-05-02 16:22:12 -07:00
Stephen Birarda
53eddab43c fix typo for OAuth header include 2014-05-02 15:52:50 -07:00
Andrzej Kapolka
f3948d5e62 If "collide with avatars" is off, don't attempt camera pushback. 2014-05-02 15:02:40 -07:00
Stojce Slavkovski
39089ad5f2 Merge branch 'master' of https://github.com/worklist/hifi into 19597 2014-05-02 23:52:27 +02:00
Stojce Slavkovski
4d8e1b5bd4 repled audio files 2014-05-02 23:52:12 +02:00
Atlante45
55ce204ee3 Merge branch 'master' of https://github.com/highfidelity/hifi into editModels_js 2014-05-02 14:50:52 -07:00
Andrzej Kapolka
71231268a5 Better head heights for headless skeletons. 2014-05-02 14:28:12 -07:00
Andrzej Kapolka
94a46b4a21 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-02 14:07:29 -07:00
Andrzej Kapolka
9d13740979 Better default scale, get eye positions from skeleton. 2014-05-02 14:06:54 -07:00
ZappoMan
8443bb0afc fix a scale to fit bug, and add features to place models with hands 2014-05-02 13:19:33 -07:00
Stojce Slavkovski
9a1de7f057 Merge branch 'master' of https://github.com/worklist/hifi into 19597 2014-05-02 22:17:59 +02:00
Stephen Birarda
3a7f4a83b3 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-02 11:36:20 -07:00
Atlante45
ab0a0165c7 Working version of editModels.js 2014-05-02 11:19:12 -07:00
Andrew Meadows
5ac301a77e set the _lastFloorContactPoint 2014-05-02 11:17:46 -07:00
Andrzej Kapolka
963434f784 Try using the head neck/eye rotation updates on the skeleton. 2014-05-02 11:04:52 -07:00
Andrew Meadows
d8cb84080c stop avatar integration when standing at rest 2014-05-02 10:43:10 -07:00
Stephen Birarda
aa2931d9bb resolve conflicts on merge with upstream/master 2014-05-02 10:39:17 -07:00
Stephen Birarda
4936fb3857 expose access token from AccountManager 2014-05-02 10:34:29 -07:00
AndrewMeadows
ac549977be Merge pull request #2770 from ZappoMan/modelserver 
Fix a couple bugs in Models
 2014-05-02 10:01:44 -07:00
Stojce Slavkovski
23da9d85a4 Merge branch '19597' of https://github.com/stojce/hifi; branch 'master' of https://github.com/worklist/hifi into 19597 2014-05-02 18:47:45 +02:00
ZappoMan
b8eb441468 removed debugging 2014-05-02 09:31:28 -07:00
ZappoMan
715e6b8e60 debugging model editing 2014-05-02 09:10:30 -07:00
Philip Rosedale
69f0611a06 Correction to actually pick closest 2014-05-02 09:05:09 -07:00
Philip Rosedale
03b59055fd merge conflict fix 2014-05-02 07:10:43 -07:00
Philip Rosedale
4089d54389 Avatar makes eye contact with the person nearest to gaze direction 2014-05-02 00:21:14 -07:00
Andrzej Kapolka
3ebe1df6de Merge branch 'master' of https://github.com/highfidelity/hifi 
Conflicts:
	interface/src/avatar/MyAvatar.h
 2014-05-01 21:00:32 -07:00
Andrzej Kapolka
28b9033373 Recode textures on upload if they're uncompressed or bigger than our maximum 
size.
 2014-05-01 18:51:57 -07:00
Andrzej Kapolka
322e12b9de Allow users to clear the head URL and have no separate head model. 2014-05-01 17:55:16 -07:00
Andrzej Kapolka
b7e91e4fff Need to open the temporary file in order to get the path. 2014-05-01 16:27:50 -07:00
Andrew Meadows
22bf10a9e7 repair addThrust() API so hydraMove.js works 2014-05-01 16:18:55 -07:00
Andrzej Kapolka
02c757c940 Forgot to remove debugging code. 2014-05-01 16:13:03 -07:00
Andrzej Kapolka
6caa928e64 More work on avatar customization. 2014-05-01 16:12:20 -07:00
AndrewMeadows
05e5277084 Merge pull request #2764 from ZappoMan/modelserver 
Model Server, Renderer, Scripting, etc
 2014-05-01 15:39:12 -07:00
Brad Hefta-Gaub
1954672dd4 Merge pull request #2766 from huffman/19615 
Worklist Job #19615 - Add programmatic access to "file browser" to Interface JavaScript
 2014-05-01 15:23:42 -07:00
ZappoMan
8938c1c38b fixed bad particle reference 2014-05-01 15:18:43 -07:00
Brad Hefta-Gaub
1dd51c93e5 Merge pull request #2765 from huffman/19623 
Job #19623 - Update LoginDialog to be type Qt::WindowModality
 2014-05-01 14:37:07 -07:00
ZappoMan
12daae0308 added missing files 2014-05-01 14:12:11 -07:00
Ryan Huffman
adadceb5ca Merge remote-tracking branch 'upstream/master' into 19623 2014-05-01 13:56:25 -07:00
Andrzej Kapolka
c8877c31fe More work on setting model properties before upload. 2014-05-01 13:25:23 -07:00
Stephen Birarda
5d5292b4b5 pull state as session UUID from OAuth URL 2014-05-01 12:50:44 -07:00
Stephen Birarda
d942054015 cleanup re-display of OAuthWebView 2014-05-01 12:44:42 -07:00
Stojce Slavkovski
c34e6266fb Merge branch 'master' of https://github.com/worklist/hifi into 19597 2014-05-01 21:27:09 +02:00
Stephen Birarda
66077d5616 present the OAuth webview only every 5 seconds 2014-05-01 12:18:40 -07:00
Thijs Wenker
df6df759a3 Merge branch 'master' of https://github.com/highfidelity/hifi into 19561 2014-05-01 21:08:20 +02:00
Thijs Wenker
9667748156 - Style fixes 
- ScriptHightlighting qouting RegEx fix (  "hello" + " " + "world" // the text between two quote entities isn't red anymore )
 2014-05-01 21:07:46 +02:00
Andrew Meadows
8d4dca31c5 add velocity model for controlling avatar motion 2014-05-01 12:05:34 -07:00
Stephen Birarda
ca2148178d handle cleanup of OAuth web view when force closed 2014-05-01 12:01:08 -07:00
Stephen Birarda
7d3157b1a0 trust high fidelity root CA cert for OAuth redirect 2014-05-01 11:54:51 -07:00
AndrewMeadows
2ad31793e2 Merge pull request #2756 from PhilipRosedale/master 
Added back ability to see/debug head/gaze position with ‘Head Mouse'
 2014-05-01 11:51:58 -07:00
ZappoMan
f7da070d77 more work, cleanup names, remove translation use snap to center 2014-05-01 11:29:17 -07:00
Stephen Birarda
d9033a8074 output SSL errors from OAuthWebViewHandler 2014-05-01 11:13:46 -07:00
Stephen Birarda
56c24ce8b7 present QWebView for OAuth authorization in interface 2014-05-01 11:09:35 -07:00
Ryan Huffman
5a5e628536 Add Window.browse to scripting environment 2014-05-01 10:51:58 -07:00
Stephen Birarda
2f0e311a99 return OAuth URL to interface clients when OAuth enabled 2014-05-01 10:19:05 -07:00
ZappoMan
293963c546 implement snap to center in model 2014-05-01 09:02:41 -07:00
ZappoMan
bb6444f5a9 more hacking got it working 2014-05-01 07:30:56 -07:00
Thijs Wenker
a33c18c15d Merge branch 'master' of https://github.com/highfidelity/hifi into 19561 2014-05-01 14:49:50 +02:00
Stojce Slavkovski
c5bceed880 Merge branch 'master' of https://github.com/worklist/hifi into 19597 2014-05-01 13:10:51 +02:00
Philip Rosedale
223d9cf32e Added back ability to see/debug head and eye gaze position with ‘Head Mouse’ 2014-04-30 21:29:50 -07:00
Brad Hefta-Gaub
76a8afaf88 Merge pull request #2754 from huffman/19612 
Job #19612 - Add New Scripting Features to Interface
 2014-04-30 21:23:33 -07:00
Ryan Huffman
33ca387c86 Update goToURL to work with domains and user/location 
If the path starts with # or @ it's a location or user, respectively,
otherwise it is a domain.
 2014-04-30 21:12:04 -07:00
Ryan Huffman
a7dd19183e Add default values for alert, confirm, and prompt 2014-04-30 19:02:28 -07:00
Ryan Huffman
8e63352d54 Fix Window.confirm() not working 2014-04-30 19:00:06 -07:00
Andrzej Kapolka
66e0cbf6ad Working on FBX uploads (i.e., without FST). 2014-04-30 18:34:43 -07:00
ZappoMan
85484affa9 hacking 2014-04-30 17:55:54 -07:00
Atlante45
3a64ce733a Fixed warning 2014-04-30 16:55:51 -07:00
Stojce Slavkovski
d6b7dac649 Merge branch 'master' of https://github.com/worklist/hifi into 19597 2014-05-01 01:41:11 +02:00
Thijs Wenker
cf1baaf6ea - Highlighting Fixes ( Single line comments in quoted text don't occur anymore. / Better number recognition) 
- Line numbers in ScriptEditor
 2014-04-30 23:32:41 +02:00
Ryan Huffman
6c3e1c6aa5 Update LoginDialog to be type Qt::WindowModality 
Currently the login window will cover other windows, in particular
the "welcome" window that pops up for new users.  This allows those
windows to be interacted with while still blocking interaction with the
main window.
 2014-04-30 13:54:41 -07:00
Ryan Huffman
9e684a0bc8 Add registerGetterSetter to remove need for getEngine() 2014-04-30 11:17:36 -07:00
ZappoMan
0182a6d895 models working end to end 2014-04-30 11:12:49 -07:00
Thijs Wenker
7125b6ab8e Merge branch 'master' of https://github.com/highfidelity/hifi into 19561 
Conflicts:
	interface/src/Application.cpp
 2014-04-30 20:08:11 +02:00
Andrew Meadows
db9221da6e fix misspelled slot 2014-04-30 10:38:42 -07:00
Ryan Huffman
65fd2a7724 Merge remote-tracking branch 'upstream/master' into 19612 
Conflicts:
	interface/src/Menu.cpp
 2014-04-30 09:57:17 -07:00
Ryan Huffman
9a44b2b2fb Remove unneeded include in WindowScriptingInterface 2014-04-30 09:40:50 -07:00
Ryan Huffman
ff51b22bfe Add Menu::goToUrl 2014-04-30 09:39:48 -07:00
Ryan Huffman
0570849df5 Add Window and location to global script object 2014-04-30 09:38:57 -07:00