Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-10 06:43:00 +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
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
Ryan Huffman
b9f296ddb3 Add WindowScriptingInterface and LocationScriptingInterface 2014-04-30 09:38:30 -07:00
ZappoMan
58c852d210 Merge branch 'master' of https://github.com/worklist/hifi into modelserver 2014-04-30 09:29:06 -07:00
ZappoMan
aac42058ac first cut at modelserver 2014-04-30 09:25:52 -07:00
Brad Hefta-Gaub
19b76e3331 Merge pull request #2750 from Atlante45/master 
Fixed QLINE_MIN_WIDTH warning on mac
 2014-04-30 09:19:09 -07:00
Brad Hefta-Gaub
84e231acfa Merge pull request #2734 from huffman/RunningScripts 
Running scripts
 2014-04-30 09:18:53 -07:00
Thijs Wenker
c20381a0ea EditorWindow on-top behavior fixed 2014-04-30 08:24:04 +02:00
Thijs Wenker
89aafd9c3f Merge branch 'master' of https://github.com/highfidelity/hifi into 19561 2014-04-30 07:58:29 +02:00
Atlante45
e9a01a39a2 Fixed QLINE_MIN_WIDTH warning on mac 2014-04-29 17:38:55 -07:00
Ryan Huffman
1551da9e99 Remove magic number in RunningScripts 2014-04-29 17:23:30 -07:00
Ryan Huffman
8ee90715bd Revert changes to call to saveSettings in Application 2014-04-29 17:20:15 -07:00
Ryan Huffman
fa9e37daad Remove unneeded qDebug() 2014-04-29 17:16:12 -07:00
Ryan Huffman
2ba0c8c237 Remove magic numbers from RunningScriptsWidget 2014-04-29 17:10:09 -07:00
Ryan Huffman
98a736a39c Remove duplicate method declaration 2014-04-29 17:04:11 -07:00
Ryan Huffman
39c959d245 Clean up implementation of 1-9 in RunningScripts 2014-04-29 17:03:38 -07:00
Ryan Huffman
e0ec0f681f Fix code not compliant with coding standards 2014-04-29 16:50:13 -07:00
Atlante45
7787cf97b6 Only glow body + fixed display name scale 2014-04-29 16:30:14 -07:00
Ryan Huffman
edcff0b67f Merge remote-tracking branch 'upstream/master' into RunningScripts 
Conflicts:
	interface/src/Application.cpp
	interface/src/ui/FramelessDialog.cpp
	interface/src/ui/FramelessDialog.h
 2014-04-29 16:28:36 -07:00
Thijs Wenker
87260a4c58 ability to load a script thats running from an external link into the ScriptEditor , followed by a save dialog 2014-04-30 00:58:22 +02:00
Stojce Slavkovski
785c9a3024 improved mention positioning 
removed achive manager
 2014-04-30 00:25:27 +02:00
Andrew Meadows
34aaf98b53 cleanup around how boundary shape is computed 2014-04-29 15:16:50 -07:00
Thijs Wenker
5ea512f65a ScriptEditorWindow not modal, but yet always on foreground 2014-04-29 23:53:46 +02:00
Thijs Wenker
14e9cb770c Merge branch 'master' of https://github.com/highfidelity/hifi into 19561 2014-04-29 23:30:15 +02:00
Stephen Birarda
69e279e2c6 IC-1, remove some spaces in BuckyBalls 2014-04-29 14:05:16 -07:00
Stojce Slavkovski
ca2c8d2fff Merge branch 'master' of https://github.com/worklist/hifi into 19597 2014-04-29 22:31:47 +02:00
Thijs Wenker
2ba39f951a Merge branch '19561' of https://github.com/thoys/hifi into 19561 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
 2014-04-29 22:07:03 +02:00
Thijs Wenker
fc2ed9f9fb Use same load/save dialog behavior as in main application for ScriptEditor, this will keep track of the last directory that was used to load a script. 2014-04-29 22:03:51 +02:00
Thijs Wenker
df14e1e6e4 Use same load/save dialog behavior as in main application for ScriptEditor, this will keep track of the last directory that was used to load a script. 2014-04-29 21:51:20 +02:00
Clément Brisset
7c21fab50c Merge pull request #2736 from SydoxX/master 
Fix CustomUrl
 2014-04-29 12:07:44 -07:00
Konstantin
65706ae5f7 Re-add customUrl.startWith 2014-04-29 20:59:33 +02:00
Konstantin
14b91aa04b Remove 0,0,0 entry 2014-04-29 20:49:40 +02:00
Konstantin
ac8adad0e0 Remove 0,0,0 entry. 2014-04-29 20:49:20 +02:00
Stojce Slavkovski
029e20edda Added XMPP archive manager 2014-04-29 20:40:12 +02:00
Stojce Slavkovski
d24b55871f Merge branch 'master' of https://github.com/worklist/hifi into 19597 2014-04-29 19:05:16 +02:00
Clément Brisset
4c42a403e7 Merge pull request #2738 from huffman/19598 
Login window
 2014-04-28 19:28:50 -07:00
Ryan Huffman
87c10e70cd Add parentheses around conditionals for clarity 2014-04-28 18:31:50 -07:00
Andrew Meadows
ae3b58a33f use setGravity() instead of setting it directly 2014-04-28 16:46:16 -07:00
Andrew Meadows
c7dbc5984f add local gravity option parameter for MyAvatar 2014-04-28 16:40:22 -07:00
Stojce Slavkovski
963ad64d07 Fixed online user presence in chat window 2014-04-28 23:49:59 +02:00
Ryan Huffman
24350761ac Update layout of login messages and move text to .ui file 2014-04-28 13:16:50 -07:00
Ryan Huffman
6f502777a5 Update forgot password URL 2014-04-28 12:03:54 -07:00
Andrew Meadows
a7c4b02f2d merge new work into andrew/inertia 2014-04-28 09:52:06 -07:00
Ryan Huffman
fb42d9ccc6 Update login to move focus to password on fail 2014-04-28 09:21:37 -07:00
Ryan Huffman
45fdd00608 Merge remote-tracking branch 'upstream/master' into 19598 
Conflicts:
	interface/src/ui/FramelessDialog.h
 2014-04-28 09:13:00 -07:00
Ryan Huffman
01f66420de Fix issue with icon being disabled on login window while authenticating 2014-04-28 09:11:09 -07:00
Ryan Huffman
81a0cbe761 Update Menu to use new login dialog 2014-04-28 09:01:13 -07:00
Ryan Huffman
9bf3b3c6bf Add hideOnBlur and TOP position to FramelessDialog 2014-04-28 08:59:28 -07:00
Ryan Huffman
23397a4b10 Add LoginDialog 2014-04-28 08:55:03 -07:00
Stojce Slavkovski
0073db4abd change to public chat room 2014-04-27 20:49:26 +02:00
Konstantin
ec410d105b Fix CustomUrl 
Fixed custom url so that hifi://domain/ works.
 2014-04-27 00:31:28 +02:00
Konstantin
f829a5b323 Fix CustomUrl 
Fixed custom url so that hifi://domain/ works. Also goes earlier to the location.
 2014-04-27 00:29:38 +02:00
Stojce Slavkovski
5c7fb3eca5 Add chat mention notifications 2014-04-26 22:19:33 +02:00
Stojce Slavkovski
91d7bd252d Merge branch 'master' of https://github.com/worklist/hifi into 19597 2014-04-26 08:03:52 +02:00
Ryan Huffman
f889cef3aa Remove the ability to drag the RunningScripts window 2014-04-25 16:15:11 -07:00
Ryan Huffman
792ab7e17e Update icon for Load Script button 2014-04-25 15:57:10 -07:00
Andrew Meadows
b05a315b5a merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/avatar/MyAvatar.cpp
 2014-04-25 14:52:44 -07:00
Andrew Meadows
c2f1507df1 move AVATAR_MOTION_OBEY_GRAVITY to libs 2014-04-25 14:16:42 -07:00
Andrew Meadows
ecae89489e mispelled slot 2014-04-25 14:13:44 -07:00
Ryan Huffman
958238efa7 Cleanup implementation of script loading to reduce copy/paste 2014-04-25 12:45:26 -07:00
Ryan Huffman
8480d02414 Fix 1-9 keys not working in Running Scripts widget 2014-04-25 12:44:46 -07:00
Atlante45
8b4a910040 Fix timestamp timer not fired 2014-04-25 12:19:18 -07:00
Ryan Huffman
c3d8cce4a6 Add plus icon to LoadScript button 2014-04-25 10:30:56 -07:00
Ryan Huffman
61e8a20550 Update running scripts widget to forward mouse release events 2014-04-25 10:11:56 -07:00
Ryan Huffman
76d8090938 Disallow resizing of running scripts widget 2014-04-25 10:11:34 -07:00
Ryan Huffman
dd844437b6 Add option to disallow resizing in FramelessDialog 2014-04-25 10:11:22 -07:00
Ryan Huffman
225c022511 Update RunningScriptsWidget to use FramelessDialog 2014-04-25 10:10:50 -07:00
Ryan Huffman
84e7b1598c Merge remote-tracking branch 'upstream/master' into RunningScripts 2014-04-25 08:45:54 -07:00
Philip Rosedale
9884d74f60 Merge pull request #2728 from Atlante45/fix_audio_jitter 
Fix audio jitter
 2014-04-24 18:25:16 -07:00
Atlante45
cf7fe2306b Fix audio jitter 2014-04-24 18:10:51 -07:00
Atlante45
01637e8037 Fix error introduced with gettimeofday removing + spelling mistake 2014-04-24 17:37:48 -07:00
Clément Brisset
fd8ec9b5c2 Merge pull request #2723 from huffman/19554-2 
19554 - Chat Updates
 2014-04-24 16:44:22 -07:00
Ryan Huffman
d88897ccc7 Add error box when going to user/location that doesn't exist 2014-04-24 15:55:34 -07:00
Andrew Meadows
0b5c1b0a9a add MyAvatar::_motionBehaviors (for obeyGravity) 
Also reconcile Menu checkable set vs script-set collision groups.
 2014-04-24 15:43:03 -07:00
Leonardo Murillo
a21991c5c2 Fixing xml parsing 2014-04-24 16:22:34 -06:00
Leonardo Murillo
f4c98a8fa4 Fixing xml parsing 2014-04-24 16:21:49 -06:00
Ryan Huffman
b69fa73dfa Unsplit a line in FramelessDialog 2014-04-24 14:54:57 -07:00
Ryan Huffman
7b09812028 Remove insertFromMimeData override in ChatMessageArea 2014-04-24 14:54:26 -07:00
Ryan Huffman
ccad0aed9e Move ChatInputArea code in header to .cpp 2014-04-24 14:54:01 -07:00
Leonardo Murillo
27002a9406 Casting to QUrl 2014-04-24 15:10:37 -06:00
Ryan Huffman
a86af6b07f Add Load Script button to RunningScripts Dialog 2014-04-24 14:05:09 -07:00
Leonardo Murillo
ad0f0118bc fixes for new versioning: 2014-04-24 15:01:37 -06:00
Stojce Slavkovski
8f2878953c Merge branch 'master' of https://github.com/worklist/hifi into 19597 2014-04-24 22:48:11 +02:00
Stojce Slavkovski
b02883f84d add limits to QXmppArchiveManager 2014-04-24 22:47:42 +02:00
Stojce Slavkovski
c968a4bdb6 set QXmppArchiveManager limits 2014-04-24 22:45:25 +02:00
Stojce Slavkovski
2c35fe433d Try to load past messages with QXmppArchiveManager 2014-04-24 22:44:52 +02:00
Andrew Meadows
73d0674565 expose MyAvatar.collisionGroups to JS 2014-04-24 11:19:08 -07:00
Andrew Meadows
f07a418a27 namechange CollisionFlags --> CollisionGroups 2014-04-24 11:07:49 -07:00
Mohammed Nafees
29d64373b4 Merge branch master 2014-04-24 18:52:59 +05:30
Mohammed Nafees
dd74ea64e7 Further changes for child like behaviour 2014-04-24 17:18:24 +05:30
Andrzej Kapolka
4f8c1f9c65 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-23 16:09:23 -07:00
Clément Brisset
d441e6a453 Merge pull request #2717 from AndrewMeadows/inertia 
avatar bounding capsule collision against voxels
 2014-04-23 16:06:14 -07:00
Ryan Huffman
0cba95e7ad Reorder property initialization in FramelessDialog 2014-04-23 15:37:49 -07:00
Ryan Huffman
1774f6c9bd Add threshold to auto scroll 2014-04-23 15:37:28 -07:00
Ryan Huffman
d56a4e169e Add ChatInputArea 2014-04-23 15:24:21 -07:00
Andrew Meadows
10265a4a3e temp disable of screen flash for avatar collisions 2014-04-23 14:37:24 -07:00
Andrew Meadows
96ca537400 removing unused motion-state timers 2014-04-23 13:44:25 -07:00
Andrzej Kapolka
2bac802407 One more unused variable. 2014-04-23 12:30:39 -07:00
Andrzej Kapolka
c8c3cf3664 Remove unused propagate option for applyRotationDelta. 2014-04-23 12:29:01 -07:00
Ryan Huffman
5fd585aab1 Fix error with cursor format getting reset when sending chat message 2014-04-23 12:26:59 -07:00
Andrzej Kapolka
d38d3db224 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-23 12:25:43 -07:00
Andrzej Kapolka
141250d51c Don't constrain elbow when rotating forearm with wrist. 2014-04-23 12:22:24 -07:00