Commit graph

54 commits

Author SHA1 Message Date
David Rowe
5428bb19dc Add "Avatar Script" JSDoc API classification 2019-02-12 11:49:49 +13:00
Zach Fox
96858c9586 MS15529: Add secondary camera snapshot notification flag 2018-06-01 13:38:41 -07:00
David Rowe
6db4dd8673 Merge branch 'master' into 21872-b
# Conflicts:
#	interface/src/ui/Snapshot.h
2018-05-17 20:11:14 +12:00
Zach Fox
a54ce96ac2 Clement's CR 2018-05-14 17:46:58 -07:00
David Rowe
74617822fa Snapshot API JSDoc stubs 2018-05-12 16:32:33 +12:00
Zach Fox
0236bc0c44 Cleanup after merge conflict 2018-05-10 09:51:45 -07:00
Zach Fox
44cfa95830 Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements 2018-05-09 15:01:24 -07:00
NissimHadar
d5bb582811 Per Austin's comments. 2018-05-08 11:40:56 -07:00
NissimHadar
481eddb2a3 Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester 2018-05-07 08:24:03 -07:00
Clement
da9fb9c751 Fix non self-sufficient headers 2018-05-04 16:26:41 -07:00
Zach Fox
c3d3cdca3d Add cubemap output format 2018-05-03 12:57:00 -07:00
NissimHadar
5cbb8674ec Use default parameter for saveSnapshot(). 2018-05-02 14:45:28 -07:00
Zach Fox
57993cfdd0 Cleanup 2018-05-02 11:22:42 -07:00
Zach Fox
249e2a2bac Tons of stability and clarity improvements 2018-05-01 13:00:04 -07:00
NissimHadar
c01fd02de2 Corrected parameter type. 2018-04-30 17:23:49 -07:00
Zach Fox
eab2feb543 Lots of little improvements and stability fixes 2018-04-30 13:54:10 -07:00
Zach Fox
a2b84c0fbb It's working!! 2018-04-30 12:11:46 -07:00
Zach Fox
1b29946a48 I feel so close; why isn't this variable capturing? 2018-04-27 17:26:05 -07:00
NissimHadar
cf9b089a3c Added option to set snapshot location (for this execution only) from the command line. 2018-04-27 17:18:16 -07:00
NissimHadar
faec9a62b6 Changed "" to QString() 2018-02-06 11:01:50 -08:00
NissimHadar
cf87052b7f Added option to select snapshot filename in scripts. 2018-02-05 17:29:00 -08:00
Zach Fox
c9e0679b70 Subscribe to changes to snapshotsLocation setter for better UX 2017-05-02 10:55:57 -07:00
Zach Fox
3ce81844da Snapshot JS interface for better Settings handling 2017-04-27 14:01:08 -07:00
howard-stearns
5188de924f allow for SnapshotReview dialog to be up during a change of href for all
media capture
2016-11-22 11:09:43 -08:00
Howard Stearns
615325c17f check for empty snapshot dir, and default to temp 2016-10-16 12:25:32 -07:00
howard-stearns
056b90c662 separate into four files 2016-08-22 15:01:55 -07:00
David Kelly
c8f3a898d2 First cut of a snapshot uploader
Will need to test end-to-end shortly, etc...
2016-08-08 15:27:27 -07:00
SamGondelman
890b22426c added folder selection dialog on first snapshot 2016-07-06 12:15:34 -07:00
SamGondelman
218b26b521 removed snapshot share dialog, ctrl s shouldn't leave you moving 2016-07-01 10:58:55 -07:00
Brad Davis
27c38599a9 Snapshot dialogs 2016-02-01 11:07:48 -08:00
Niraj Venkat
694272ffaa "fixed" formatting issues and code cleanup 2015-06-03 14:48:25 -07:00
Niraj Venkat
57004c61c7 Fixed snapshot bug. Snapshots now save and load ok 2015-06-03 14:29:39 -07:00
Brad Davis
302aa9db47 Removing access to the gl widget and display managers 2015-05-02 00:49:52 -07:00
Stephen Birarda
11f3161029 resolve conflicts on merge with upstream/master 2015-02-04 10:38:05 -08:00
Atlante45
27459ba861 Settings update 2015-02-03 12:27:30 -08:00
Atlante45
647a935eaa Remove app->getAvatar 2015-01-29 15:16:40 -08:00
Atlante45
cdb0c22207 interface/ui uses new settings 2015-01-19 22:49:27 -08:00
Atlante45
5930e06849 Moved Snapshot location out of Menu
Moved into Snapshot
2015-01-18 06:02:03 -08:00
Stephen Birarda
5be045d612 remove LocationManager and NamedLocation, replace with DataWebDialog 2014-09-22 16:55:44 -07:00
Stephen Birarda
eb0f7da517 cleanup to snapshot class to reduce passing of variables 2014-09-22 16:14:06 -07:00
Stephen Birarda
8dddbb9d4b make snapshots uploaded for locations temp files that will be cleared 2014-09-17 14:43:48 -07:00
Stojce Slavkovski
4d0ed5796e Merge branch 'master' of https://github.com/worklist/hifi into 19507
Conflicts:
	interface/interface_en.ts
2014-04-12 08:45:23 +02:00
Stephen Birarda
ae4b8348a2 fix header include guards via regex 2014-04-09 12:03:17 -07:00
Stephen Birarda
6a51df9e38 initial regex replacement of headers 2014-04-08 17:30:36 -07:00
stojce
e2eb34b6c9 Layout setup
image ratio fixed
image centre position
2014-03-23 07:03:20 +01:00
Stephen Birarda
0b4021ea43 switch to ini settings file by default for Interface, closes #2029 2014-02-19 13:17:53 -08:00
Stephen Birarda
ff7a49d8c2 resolve conflicts on merge with upstream master 2014-02-19 13:07:26 -08:00
stojce
7621d70c24 use base class - replaced MyAvatar with Avatar 2014-02-18 08:11:59 +01:00
stojce
6c2f3b687e removed unnecessary references 2014-02-18 01:50:55 +01:00
stojce
0df0c23c32 Windows build fix (3) 2014-02-17 21:14:28 +01:00