2d9afb5 | Moritz Kassner | 12 August 2015, 15:43:06 UTC | move code and add comment | 12 August 2015, 15:43:06 UTC |
996cbad | Moritz Kassner | 12 August 2015, 10:42:57 UTC | with the addition of a timer eye window updates no faster 60fps. | 12 August 2015, 10:42:57 UTC |
84fc4bc | Moritz Kassner | 11 August 2015, 08:46:58 UTC | adding custom bandwidth factor for Pupil Cameras. | 11 August 2015, 08:46:58 UTC |
f054e1f | Moritz Kassner | 10 August 2015, 13:10:32 UTC | adding new Pupil World and Eye camera IDs. | 10 August 2015, 13:10:32 UTC |
c18c182 | Moritz Kassner | 10 August 2015, 13:10:07 UTC | set default framerate to 60fps for eye camera. | 10 August 2015, 13:10:07 UTC |
fa9379a | Moritz Kassner | 10 August 2015, 10:09:05 UTC | fixed issue #180 by making the logic for slicing the same in fixation detector and offline marker detector. | 10 August 2015, 10:09:05 UTC |
ce820e0 | Will Patera | 26 July 2015, 01:51:36 UTC | Merge branch 'master' of https://github.com/pupil-labs/pupil | 26 July 2015, 01:51:36 UTC |
9875c0e | Will Patera | 26 July 2015, 01:50:53 UTC | cosmetics - fixing typos in comments of `fixation_detector.py` | 26 July 2015, 01:50:53 UTC |
3e37cd6 | mkassner | 24 July 2015, 15:29:39 UTC | Merge pull request #179 from cpicanco/patch-2 fix slice((start > 0), stop, step) heatmap bug | 24 July 2015, 15:29:39 UTC |
ce53621 | MichaelBarz | 24 July 2015, 13:54:24 UTC | Merge branch 'master' of http://github.com/pupil-labs/pupil | 24 July 2015, 13:54:24 UTC |
6c04d8f | MichaelBarz | 24 July 2015, 13:53:58 UTC | changed bundling process for 32-bit capture and player bundles | 24 July 2015, 13:53:58 UTC |
fe37f1a | Rafael Picanço | 24 July 2015, 08:40:20 UTC | fix slice((start > 0), stop, step) heatmap bug section = slice(start, stop, 1) when start > 0, frame_idx (L257) does not reflect the frame index producing buggy heatmaps; The gaze_on_srf_in_section method is already using frame_idx+=section.start, so I just copy and paste it. | 24 July 2015, 08:40:20 UTC |
e3b07e5 | Moritz Kassner | 23 July 2015, 14:22:21 UTC | fixed #174 | 23 July 2015, 14:22:21 UTC |
913e24e | mkassner | 23 July 2015, 07:59:15 UTC | Merge pull request #176 from cpicanco/patch-2 Update main.py | 23 July 2015, 07:59:15 UTC |
c895aa8 | Moritz Kassner | 23 July 2015, 07:41:57 UTC | removed double line | 23 July 2015, 07:41:57 UTC |
f6aeb2c | Moritz Kassner | 23 July 2015, 07:33:06 UTC | removed deepcopy as it was not needed and created a memoryleak during export. | 23 July 2015, 07:33:06 UTC |
63d5a2e | Rafael Picanço | 22 July 2015, 05:41:32 UTC | Update main.py Cosmetics | 22 July 2015, 05:41:32 UTC |
cafff14 | MichaelBarz | 21 July 2015, 13:14:53 UTC | fixed video backend for windows. Interface changed and thus errors occurred with the old windows backend. | 21 July 2015, 13:14:53 UTC |
8f33850 | Moritz Kassner | 21 July 2015, 07:23:39 UTC | code cleanup | 21 July 2015, 07:23:39 UTC |
10abd97 | Moritz Kassner | 21 July 2015, 07:18:22 UTC | bugfixes in automatic timestamp generation logic. | 21 July 2015, 07:18:22 UTC |
285aae4 | Moritz Kassner | 21 July 2015, 06:57:21 UTC | Merge branch 'master' of https://github.com/pupil-labs/pupil | 21 July 2015, 06:57:21 UTC |
d5fdb03 | Moritz Kassner | 21 July 2015, 06:57:17 UTC | updated quit_button. | 21 July 2015, 06:57:17 UTC |
13b9c89 | mkassner | 20 July 2015, 08:28:30 UTC | Merge pull request #169 from cpicanco/patch-1 typos (recording) | 20 July 2015, 08:28:30 UTC |
17d7ad1 | Rafael Picanço | 18 July 2015, 23:29:15 UTC | typos (recording) | 18 July 2015, 23:29:15 UTC |
2b83963 | mkassner | 18 July 2015, 15:22:58 UTC | Merge pull request #167 from cpicanco/patch-1 Update fixation_detector.py | 18 July 2015, 15:22:58 UTC |
4d37d8c | Moritz Kassner | 18 July 2015, 15:19:40 UTC | exporter should use no_wait for capture as well. | 18 July 2015, 15:19:40 UTC |
e9af7b0 | Moritz Kassner | 18 July 2015, 15:18:34 UTC | moved wait logic into file capture class and use it dug in capture session running from files. | 18 July 2015, 15:18:34 UTC |
c4b31a0 | Moritz Kassner | 18 July 2015, 13:01:35 UTC | correct gaze when plugin is loaded from settings. | 18 July 2015, 13:01:35 UTC |
8ae5ac9 | Rafael Picanço | 17 July 2015, 18:58:55 UTC | Update fixation_detector.py Adding missing 'Close' button | 17 July 2015, 18:58:55 UTC |
5e165ad | MichaelBarz | 15 July 2015, 14:43:41 UTC | fixed import of video module for windows | 15 July 2015, 14:43:41 UTC |
0a1a1bf | mkassner | 14 July 2015, 07:18:31 UTC | Merge pull request #163 from cpicanco/patch-2 fix #162 | 14 July 2015, 07:18:31 UTC |
d02526e | Rafael Picanço | 14 July 2015, 04:05:54 UTC | fix #162 | 14 July 2015, 04:05:54 UTC |
760d64a | Moritz Kassner | 10 July 2015, 12:45:02 UTC | fixed typo | 10 July 2015, 12:45:02 UTC |
85db75a | Moritz Kassner | 08 July 2015, 15:41:21 UTC | fixed typo. | 08 July 2015, 15:41:21 UTC |
24680da | Moritz Kassner | 08 July 2015, 11:38:37 UTC | do forking enable only when on mac and frozen. | 08 July 2015, 11:38:37 UTC |
ac5c83e | Moritz Kassner | 08 July 2015, 10:17:26 UTC | exporter is now like player/main in regard to video pattern matching | 08 July 2015, 10:17:26 UTC |
e879901 | Moritz Kassner | 08 July 2015, 09:50:29 UTC | clean up window and ui init sequence. | 08 July 2015, 09:50:29 UTC |
136275b | Moritz Kassner | 08 July 2015, 08:07:50 UTC | simplified hdpi handling for plugins and eye | 08 July 2015, 08:07:50 UTC |
fb40445 | Moritz Kassner | 06 July 2015, 15:20:21 UTC | updated comment. | 06 July 2015, 15:20:21 UTC |
8244482 | Moritz Kassner | 06 July 2015, 14:53:26 UTC | fixed old version regression | 06 July 2015, 14:53:26 UTC |
d9bae37 | Moritz Kassner | 06 July 2015, 14:42:47 UTC | changed mjpeg container to mp4 as mov seems to fail to properly seek with mjpeg payload. updated eye.py for jpeg writer | 06 July 2015, 14:42:47 UTC |
63f8830 | Moritz Kassner | 06 July 2015, 12:49:00 UTC | experimenting with audio | 06 July 2015, 12:49:00 UTC |
cfc7fe0 | Moritz Kassner | 05 July 2015, 12:18:39 UTC | removed test | 05 July 2015, 12:18:39 UTC |
37945e2 | Moritz Kassner | 05 July 2015, 12:18:22 UTC | using pyav for writing mjpegs. This resolves us form the need to use ffmpeg via Popen. Updated pyuvc to v0.2 | 05 July 2015, 12:18:22 UTC |
2a9b8db | Moritz Kassner | 03 July 2015, 13:39:15 UTC | don't block on sp call on jpeg_dumper. | 03 July 2015, 13:39:15 UTC |
2b111b5 | Moritz Kassner | 03 July 2015, 13:38:54 UTC | added back billiard mp module import for mac bundles. | 03 July 2015, 13:38:54 UTC |
47563e7 | Will Patera | 03 July 2015, 13:19:04 UTC | cosmetic changes to labels in eye_video_overlay plugin | 03 July 2015, 13:19:04 UTC |
08e9fac | Moritz Kassner | 03 July 2015, 12:10:19 UTC | make jpeg recording dependent on wether the capture produces jpeg frames. | 03 July 2015, 12:10:19 UTC |
76e23f7 | Moritz Kassner | 12 June 2015, 00:09:10 UTC | adding libav hidden imports to ubuntu capture bundle | 12 June 2015, 00:09:10 UTC |
7c2e7ba | Moritz Kassner | 03 July 2015, 10:50:03 UTC | allow use of avconv instead of ffmpeg. | 03 July 2015, 10:50:03 UTC |
3683bd1 | Moritz Kassner | 03 July 2015, 09:28:30 UTC | catch the right error for ffmpeg check. | 03 July 2015, 09:28:30 UTC |
e5386b6 | Moritz Kassner | 11 June 2015, 22:20:22 UTC | destroy old textures | 11 June 2015, 22:20:22 UTC |
c2caeae | Moritz Kassner | 03 July 2015, 08:23:58 UTC | first try on pyav based jpeg writer. | 03 July 2015, 08:23:58 UTC |
5b99b26 | Moritz Kassner | 03 July 2015, 08:23:33 UTC | revert bundle setting | 03 July 2015, 08:23:33 UTC |
d44c8df | Moritz Kassner | 02 July 2015, 16:11:21 UTC | cosmetic changes. | 02 July 2015, 16:11:21 UTC |
e37e4a5 | Moritz Kassner | 02 July 2015, 16:11:08 UTC | sp crashed on mac bundle remove for now. | 02 July 2015, 16:11:08 UTC |
e4babc1 | Moritz Kassner | 02 July 2015, 15:31:29 UTC | test | 02 July 2015, 15:31:29 UTC |
fac14ec | pupil | 02 July 2015, 15:22:01 UTC | adding updated glfw binarie paths | 02 July 2015, 15:22:01 UTC |
9eb5d8d | Moritz Kassner | 02 July 2015, 15:13:14 UTC | we still need forking for bundle support. Added back. | 02 July 2015, 15:13:14 UTC |
93fb5e2 | Moritz Kassner | 02 July 2015, 14:57:18 UTC | more testing | 02 July 2015, 14:57:18 UTC |
068e19a | Moritz Kassner | 02 July 2015, 14:53:17 UTC | check if init was successful. | 02 July 2015, 14:53:17 UTC |
220e44a | Moritz Kassner | 02 July 2015, 14:31:35 UTC | bug fixed with window creation and termination. | 02 July 2015, 14:31:35 UTC |
43d9415 | Moritz Kassner | 02 July 2015, 14:21:50 UTC | test | 02 July 2015, 14:21:50 UTC |
6e45ef3 | Moritz Kassner | 02 July 2015, 11:09:31 UTC | typo fix | 02 July 2015, 11:09:31 UTC |
38d70b9 | Moritz Kassner | 02 July 2015, 11:05:32 UTC | more font tweaks. | 02 July 2015, 11:05:32 UTC |
9f4d58f | Moritz Kassner | 02 July 2015, 10:57:43 UTC | tiny ui tweak | 02 July 2015, 10:57:43 UTC |
559413a | Moritz Kassner | 02 July 2015, 10:53:37 UTC | open an info window when app starts without valid rec dir | 02 July 2015, 10:53:37 UTC |
8049d5b | Moritz Kassner | 02 July 2015, 09:59:25 UTC | open a new recording simply by drag gin the dir onto the player window. | 02 July 2015, 09:59:25 UTC |
4b54ed4 | Moritz Kassner | 02 July 2015, 09:59:04 UTC | updated glow bindings to glfw3.1.x + slimmed down files. | 02 July 2015, 09:59:04 UTC |
1995aed | Moritz Kassner | 02 July 2015, 09:58:31 UTC | removed gl utils functions in favour of cygl.utils | 02 July 2015, 09:58:31 UTC |
c58ff0f | Moritz Kassner | 02 July 2015, 09:57:47 UTC | updated to pyglui 0.3 | 02 July 2015, 09:57:47 UTC |
fc1fa70 | Moritz Kassner | 02 July 2015, 09:57:10 UTC | cosmetics | 02 July 2015, 09:57:10 UTC |
77bd790 | Moritz Kassner | 02 July 2015, 08:41:33 UTC | is_valid_rec_dir improved. | 02 July 2015, 08:41:33 UTC |
efd84f5 | Moritz Kassner | 02 July 2015, 08:41:14 UTC | added back changed swallowed in bad merge. | 02 July 2015, 08:41:14 UTC |
27a836a | Moritz Kassner | 01 July 2015, 13:11:25 UTC | default sidebar with increase by 100px | 01 July 2015, 13:11:25 UTC |
b64e701 | Moritz Kassner | 01 July 2015, 13:11:00 UTC | make raw capture only available if ffmpeg is available. | 01 July 2015, 13:11:00 UTC |
ad7cbbb | Moritz Kassner | 01 July 2015, 13:02:36 UTC | Merge branch 'raw_jpeg_recorder' | 01 July 2015, 13:02:36 UTC |
577d309 | Moritz Kassner | 01 July 2015, 12:55:43 UTC | removed billiard because we don't use QT Kit anymore. | 01 July 2015, 12:55:43 UTC |
c213027 | Moritz Kassner | 01 July 2015, 12:55:21 UTC | refactored writer modules. added raw jpeg recording to eye videos | 01 July 2015, 12:55:21 UTC |
5e2318e | Moritz Kassner | 01 July 2015, 12:12:23 UTC | Merge branch 'v0.5_restruct' | 01 July 2015, 12:12:23 UTC |
93fe30e | Moritz Kassner | 01 July 2015, 09:39:08 UTC | make sure we copy all data. | 01 July 2015, 09:39:08 UTC |
9998bce | Moritz Kassner | 01 July 2015, 08:56:22 UTC | wait for ffmpeg to finish before deleting file. | 01 July 2015, 08:56:22 UTC |
f5af135 | Moritz Kassner | 01 July 2015, 07:08:33 UTC | minor stylistic improvements. | 01 July 2015, 07:08:33 UTC |
64380db | Moritz Kassner | 01 July 2015, 07:04:56 UTC | small experiments with pix format. | 01 July 2015, 07:04:56 UTC |
2c6facb | Moritz Kassner | 30 June 2015, 17:40:08 UTC | added raw jpeg dump and direct encoding using pyav | 30 June 2015, 17:40:08 UTC |
57a434d | Moritz Kassner | 30 June 2015, 15:24:44 UTC | fixed syntax error. | 30 June 2015, 15:24:44 UTC |
7d4aaa3 | Moritz Kassner | 30 June 2015, 07:54:46 UTC | added frame index field to fake capture frame. | 30 June 2015, 07:54:46 UTC |
5884fb6 | pupil surface | 29 June 2015, 15:36:51 UTC | various fixes | 29 June 2015, 15:36:51 UTC |
ea1449b | Moritz Kassner | 17 June 2015, 15:07:07 UTC | added raw buffer dump of world camera. | 17 June 2015, 15:07:07 UTC |
f76d69a | andrewqandrew | 17 June 2015, 15:02:08 UTC | added support for binocular eye video overlay. Added flip, mir,scale and movement of overlay.\ | 17 June 2015, 15:02:08 UTC |
895ed76 | Moritz Kassner | 16 June 2015, 12:39:13 UTC | updated ps-util fn call. | 16 June 2015, 12:39:13 UTC |
843de9f | Moritz Kassner | 16 June 2015, 12:38:55 UTC | removed editor files | 16 June 2015, 12:38:55 UTC |
0ae18d1 | MichaelBarz | 16 June 2015, 08:50:11 UTC | fixed deprecated function call to psutil | 16 June 2015, 08:50:11 UTC |
861ba5b | Moritz Kassner | 15 June 2015, 09:17:24 UTC | bug fix in vis watermark | 15 June 2015, 09:17:24 UTC |
f2dc768 | Moritz Kassner | 12 June 2015, 11:35:22 UTC | removed from list. | 12 June 2015, 11:35:22 UTC |
e0501cf | Moritz Kassner | 12 June 2015, 11:35:05 UTC | removed unused import. | 12 June 2015, 11:35:05 UTC |
be73873 | Moritz Kassner | 12 June 2015, 11:30:00 UTC | simplified HDPI mode handling. | 12 June 2015, 11:30:00 UTC |
1b6e375 | Moritz Kassner | 12 June 2015, 11:27:23 UTC | Merge branch 'v0.5_restruct' of https://github.com/pupil-labs/pupil into v0.5_restruct Conflicts: pupil_src/shared_modules/video_capture/__init__.py | 12 June 2015, 11:27:23 UTC |
0ed5a90 | Moritz Kassner | 12 June 2015, 11:26:31 UTC | typo fix | 12 June 2015, 11:26:31 UTC |
78470d3 | Michael Barz | 12 June 2015, 10:58:49 UTC | fixed import type | 12 June 2015, 10:58:49 UTC |