Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-10 19:27:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
12945 commits 25 branches 0 tags 1.1 GiB
Commit graph

6575 commits

Author SHA1 Message Date
Philip Rosedale
c6b4b7c250 Merge pull request #2811 from AndrewMeadows/inertia 
prevent avatar from getting trapped in voxel collisions
 2014-05-07 16:54:28 -07:00
Philip Rosedale
e6a8c79f9f Added more arrow controls to move camera when in mirror mode, new guitar chords. 2014-05-07 16:51:22 -07:00
Philip Rosedale
4e1eaf8337 Merge pull request #2809 from Atlante45/mute_env 
Mute environment
 2014-05-07 16:18:23 -07:00
Andrew Meadows
a11b996a51 cleaner way to achieve the last commit 2014-05-07 16:00:39 -07:00
Andrew Meadows
2d3592e367 avoid resolving penetration twice 2014-05-07 15:58:00 -07:00
Andrew Meadows
b92bbafc26 prevent avatar from getting trapped in voxels 2014-05-07 15:21:12 -07:00
Atlante45
fd1f6befff CR 2014-05-07 15:19:32 -07:00
Andrzej Kapolka
350fe5bf14 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-07 14:50:49 -07:00
Atlante45
6308c39aab Fix for windows 2014-05-07 14:03:30 -07:00
Brad Hefta-Gaub
fec2ba71b5 Merge pull request #2807 from PhilipRosedale/master 
AirGuitar.js, arrow keys move fwd/back in mirror view
 2014-05-07 13:15:35 -07:00
Atlante45
9d2df69bab Merge branch 'master' of https://github.com/highfidelity/hifi into mute_env 2014-05-07 12:57:51 -07:00
Atlante45
40ed72989c mute environment packet 2014-05-07 12:57:11 -07:00
Andrzej Kapolka
55b677dd02 Provide options for model translation: by default, pivot about mesh bounds' 
center; allow numeric translation or pivot about joint position.
 2014-05-07 12:53:38 -07:00
ZappoMan
37ca6efc7c correctly handle SHADOW_RENDER_MODE in a bunch of places that were drawing shadows when they shouldn't 2014-05-07 11:48:32 -07:00
Andrew Meadows
9fc1c765d3 overhaul of CollisionInfo 
store Cube info for sphereAACube collisions
 2014-05-07 11:40:00 -07:00
Philip Rosedale
a6fcf915af Merge branch 'master' of https://github.com/worklist/hifi 2014-05-07 10:02:10 -07:00
Philip Rosedale
fc962749c0 Arrow keys adjust distance from camera in mirror mode, air guitar script 2014-05-06 22:41:08 -07:00
Stojce Slavkovski
490ec23d8c Merge branch 'master' of https://github.com/worklist/hifi into 19507 2014-05-07 07:38:48 +02:00
Andrzej Kapolka
d0537e7ead Specular map support. 2014-05-06 17:32:10 -07:00
Clément Brisset
72e6ff3649 Merge pull request #2803 from ZappoMan/modelserver 
Model Server Bug Fixes/Bandwidth improvements
 2014-05-06 17:18:25 -07:00
Brad Hefta-Gaub
439c873a68 Merge pull request #2794 from AndrewMeadows/thermonuclear 
misc maintenance and bug fixes
 2014-05-06 16:51:28 -07:00
ZappoMan
91e4a89573 cleanup old references to node which are really elements 2014-05-06 15:47:18 -07:00
Andrew Meadows
80ed8e7cf0 disable environment gravity when not set in menu 2014-05-06 14:56:16 -07:00
Stojce Slavkovski
8ee282e7d2 Merge branch 'master' of https://github.com/worklist/hifi into 19507 2014-05-06 22:01:48 +02:00
Andrzej Kapolka
432df1b65f Only add each texture once. 2014-05-06 12:41:31 -07:00
Andrzej Kapolka
983a3af4b9 Attachment translations in world space. 2014-05-06 11:50:37 -07:00
Andrzej Kapolka
082ff760d6 Un-default the "OK" button so that we can press enter on the URL field. 2014-05-06 11:47:35 -07:00
Andrzej Kapolka
9421af9f10 Fix for attachments' not appearing in rear view mirror head mode. 2014-05-06 11:14:48 -07:00
Andrew Meadows
68b0e91630 gravity disabled by default 2014-05-06 11:09:13 -07:00
Andrew Meadows
8a630a148e fix copy-n-paste typo 2014-05-06 11:03:51 -07:00
Andrzej Kapolka
72ebeffa5c Scratch that; I just didn't understand how magic invisible disappearing scroll 
bars worked on OS X.
 2014-05-06 10:59:28 -07:00
Andrzej Kapolka
c5fbf1b55f Force the scroll bar. 2014-05-06 10:57:11 -07:00
Andrew Meadows
2d0e4fb94f use START_LOCATION as default settings 2014-05-06 10:55:30 -07:00
Andrzej Kapolka
e0ecd611c9 Better attachment styling. 2014-05-06 10:53:54 -07:00
Andrzej Kapolka
a06697f2a1 Update attachment data on attachment delete. 2014-05-06 10:37:27 -07:00
Andrzej Kapolka
7eef1b56a2 Don't use the scale to determine the depth in Faceplus. Apparently it's not 
reliable.
 2014-05-06 10:19:29 -07:00
Andrew Meadows
d1a262bb56 maintenance: replace implicit casts with explicit 2014-05-06 10:02:41 -07:00
Andrew Meadows
2ea10428c8 properly wrap XMPP stuff with "#ifdef HAVE_XMPP" 2014-05-06 09:34:44 -07:00
AndrewMeadows
7a191961cf Merge pull request #2793 from PhilipRosedale/master 
Further improvements to avatar eye contact based on head direction
 2014-05-06 09:08:19 -07:00
Stojce Slavkovski
0b03421046 trivial commit - trigger build 2014-05-06 08:37:49 +02:00
Stojce Slavkovski
aedc7eda3e Merge branch 'master' of https://github.com/worklist/hifi into 19597 2014-05-06 08:27:55 +02:00
Stojce Slavkovski
14fee3b727 trivial commit - trigger build 2014-05-06 08:27:46 +02:00
Philip Rosedale
bb20762083 Merge pull request #2791 from AndrewMeadows/thermonuclear 
fix avatar motor to point in direction of camera
 2014-05-05 22:10:13 -07:00
Philip Rosedale
e3ab16997a tweaks to roll (back to no magnify) and lookAt indicator dot 2014-05-05 22:06:28 -07:00
Philip Rosedale
e1a6a824a3 remove model loader debug 2014-05-05 20:28:12 -07:00
Philip Rosedale
e0c898bba0 Merge branch 'master' of https://github.com/worklist/hifi 2014-05-05 18:03:33 -07:00
Philip Rosedale
53baf5652e avatar look at indicator smaller grey ball 2014-05-05 18:03:25 -07:00
Andrew Meadows
e33ef1a571 fix avatar motor to point in direction of camera 2014-05-05 17:35:23 -07:00
Andrzej Kapolka
710cc3ec2a Comment fix. 2014-05-05 17:08:10 -07:00
Andrzej Kapolka
2a32700a30 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-05 17:03:31 -07:00
Philip Rosedale
da0b36ed5c merge fix 2014-05-05 16:21:52 -07:00
Andrzej Kapolka
fd0a39df12 Always update attachments. 2014-05-05 16:19:33 -07:00
Philip Rosedale
691b1d6069 Added lookAt rendering bubble 2014-05-05 16:19:09 -07:00
Stojce Slavkovski
bcad49d0a9 Merge branch 'master' of https://github.com/worklist/hifi into 19597 2014-05-06 01:05:13 +02:00
Stojce Slavkovski
519b36240c build fix 2014-05-06 01:05:04 +02:00
Brad Hefta-Gaub
e59c4a9aa2 Merge pull request #2783 from AndrewMeadows/inertia 
improved avatar walking on voxels
 2014-05-05 15:49:44 -07:00
Andrzej Kapolka
f37460e39a Basic attachment rendering. 2014-05-05 15:46:09 -07:00
Stojce Slavkovski
a5c6d8d996 Merge branch 'master' of https://github.com/worklist/hifi into 19597 2014-05-06 00:24:49 +02:00
AndrewMeadows
1c9cc03693 Merge pull request #2784 from ZappoMan/modelserver 
LOD support to Models & Particles, and some other tweaks
 2014-05-05 15:13:18 -07:00
ZappoMan
b10d9e3903 add LOD support for model and particle rendering 2014-05-05 14:26:51 -07:00
Andrew Meadows
39196501f1 removed some unhelpful comments 2014-05-05 14:23:50 -07:00
Stephen Birarda
9ffd93a167 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-05 13:57:19 -07:00
Andrew Meadows
5ffd307926 Merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/avatar/MyAvatar.h
 2014-05-05 13:54:25 -07:00
Andrew Meadows
301c3c5649 don't ignore wall collisions when walking 
also reduced max walk speed
 2014-05-05 13:47:11 -07:00
Andrzej Kapolka
65e34f9697 More work on attachment interface. 2014-05-05 13:41:50 -07:00
Andrew Meadows
0c78449cf7 reduce movement speed when walking 2014-05-05 13:28:42 -07:00
Andrew Meadows
815262b802 update _lastFloorContactPoint 2014-05-05 13:06:55 -07:00
Stojce Slavkovski
09c385ba0d Merge branch 'master' of https://github.com/worklist/hifi into 19597 2014-05-05 21:46:17 +02:00
Stojce Slavkovski
ccabe709b1 Merge branch 'master' of https://github.com/worklist/hifi into 19507 2014-05-05 21:40:37 +02:00
Stojce Slavkovski
56e7900aa6 Merge fix 2014-05-05 21:36:05 +02:00
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
Stojce Slavkovski
7f96f81c24 Merge branch 'master' of https://github.com/worklist/hifi into 19507 2014-05-05 00:55:37 +02:00
Stojce Slavkovski
f668cc8581 Discourse upload image 
- success message set
- fixed signal/slots in QDialog w/QEventLoop
- layout fixes
 2014-05-05 00:55:24 +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
Stojce Slavkovski
d93480458f Posting Image to forum 2014-05-04 18:30:58 +02:00
Stojce Slavkovski
cec3ce78b9 Merge branch 'master' of https://github.com/worklist/hifi into 19507 2014-05-03 21:12:39 +02:00
Stojce Slavkovski
c400630bc4 make post 2014-05-03 21:12:20 +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
Stojce Slavkovski
b2c1afe1bd Merge branch 'master' of https://github.com/worklist/hifi into 19507 2014-05-03 09:52:19 +02: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
Stojce Slavkovski
468b6b83a8 Merge branch 'master' of https://github.com/worklist/hifi into 19507 2014-05-03 00:18:21 +02: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
Stojce Slavkovski
d3fecd7a31 store discourse api key 2014-05-02 22:16:19 +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
Stojce Slavkovski
852756e84d Merge branch 'master' of https://github.com/worklist/hifi into 19507 2014-05-02 19:03:11 +02: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