Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-25 14:47:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
47567 commits 76 branches 59 tags 1.2 GiB
Commit graph

466 commits

Author SHA1 Message Date
David Rowe
2f3fa80b96 Add Clipboard.getContentsDimensions() JavaScript method 2016-05-26 09:52:22 +12:00
Brad Hefta-Gaub
2eef07e414 cleanup and dead code removal 2016-05-24 15:38:08 -07:00
Brad Hefta-Gaub
12a1857280 check point with protocol refusal working 2016-05-24 15:20:11 -07:00
Brad Hefta-Gaub
1cf8236860 Merge branch 'master' of https://github.com/highfidelity/hifi into protocolVersionCheck 2016-05-24 13:31:36 -07:00
Brad Hefta-Gaub
1d9981e624 first cut at support for verifying all protocol version compatibility 2016-05-24 13:31:19 -07:00
Seth Alves
40e862cf9e quiet gcc 5 warnings 2016-05-21 16:53:01 -07:00
Ryan Huffman
01944f5100 Remove unused DependencyManager include 2016-05-18 15:38:54 -07:00
Ryan Huffman
dd093e3fcd Make AccountManager a DependencyManager singleton 2016-05-18 15:38:54 -07:00
Brad Davis
40316498a4 Enable script debugging 2016-05-09 17:02:40 -07:00
Stephen Birarda
ed1ddc2a8b remove code to update/store wallet balance 2016-05-06 11:54:49 -07:00
Seth Alves
49566c8f26 fix memory leak in AssetMappingModel 2016-04-25 10:07:08 -07:00
Brad Hefta-Gaub
d87d631871 Merge pull request #7708 from zzmp/feat/render-rates 
Add renderRates.js to visualize rates over time
 2016-04-21 15:59:58 -07:00
Zach Pomerantz
2c7cf3ea83 Fix RateScriptingInterface headers 2016-04-20 14:32:25 -07:00
Zach Pomerantz
ad225b3aed Fix RatesScriptingInterface ctor 2016-04-20 13:58:06 -07:00
Zach Pomerantz
1fe12e7029 Mv Rates to RatesScriptingInterface.h 2016-04-20 13:26:23 -07:00
Brad Hefta-Gaub
8f3d48190a switch to QRect instead of vec4 2016-04-16 16:59:47 -07:00
Brad Hefta-Gaub
54777c9cd5 Merge branch 'master' of https://github.com/highfidelity/hifi into improveHMD 2016-04-16 15:19:35 -07:00
Brad Hefta-Gaub
04df84974c handle repositioning of qml windows 2016-04-15 19:50:12 -07:00
Brad Hefta-Gaub
c7f58dc17c first cut at exposing recommend overlay rectangle 2016-04-14 20:47:31 -07:00
Atlante45
4ed8573f74 CR 2016-04-14 17:28:24 -07:00
Atlante45
e45939d18f Make sure ResourceCacheSharedItems deals with strong refs 2016-04-12 13:51:11 -07:00
Atlante45
afdfef1482 Make sure we don't use raw resource ptr 2016-04-12 13:51:11 -07:00
Seth Alves
5fa9f662fc Merge pull request #7542 from birarda/refresh-on-asset-connect 
refresh/close the asset browser dialog on domain switch
 2016-04-01 18:08:59 -07:00
Stephen Birarda
194226103c refresh the Asset Browser when switching domains 2016-04-01 11:13:59 -07:00
Brad Davis
97e96f7b67 PR comments 2016-03-31 13:19:26 -07:00
Stephen Birarda
29cd487f84 fixes for styling and logging from CR 2016-03-15 14:38:08 -07:00
Atlante45
03efde5b3c Change text in case of drag and drop. 2016-03-15 13:53:13 -07:00
Atlante45
4a90ec303c Fix drag&drop 2016-03-15 11:22:42 -07:00
Ryan Huffman
1b81b4f01b Merge branch 'atp' of github.com:birarda/hifi into atp-upload 2016-03-15 10:19:20 -07:00
Ryan Huffman
7947bd7724 Fix message typo enter => entering 2016-03-15 10:11:53 -07:00
Atlante45
98851679c5 Remove unused AssetMappingItem 2016-03-15 09:14:22 -07:00
Stephen Birarda
72c64532f5 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2016-03-15 09:12:49 -07:00
Ryan Huffman
4b6dd4636f Merge branch 'atp' of github.com:birarda/hifi into atp-upload 2016-03-13 21:32:25 -07:00
Ryan Huffman
6c27bd9eb2 Update upload flow and make asset list dynamically sized 2016-03-13 21:04:07 -07:00
Philip Rosedale
7e581cc831 Merge pull request #7325 from hyperlogic/tony/smooth-hands 
Smoother hand motion when using hand controllers
 2016-03-11 15:08:59 -08:00
Stephen Birarda
66e572f226 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2016-03-11 14:44:49 -08:00
Stephen Birarda
e51aedeb35 fix error handling for diff request types 2016-03-11 11:36:52 -08:00
Brad Davis
75c3fd18c9 Expose HMD worn to scripting 2016-03-11 11:00:58 -08:00
Ryan Huffman
631aad80f9 Add Q_DECLARE_METATYPE(AssetMappingModel*) and fix indentation 2016-03-11 09:53:08 -08:00
Anthony J. Thibault
807d31743c Removed Hand, HandData & PalmData 
Instead, we just store two controller::Poses in MyAvatar.
Existing behavior and scripting APIs have been preserved.

The hand controller debug drawing is slightly different, but still works.
 2016-03-10 19:33:31 -08:00
Stephen Birarda
625032f748 fix for add to world after upload name change 2016-03-10 17:10:49 -08:00
Stephen Birarda
979fda7c8b add trimming for upload mapping 2016-03-10 16:57:39 -08:00
Stephen Birarda
96a112290f use mapping for overwrite prompt 2016-03-10 16:56:22 -08:00
Atlante45
35f5ebb938 Don't allow folder overwrite 2016-03-10 16:44:39 -08:00
Ryan Huffman
ad0fb18d81 Add / to beginning of mapping on upload if missing 2016-03-10 16:02:41 -08:00
Ryan Huffman
2d4864ed33 Merge branch 'atp' of github.com:birarda/hifi into atp-more 2016-03-10 15:40:07 -08:00
Atlante45
a6ccfb1685 CR 2016-03-10 15:11:39 -08:00
Atlante45
63571a7c36 Make sure Upload is not clicked several times 2016-03-10 14:59:20 -08:00
Atlante45
548d826a4e Couple bug fixes 2016-03-10 14:59:20 -08:00
Atlante45
7d7a683b18 Add uploadFile method that prompts the user 2016-03-10 14:59:20 -08:00
Ryan Huffman
3e5e2eef17 Add mapping sorting, copying, and isKnownMapping 2016-03-10 08:18:32 -08:00
Brad Davis
28103cf5ef Migrate composition of the overlay and pointer to the present thread 2016-03-07 17:14:41 -08:00
Stephen Birarda
f44cf3903c re-instate verified domain ownership for full automatic networking 
This reverts commit 34408c8144.
 2016-03-01 13:04:37 -08:00
Stephen Birarda
34408c8144 Revert "verified domain ownership for full automatic networking" 2016-02-25 17:02:08 -08:00
Clément Brisset
2e7c7eace5 Merge pull request #7179 from birarda/domain-security 
verified domain ownership for full automatic networking
 2016-02-25 15:24:09 -08:00
Stephen Birarda
6cab831ea0 re-gen the interface keypair while being denied from domain 2016-02-23 14:52:12 -08:00
Brad Hefta-Gaub
9c3abd3eb7 some cleanup and standardization in how headPose is gathered 2016-02-20 11:40:30 -08:00
Brad Hefta-Gaub
7be5811f34 tweak to UI size, clean up screen to overlay 2016-02-19 13:22:37 -08:00
Brad Hefta-Gaub
8b8b99c7e0 HMD mouse checkpoint 2016-02-17 21:19:01 -08:00
Brad Hefta-Gaub
0d873c7732 consolidate all calls to QCursor::pos() and QCursor.setPosition() to use common ControllerScriptingInterface 2016-02-15 16:11:25 -08:00
Brad Hefta-Gaub
df6437236e some CR feedback 2016-02-12 16:13:12 -08:00
Brad Hefta-Gaub
1160ecb335 improvements in HMD UI behavior 2016-02-12 10:51:33 -08:00
Bradley Austin Davis
0a99086617 Moving to QML based dialogs 2016-02-03 14:51:02 -08:00
Bradley Austin Davis
c1d45b0c78 Remove declarative form creation from WindowScriptingInterface 2016-02-03 14:50:59 -08:00
Bradley Austin Davis
f24f2749e1 Make users.js show QML window for edit friends 2016-02-02 15:19:12 -08:00
Ryan Huffman
acf96a401f Fix marketplace imports failing silently if edit.js not running 2016-01-29 15:48:08 -08:00
David Rowe
d7d4961778 Wire up missing GlobalServices.connected() signal 2016-01-21 20:58:14 +13:00
Brad Davis
746c388f7a Cleanup of QML windowing and message boxes 2016-01-15 23:14:49 -08:00
Brad Hefta-Gaub
a70adc8a57 Merge pull request #6823 from jherico/tool_window 
Tool window in QML
 2016-01-14 16:56:27 -08:00
Brad Hefta-Gaub
6b76cf484d fix issues with HMD lookout 2D, and cleanup 2016-01-14 08:48:55 -08:00
Brad Davis
b6272b7824 Migrate tool window to overlay/QML 2016-01-13 15:40:37 -08:00
Brad Hefta-Gaub
0f52b82c21 allow scripted addMenu() to specify grouping 2016-01-08 11:21:37 -08:00
Brad Hefta-Gaub
927fe97359 migrate callers of QMessageBox::warning() to OffscreenUi::warning() 2016-01-05 10:17:16 -08:00
Brad Hefta-Gaub
d98c2d1413 migrate callers of QMessageBox::question() to OffscreenUi::question() 2016-01-05 09:39:39 -08:00
Brad Hefta-Gaub
2b5956af99 move alert and confirm to use offscreen ui 2016-01-04 13:57:36 -08:00
Brad Davis
a883891197 Expose the username to scripts (and thus QML) 2015-12-30 22:28:16 -08:00
samcake
5d395ae54f Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-10 18:06:43 -08:00
Brad Davis
645695d5d5 Moving sixense to external plugin 2015-12-10 10:44:23 -08:00
Seth Alves
60b8e65520 get file dialog working on Linux 2015-12-07 06:03:58 -08:00
Atlante45
b45b1cc513 More work on live g-buffer debug 2015-12-04 17:43:00 -08:00
James B. Pollack
52d6fdac1a Merge pull request #6487 from ctrlaltdavid/20740 
Get the Leap Motion working again
 2015-12-01 15:40:48 -08:00
David Rowe
ce100dbbc5 Fix crash in WebWindowClass in debug build setTitle on open WebWindow 2015-11-30 15:10:51 +13:00
David Rowe
5ecbaa5b93 Fix InputController (Leap Motion) not being updated 2015-11-25 09:43:55 +13:00
David Rowe
e25d4c17e8 Fix InputController (Leap Motion) not able to be created 2015-11-25 09:29:40 +13:00
Sam Gateau
5b92929833 Moving the REcordingScriptingInterface into the script-engine and wiiring up in the assignment-client 2015-11-17 09:32:22 -08:00
samcake
8553033d59 Refactoring the mess for the Agent 2015-11-16 19:27:28 -08:00
samcake
71cc36fdd8 removing ms to seconds conversion in MyAvatar 2015-11-16 18:31:24 -08:00
Brad Davis
d099f61170 Updating audio record/playback mechanism to more closely match actual audio input 2015-11-16 14:57:24 -08:00
Brad Davis
cb26fc67fc Move recording interface back to float/seconds 2015-11-16 14:44:22 -08:00
Brad Hefta-Gaub
5a42991e0c first pass at cleaning up MyAvatars use of PalmData 2015-10-27 13:51:42 -07:00
Brad Davis
e8be92cab8 Adding input action event 2015-10-23 13:36:06 -07:00
Brad Davis
bea6fdd890 Working on JSON parsing and cleanup 
Conflicts:
	libraries/controllers/src/controllers/Route.cpp
	libraries/controllers/src/controllers/ScriptingInterface.cpp
	libraries/controllers/src/controllers/StandardController.cpp
	libraries/controllers/src/controllers/impl/RouteBuilderProxy.h
 2015-10-20 10:20:28 -07:00
Brad Hefta-Gaub
7669f9ed2c fix several warnings 2015-10-19 17:26:57 -07:00
Brad Davis
a8e707ced2 Correcting update order to fix mouse 2015-10-18 22:46:14 -07:00
Brad Davis
734a39f962 Breaking up UserInputMapper, restoring some mappings 2015-10-18 18:58:03 -07:00
Brad Davis
5bac1aae2d Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-16 17:23:30 -07:00
James B. Pollack
112007e5a9 cleanup 2015-10-15 14:58:05 -07:00
James B. Pollack
8b57b3c0ff fix memory leak 2015-10-15 14:13:07 -07:00
James B. Pollack
c18aeef6b3 remove redundant call 2015-10-14 17:29:38 -07:00
James B. Pollack
a1e2292e62 remove title bar from docked tool widgets 2015-10-14 17:27:45 -07:00