664bae5 | Moritz Kassner | 03 September 2013, 21:26:20 UTC | Merge branch 'dev' | 03 September 2013, 21:26:20 UTC |
2855e21 | Moritz Kassner | 03 September 2013, 21:20:15 UTC | adding good default exposure for cameras fix on linux | 03 September 2013, 21:20:15 UTC |
5b719c5 | Moritz Kassner | 03 September 2013, 20:59:39 UTC | Merge branch 'dev' | 03 September 2013, 20:59:39 UTC |
e507583 | Moritz Kassner | 03 September 2013, 20:58:04 UTC | added manual exposure setting world eye camera on mac | 03 September 2013, 20:58:04 UTC |
3329390 | Moritz Kassner | 03 September 2013, 20:46:39 UTC | adding good default exposure for cameras | 03 September 2013, 20:46:39 UTC |
0fc8263 | Moritz Kassner | 03 September 2013, 19:25:59 UTC | Merge branch 'dev' | 03 September 2013, 19:25:59 UTC |
46e5577 | Moritz Kassner | 03 September 2013, 19:24:34 UTC | adding double clickable shell script to switch branches and update | 03 September 2013, 19:24:34 UTC |
8ee9342 | Moritz Kassner | 03 September 2013, 18:23:33 UTC | Merge branch 'dev' of https://github.com/pupil-labs/pupil into dev | 03 September 2013, 18:23:33 UTC |
abcbd92 | Moritz Kassner | 03 September 2013, 18:23:28 UTC | disable autofocus at start up on mac. | 03 September 2013, 18:23:28 UTC |
0fbae82 | Moritz Kassner | 03 September 2013, 18:21:07 UTC | small typo fix | 03 September 2013, 18:23:01 UTC |
05460ef | Moritz Kassner | 03 September 2013, 18:19:13 UTC | Merge branch 'dev' of https://github.com/pupil-labs/pupil into dev | 03 September 2013, 18:19:13 UTC |
fea2b14 | Moritz Kassner | 03 September 2013, 18:18:53 UTC | disable auto-focus by default on linux | 03 September 2013, 18:18:53 UTC |
6446661 | Moritz Kassner | 03 September 2013, 18:02:15 UTC | adding option to pass path to recording folder to simple player scripts. | 03 September 2013, 18:02:15 UTC |
75e899f | Moritz Kassner | 29 August 2013, 07:16:48 UTC | small cleanup. | 29 August 2013, 07:16:48 UTC |
6b10bf7 | Moritz Kassner | 22 August 2013, 11:01:31 UTC | tweaked parameters to be more restrictive with screen based calibration. | 22 August 2013, 11:01:31 UTC |
ea811c6 | Moritz Kassner | 22 August 2013, 10:48:17 UTC | modified v4l2 timestamp to use monotonic clock because buffer.timestamp is very buggy. \n Improved exit behaviour such that recorgins are complete even if the program stops before the recording is stopped. \n Renamed displaynames for calibration options | 22 August 2013, 10:48:17 UTC |
2331dcb | Moritz Kassner | 22 August 2013, 09:46:40 UTC | Merge branch 'dev' of https://github.com/pupil-labs/pupil into dev Conflicts: pupil_src/capture/recorder.py | 22 August 2013, 09:46:40 UTC |
d50eec5 | Moritz Kassner | 22 August 2013, 09:43:21 UTC | hotfix. | 22 August 2013, 09:43:21 UTC |
97dc716 | Moritz Kassner | 21 August 2013, 06:22:17 UTC | more meta info | 21 August 2013, 06:22:17 UTC |
ef466c6 | Moritz Kassner | 21 August 2013, 06:01:20 UTC | added more meta info to recordings | 21 August 2013, 06:01:20 UTC |
05370ab | Moritz Kassner | 20 August 2013, 20:04:06 UTC | update for gitignore, removing a local one. added more metainfo to recorder bug fix for calibration display. | 20 August 2013, 20:04:06 UTC |
9dde21f | Moritz Kassner | 20 August 2013, 20:01:23 UTC | Merge branch 'dev' of https://code.google.com/p/pupil into dev | 20 August 2013, 20:01:23 UTC |
c7f0af0 | Moritz Kassner | 18 August 2013, 18:02:33 UTC | fixed gitignore | 18 August 2013, 18:02:33 UTC |
1424405 | Moritz Kassner | 18 August 2013, 18:01:08 UTC | made ivcc on mac use auto compiler. | 18 August 2013, 18:01:08 UTC |
55b8d6a | Moritz Kassner | 18 August 2013, 17:46:23 UTC | typo fix2 | 18 August 2013, 17:46:23 UTC |
c8d0282 | Moritz Kassner | 18 August 2013, 17:41:44 UTC | typo fix | 18 August 2013, 17:41:44 UTC |
c8cec57 | Moritz Kassner | 18 August 2013, 17:38:35 UTC | fixed simple players to comply with the new dataformat | 18 August 2013, 17:38:35 UTC |
98696c4 | Moritz Kassner | 18 August 2013, 17:19:07 UTC | Merge branch 'dev' of https://code.google.com/p/pupil into dev | 18 August 2013, 17:19:07 UTC |
d6d8905 | Moritz Kassner | 18 August 2013, 17:18:55 UTC | cleanup of capture classes | 18 August 2013, 17:18:55 UTC |
2dc6d55 | Moritz Kassner | 17 August 2013, 09:26:04 UTC | Merge branch 'master' of https://github.com/Pupil-Labs/Pupil | 17 August 2013, 09:26:04 UTC |
daf2751 | Moritz Kassner | 17 August 2013, 09:25:28 UTC | renamed from License to license | 17 August 2013, 09:25:28 UTC |
32b0daf | Moritz Kassner | 17 August 2013, 09:17:28 UTC | removed false add. | 17 August 2013, 09:17:28 UTC |
23501df | Moritz Kassner | 17 August 2013, 09:13:13 UTC | Merge branch 'master' of https://pupil.googlecode.com/git into dev Conflicts: Capture/main.py README.md pupil_src/browser/Run_2DBrowser.py pupil_src/browser/audio.py pupil_src/browser/browser_2d.py pupil_src/browser/gl_shapes.py pupil_src/browser/methods.py pupil_src/browser/radial_undistort.py pupil_src/browser/video_homography.py pupil_src/browser/video_registration.py | 17 August 2013, 09:13:13 UTC |
005cfcc | Moritz Kassner | 17 August 2013, 09:02:07 UTC | fixing the merge mess | 17 August 2013, 09:02:07 UTC |
bd10268 | Moritz Kassner | 17 August 2013, 09:00:39 UTC | updated .gitignore | 17 August 2013, 09:00:39 UTC |
e4c8de5 | Moritz Kassner | 17 August 2013, 08:54:44 UTC | Merge branch 'dev' of https://code.google.com/p/pupil into dev | 17 August 2013, 08:54:44 UTC |
240a140 | Moritz Kassner | 17 August 2013, 08:54:05 UTC | Merge commit '71c15ea' into dev Conflicts: pupil_src/shared_modules/uvc_capture/linux_video/v4l2_capture/capture.so | 17 August 2013, 08:54:05 UTC |
71c15ea | Moritz Kassner | 17 August 2013, 08:50:57 UTC | adding framerate enumeration and selectio, small fixes,stared to do a little bit of error handling | 17 August 2013, 08:50:57 UTC |
4190a67 | Will Patera | 17 August 2013, 05:44:54 UTC | test remote google_code | 17 August 2013, 05:44:54 UTC |
789fdef | Will Patera | 17 August 2013, 05:42:20 UTC | Merge branch 'dev' of https://pupil.googlecode.com/git into dev Conflicts: README.md | 17 August 2013, 05:42:20 UTC |
34bfa72 | Will Patera | 17 August 2013, 05:37:32 UTC | test push changes to remote (github -> google code) | 17 August 2013, 05:37:32 UTC |
bd55d98 | Will Patera | 17 August 2013, 05:10:22 UTC | added readme file to master branch | 17 August 2013, 05:10:22 UTC |
71426c7 | Will Patera | 17 August 2013, 05:09:18 UTC | updated readme to match other branches/repos | 17 August 2013, 05:09:18 UTC |
8eabccf | Will Patera | 17 August 2013, 05:08:01 UTC | cosmetic changes to read me links | 17 August 2013, 05:08:01 UTC |
7343532 | Will Patera | 17 August 2013, 05:06:39 UTC | cosmetic changes to links | 17 August 2013, 05:06:39 UTC |
2173b5f | Will Patera | 17 August 2013, 05:04:02 UTC | Added README.md file -- same as dev branch | 17 August 2013, 05:04:02 UTC |
b897553 | Will Patera | 17 August 2013, 05:03:14 UTC | cosmetic changes to links | 17 August 2013, 05:03:14 UTC |
0208b7f | Will Patera | 17 August 2013, 04:59:05 UTC | Updated Readme | 17 August 2013, 04:59:05 UTC |
a50770a | Moritz Kassner | 15 August 2013, 14:07:31 UTC | small fix | 15 August 2013, 14:07:31 UTC |
87d6674 | Moritz Kassner | 15 August 2013, 08:14:43 UTC | small fix | 15 August 2013, 08:14:43 UTC |
c2fa564 | Moritz Kassner | 15 August 2013, 08:14:14 UTC | small fix | 15 August 2013, 08:14:14 UTC |
006f6c4 | Moritz Kassner | 14 August 2013, 09:31:09 UTC | removed shared_frame_count variable | 14 August 2013, 09:31:09 UTC |
56d9e70 | Moritz Kassner | 14 August 2013, 09:21:22 UTC | Merge branch 'dev' of https://code.google.com/p/pupil into dev | 14 August 2013, 09:21:22 UTC |
b1ec97b | Moritz Kassner | 14 August 2013, 09:13:35 UTC | added recorder features, restructured how data is saved. Now we do not keep track of the current world cam frame, instead world and gaze postions are saved with timestamps that are genereated by the Camera_Capture module and try to be as close as possible to the origin of the data, this breaks the players as it changes the data format | 14 August 2013, 09:18:53 UTC |
322463e | Moritz Kassner | 14 August 2013, 09:13:35 UTC | adding recorder feature | 14 August 2013, 09:13:35 UTC |
c2f715a | Moritz Kassner | 13 August 2013, 12:24:32 UTC | fixing on linux side | 13 August 2013, 12:24:32 UTC |
9b70de2 | Moritz Kassner | 13 August 2013, 11:38:57 UTC | fixes on mac side | 13 August 2013, 11:38:57 UTC |
ebd079b | Moritz Kassner | 13 August 2013, 10:57:10 UTC | Merge branch 'dev' of https://code.google.com/p/pupil into dev | 13 August 2013, 10:57:10 UTC |
d137c0b | Moritz Kassner | 13 August 2013, 10:56:55 UTC | adding new files to uvc capture | 13 August 2013, 10:56:55 UTC |
0f621bf | Moritz Kassner | 13 August 2013, 10:53:48 UTC | major rework in uvc_capture | 13 August 2013, 10:53:48 UTC |
bda3b02 | Moritz Kassner | 12 August 2013, 13:41:28 UTC | cosmetic work | 12 August 2013, 13:41:28 UTC |
b1e7f26 | Moritz Kassner | 09 August 2013, 08:34:37 UTC | small tweak | 09 August 2013, 08:34:37 UTC |
f352400 | Moritz Kassner | 09 August 2013, 08:30:52 UTC | added no-copy version of v4l2 VideoCapture.read() | 09 August 2013, 08:30:52 UTC |
342f608 | Moritz Kassner | 08 August 2013, 08:01:26 UTC | Merge branch 'dev' of https://pupil.googlecode.com/git into dev | 08 August 2013, 08:01:26 UTC |
ba6b416 | Moritz Kassner | 08 August 2013, 08:00:20 UTC | adding in progress version of custom video capture module vor linux | 08 August 2013, 08:00:20 UTC |
046c12f | Moritz Kassner | 02 August 2013, 13:42:15 UTC | cleanup and cosmetics | 02 August 2013, 13:43:40 UTC |
b68f853 | Moritz Kassner | 02 August 2013, 13:39:30 UTC | profiling is now invoked by passing an arbitrary argument when calling capture/main.py | 02 August 2013, 13:39:30 UTC |
12e5d26 | Moritz Kassner | 02 August 2013, 13:32:20 UTC | updated the license tool to exclude the newly added third party scripts. | 02 August 2013, 13:32:20 UTC |
11cda5b | Moritz Kassner | 02 August 2013, 13:26:47 UTC | added files types that are created by the profiler (png) and user input (.npy) | 02 August 2013, 13:26:47 UTC |
1a76c57 | Moritz Kassner | 02 August 2013, 13:24:57 UTC | adding profiling option for word and eye process. To be invoked by setting profiled = True in capture/main.py | 02 August 2013, 13:24:57 UTC |
49702d3 | Moritz Kassner | 02 August 2013, 13:23:47 UTC | Merge branch 'dev' of https://pupil.googlecode.com/git into dev | 02 August 2013, 13:23:47 UTC |
3be4fdb | Moritz Kassner | 02 August 2013, 13:23:40 UTC | small fix for cv2.3.x bindings | 02 August 2013, 13:23:40 UTC |
d5cb9ec | Will Patera | 02 August 2013, 10:03:01 UTC | incremental progress -- still lots to be done here. | 02 August 2013, 10:03:01 UTC |
8c36951 | Will Patera | 01 August 2013, 13:01:33 UTC | Merge branch 'dev' of https://pupil.googlecode.com/git into dev | 01 August 2013, 13:01:33 UTC |
cb2b30a | Will Patera | 01 August 2013, 13:01:23 UTC | some cleanup minor changes | 01 August 2013, 13:01:23 UTC |
a72cc25 | Moritz Kassner | 31 July 2013, 16:21:55 UTC | Merge branch 'dev' of https://pupil.googlecode.com/git into dev | 31 July 2013, 16:21:55 UTC |
555d8d7 | Moritz Kassner | 31 July 2013, 16:21:47 UTC | cosmetic work. | 31 July 2013, 16:21:47 UTC |
fabdfeb | Will Patera | 31 July 2013, 08:32:42 UTC | Merge branch 'dev' of https://pupil.googlecode.com/git into dev | 31 July 2013, 08:32:42 UTC |
5f64e93 | Will Patera | 31 July 2013, 08:31:37 UTC | Browser main.py file – starting rewrite now. | 31 July 2013, 08:31:37 UTC |
92306e0 | Moritz Kassner | 31 July 2013, 08:30:08 UTC | guy tweak for marker calibration | 31 July 2013, 08:30:08 UTC |
782cbbf | Moritz Kassner | 31 July 2013, 08:29:49 UTC | added defines for deleting bar items. | 31 July 2013, 08:29:49 UTC |
68dd723 | Moritz Kassner | 31 July 2013, 07:54:25 UTC | cosmetic work. | 31 July 2013, 07:54:25 UTC |
30993bf | Moritz Kassner | 31 July 2013, 07:22:22 UTC | adding new improved manual marker calibration | 31 July 2013, 07:22:22 UTC |
9e690c1 | Moritz Kassner | 30 July 2013, 19:35:45 UTC | adding shell script to start capture routine | 30 July 2013, 19:35:45 UTC |
7624dbf | Moritz Kassner | 30 July 2013, 19:05:20 UTC | added a python script to add git versions. | 30 July 2013, 19:05:20 UTC |
0c3c24a | Moritz Kassner | 30 July 2013, 19:05:00 UTC | updated path to reflect new folder structure. | 30 July 2013, 19:05:00 UTC |
a4020fa | Moritz Kassner | 30 July 2013, 19:04:39 UTC | more fixes on screen marker calibration | 30 July 2013, 19:04:39 UTC |
b0fb491 | Moritz Kassner | 30 July 2013, 17:53:38 UTC | more fixing | 30 July 2013, 17:53:38 UTC |
aea303a | Moritz Kassner | 30 July 2013, 13:29:09 UTC | hacky fixes for screen based calibration. | 30 July 2013, 13:29:09 UTC |
d97d20a | Will Patera | 30 July 2013, 07:13:56 UTC | aesthetic change – changing size of calibration results atb bar | 30 July 2013, 07:13:56 UTC |
10c5042 | Will Patera | 29 July 2013, 15:14:25 UTC | Refactored world, added show_calibration plugin module and more intuitive user interface | 29 July 2013, 15:14:25 UTC |
e08ed54 | Moritz Kassner | 29 July 2013, 14:21:02 UTC | small fix on recorder | 29 July 2013, 14:21:02 UTC |
d9ca9a9 | Will Patera | 29 July 2013, 14:10:14 UTC | abstracted recording process into module -- requires debugging | 29 July 2013, 14:10:14 UTC |
5bdd8d1 | Will Patera | 29 July 2013, 13:17:48 UTC | Merge branch 'dev' of https://pupil.googlecode.com/git into dev | 29 July 2013, 13:17:48 UTC |
45a00de | Will Patera | 29 July 2013, 13:17:04 UTC | cleaning and rearrangement | 29 July 2013, 13:17:04 UTC |
fcf1e89 | Moritz Kassner | 29 July 2013, 13:16:32 UTC | small bug fix | 29 July 2013, 13:16:32 UTC |
048a4e9 | Moritz Kassner | 29 July 2013, 12:56:41 UTC | more fixing | 29 July 2013, 12:56:41 UTC |
253db0b | Moritz Kassner | 29 July 2013, 12:51:20 UTC | Merge branch 'dev' of https://pupil.googlecode.com/git into dev | 29 July 2013, 12:51:20 UTC |
ca039af | Moritz Kassner | 29 July 2013, 12:51:16 UTC | more fixes | 29 July 2013, 12:51:16 UTC |
a996c61 | Will Patera | 29 July 2013, 12:47:52 UTC | renamed detector file and did some cleanup | 29 July 2013, 12:47:52 UTC |