Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-27 23:15:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
55088 commits 71 branches 56 tags 1.2 GiB
Commit graph

231 commits

Author SHA1 Message Date
Zach Fox
4270086a22 Support 1 and 2 images 2017-04-27 14:01:06 -07:00
Zach Fox
0b4cd41d75 More and more progress! 2017-04-27 14:01:06 -07:00
Zach Fox
a4f428a6e6 Lots of progress 2017-04-27 14:01:06 -07:00
Zach Fox
7acdc86644 Progress 2017-04-27 14:01:05 -07:00
Zach Fox
0860352caa Checkpoint before switching to crash duty 2017-04-27 14:01:05 -07:00
David Rowe
4581b9a0df Refresh countdown number upon reopening dialog 2017-04-26 20:13:21 +12:00
David Rowe
4a5f84f4b9 Merge branch 'master' into 21249 
# Conflicts:
#	libraries/audio-client/src/AudioClient.cpp
 2017-04-26 13:24:18 +12:00
David Rowe
c0a258f9b3 Disable "load" button while making a recording 2017-04-25 09:04:26 +12:00
David Rowe
7fe0ba19b5 Don't display the "Record" button as pressed while recording 2017-04-22 10:05:02 +12:00
David Rowe
ce86ce4530 Red buttons to unload recordings 2017-04-21 19:45:14 +12:00
David Rowe
d064511121 Rearrange dialog controls 2017-04-21 17:01:29 +12:00
David Rowe
1aa6e20791 Change "Record" button to "Stop" while recording 2017-04-21 16:15:49 +12:00
David Rowe
477237cca2 Red "recording" ring animation with countdown numbers inside 2017-04-21 16:07:50 +12:00
Stephen Birarda
924624b127 add new glyphs with check, reference in entityList 2017-04-20 14:21:13 -07:00
Stephen Birarda
f64efe18c0 add an isBaked column to edit.js 2017-04-20 14:21:13 -07:00
David Rowe
0da4e3e3c4 Display scrollbar in recordings table when needed 2017-04-20 14:19:25 +12:00
David Rowe
2108300272 Merge branch 'master' into 21249 2017-04-20 08:43:00 +12:00
David Rowe
7dcda47f95 Fix recording GIF still displaying when reopen tablet to stop recording 2017-04-16 12:57:37 +12:00
Zach Fox
b410399a16 Resolve your paths, silly! 2017-04-14 16:26:29 -07:00
Zach Fox
f81dce5e70 Fix the bug 2017-04-14 15:42:19 -07:00
David Rowe
c2d8755b15 Merge branch 'master' into 21249 2017-04-14 15:32:45 +12:00
David Rowe
11a2559df9 Use HiFi glyph for delete "x"s 2017-04-14 15:30:28 +12:00
David Rowe
1d43e5a992 Style overall dialog layout 2017-04-14 15:12:36 +12:00
David Rowe
75e4fb3820 On tablet with option enabled recording ends when open tablet or dialog 2017-04-13 19:28:40 +12:00
David Rowe
8f3789421f Show "busy" spinner when counting down or recording 2017-04-13 19:23:22 +12:00
David Rowe
ff42715a15 Retain "Record" button's pressed state when close and reopen dialog 2017-04-13 18:41:55 +12:00
David Rowe
b508d6882f Add checkbox that stops countdown/finishes recording when reopen dialog 2017-04-13 17:59:28 +12:00
David Rowe
84cfe1cb75 Don't close dialog when start recording; press "Record" again to finish 2017-04-13 17:00:35 +12:00
David Rowe
afd82f09c0 Provide instructions on running the AC player script 2017-04-13 15:18:04 +12:00
David Rowe
5ad44b6caf Display empty rows for unused players 2017-04-13 13:50:26 +12:00
David Rowe
24a68ea685 Report the numnber of free players rather than total number 2017-04-13 13:40:52 +12:00
Zach Fox
3f91fb8e55 Remove unnecessary comment 2017-04-12 14:45:57 -07:00
Zach Fox
c724c2e50b New loading icon 2017-04-12 14:45:57 -07:00
Zach Fox
87b2d5bf8a New loading icon 2017-04-12 14:45:57 -07:00
Zach Fox
7b92989b1d Fix it 2017-04-12 14:45:57 -07:00
Zach Fox
2579ac1baa It's working! 2017-04-12 14:45:57 -07:00
Zach Fox
e296383b1b Checkpoint! 2017-04-12 14:45:56 -07:00
David Rowe
f30dc4b560 Add a "record" button to initiate recording 2017-04-12 15:04:29 +12:00
David Rowe
905560b96d Remove checkbox and record-on-close functionality 2017-04-12 14:48:15 +12:00
David Rowe
86baf785aa Add "Load" button 2017-04-11 15:23:09 +12:00
David Rowe
9a9bcaf2ae Stop button stops playing recording 2017-04-11 09:37:57 +12:00
David Rowe
bd63960876 Add table of recordings currently being played 2017-04-11 07:23:52 +12:00
David Rowe
813a5684e3 Display instruction text only if recording is enabled 2017-04-06 09:22:01 +12:00
David Rowe
b29bfd4bb4 Dialog instructions refer to tablet or window as appropriate 2017-04-05 17:49:13 +12:00
David Rowe
54a0bea8c0 Toolbar icon state and start/stop recording with window closing/opening 2017-04-05 17:48:35 +12:00
David Rowe
a625fd4523 Add dialog with "Enable recording" checkbox 2017-04-05 16:20:04 +12:00
David Rowe
f397adb22a Reinstate scrollbars to marketplace pages 2017-04-01 11:06:27 +13:00
Seth Alves
4516ddf855 Merge pull request #9847 from highfidelity/tablet-ui 
Tablet ui
 2017-03-28 14:48:02 -07:00
David Rowe
a6ef592353 Non-scrolling window with images scaled to fit 2017-03-28 14:43:26 +13:00
David Rowe
d0fc352d3b Address event bridge being shared with other scripts 2017-03-27 16:07:58 +13:00
Anthony J. Thibault
7e6ff7c2fb Scrollbar is visible on marketplace in toolbar mode. 2017-03-24 11:40:10 -07:00
Anthony J. Thibault
54b11bb6ee Hide the scrollbar on the marketplace 2017-03-24 11:22:50 -07:00
kunalgosar
f09ee92fe1 spacing issues 2017-03-21 14:16:49 -07:00
kunalgosar
30d2ea0ea5 spacing issues 2017-03-21 14:15:56 -07:00
kunalgosar
a4af973ae4 fixed back button on marketplace 2017-03-21 14:12:54 -07:00
Faye Li
f57905fbb3 remove code for jump to selection 2017-03-20 10:23:55 -07:00
Faye Li
197a06c423 changes in TWO entityList.js to register the export event 2017-03-17 16:17:21 -07:00
Seth Alves
d792559d9a have edit.js resend properties of selected entity to entityProperties.js once it's ready 2017-03-10 09:59:23 -08:00
Seth Alves
66d44ac6f0 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-03-08 09:26:51 -08:00
Menithal
d85cb645b0 Changed limit logic, default limit is now 0 
Clones now have a named based on the original entity id
Limit is now calculated from the source instance, instead of just clone
name to avoid a single box being calculated as something else
Default limit is now 0, which disables limit
 2017-03-04 11:42:43 +02:00
Seth Alves
3b581a8dfe merge from upstream 2017-03-02 16:35:44 -08:00
Seth Alves
155a310852 Merge pull request #9761 from Menithal/21166 
WL#21166 Cloneable Equipment
 2017-03-02 16:33:13 -08:00
Menithal
9c31f66b75 Addressed CR of 9684 2017-03-02 21:39:56 +02:00
Menithal
231ebef117 Removed stray debugPrint 2017-03-02 01:01:57 +02:00
Menithal
f538ac24f3 Various Properties 2017-03-01 22:07:02 +02:00
Menithal
1d8be2aeaa Added missing dynamic 2017-02-26 19:17:46 +02:00
Menithal
10151c3f5b Added Multi-userdata field updater 2017-02-24 08:04:03 +02:00
Menithal
4d98cc436b Finished up Edit.js 2017-02-23 23:20:21 +02:00
Menithal
e95e50ad6e Preliminary work on edit.js to allow for new param 2017-02-23 10:34:04 +02:00
Menithal
9b8503eba5 Initial Grab Clone 2017-02-19 18:18:38 +02:00
Menithal
dcbe3c622d Added Hotkey Listening to the webview 
Ctrl + P and Ctrl + Shift + P are now available even if the edit window
has been selected
 2017-02-18 11:51:19 +02:00
Menithal
f5d266a562 Updated 2017-02-17 23:28:28 +02:00
Seth Alves
12b8a77488 in edit.js, convert entity property ID to be a text-field so the data can be copied 2017-02-15 16:29:50 -08:00
Seth Alves
e030a4a518 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-15 15:20:14 -08:00
David Kelly
5184cbe615 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/zoneFilters2 2017-02-15 12:08:55 -07:00
Seth Alves
3a23ec86d5 handles etc work better 2017-02-14 13:57:48 -08:00
humbletim
831bf93500 * refactor ScriptCache per FIXMEs 
* include error details in BatchLoader results
* update EntityServerScript properties in edtior to reflect more granular statuses
* ScriptEngine plumbing in prep for require/module integration
 2017-02-11 04:47:31 -05:00
David Kelly
61e558e568 Entity Edit Filters for zones 
Part 1 - just put them in the zones entities.  Next I'll hook them
up and actually filter...
 2017-02-08 09:53:25 -07:00
Brad Hefta-Gaub
5ada689ab7 Merge pull request #9497 from ctrlaltdavid/fix-clara-download 
Fix intermittent Clara.io download crashes
 2017-01-26 10:58:27 -08:00
Atlante45
f540c94113 Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr 2017-01-25 13:06:49 -08:00
David Rowe
dcd632013f Better variable name 2017-01-25 16:37:35 +13:00
David Rowe
7e56d0fae6 Fix up Clara.io error handling 2017-01-25 16:36:06 +13:00
David Rowe
1b05ae8a82 Make handling of Clara.io download-ready state transition more robust 2017-01-25 11:00:07 +13:00
Atlante45
a1962e274d Fix rescale for 0.x values 2017-01-23 14:35:16 -08:00
Ryan Huffman
7cd19192d9 Remove dead code in entityProperties.js 2017-01-19 15:00:30 -08:00
Ryan Huffman
c015ac1bd5 Add display of server script status to edit.js 2017-01-19 13:27:44 -08:00
Ryan Huffman
71e039951c Add reload server scripts button to edit.js 2017-01-17 14:47:57 -08:00
Ryan Huffman
142c7da523 Add serverScripts property support to edit.js 2017-01-17 14:47:06 -08:00
David Rowe
a1fe908380 Remove a lingering line of old code 2017-01-17 12:56:56 +13:00
David Rowe
d7ab7316a8 Tidying 2017-01-13 12:28:53 +13:00
David Rowe
6f2386eabd Fix processing of Clara.io status messages 2017-01-13 11:20:00 +13:00
David Rowe
4dee0efdd3 Use more reliable Clara.io API parameters 2017-01-13 09:12:49 +13:00
David Rowe
d45e6f00cb Prepare only one download at a time 2017-01-12 22:35:42 +13:00
David Rowe
288c069687 Make cancelling downloads more robust 2017-01-12 22:31:09 +13:00
David Rowe
6e622b3719 Don't request model be centered as work-around for downloads failing 2017-01-12 21:35:24 +13:00
David Rowe
cbe8ce0c19 Improve handling of zip file generation failing 2017-01-12 21:33:32 +13:00
David Rowe
37da800a14 Display Clara model preparation progress 2017-01-12 15:47:41 +13:00
David Rowe
9bdcdf73c1 User must be logged into Clara.io site to download 2017-01-12 09:15:01 +13:00
David Rowe
71d6a5cb1d Implement model request and download 2017-01-11 21:33:03 +13:00
David Rowe
530b176d09 Replace Clara download button with own 2017-01-11 16:36:18 +13:00