421b517 | Moritz Kassner | 01 March 2015, 19:12:17 UTC | merge | 01 March 2015, 19:12:17 UTC |
51e7170 | Moritz Kassner | 02 March 2015, 13:38:33 UTC | fix in deployment version script | 02 March 2015, 13:38:33 UTC |
6bf173f | Moritz Kassner | 02 March 2015, 13:12:24 UTC | use cygl instead of pyopengl | 02 March 2015, 13:12:24 UTC |
b35ee88 | Moritz Kassner | 02 March 2015, 12:50:16 UTC | allow export section to be set via text input. | 02 March 2015, 12:50:16 UTC |
6ffbbee | Moritz Kassner | 02 March 2015, 09:51:14 UTC | updated MacOS bundle workflow. Added new icons. | 02 March 2015, 09:51:14 UTC |
373d3fc | Moritz Kassner | 01 March 2015, 19:03:55 UTC | tweakd desktop entries | 01 March 2015, 19:03:55 UTC |
33f9e13 | Moritz Kassner | 01 March 2015, 18:24:30 UTC | unify bundle user and rec dir for player and capture across os's | 01 March 2015, 18:24:30 UTC |
37e4789 | Moritz Kassner | 01 March 2015, 18:10:21 UTC | added dog bundle workflow for mac os. | 01 March 2015, 18:10:21 UTC |
cd81150 | Moritz Kassner | 01 March 2015, 17:31:46 UTC | remove hotkey for close and use button instead. | 01 March 2015, 17:31:46 UTC |
e3b80e5 | Moritz Kassner | 01 March 2015, 15:02:41 UTC | Merge branch 'master' of https://github.com/pupil-labs/pupil | 01 March 2015, 15:02:41 UTC |
db8dff8 | Moritz Kassner | 01 March 2015, 15:00:12 UTC | added hotkey to close player on `ESC` | 01 March 2015, 15:00:12 UTC |
66dbe46 | Moritz Kassner | 01 March 2015, 14:54:55 UTC | tweaked Deskcto entries | 01 March 2015, 14:54:55 UTC |
3a96f17 | Moritz Kassner | 01 March 2015, 14:33:58 UTC | do not lauch via terminal. This does not work with some distributions. | 01 March 2015, 14:33:58 UTC |
7258d77 | Moritz Kassner | 01 March 2015, 14:27:30 UTC | removed deprecated exce code arg | 01 March 2015, 14:27:30 UTC |
28f3905 | Moritz Kassner | 01 March 2015, 14:16:19 UTC | fixed file permissions for bundles | 01 March 2015, 14:16:19 UTC |
4a368b0 | Moritz Kassner | 01 March 2015, 13:20:56 UTC | updatet linux bundle instructions and added .deb bundle for player | 01 March 2015, 13:20:56 UTC |
5c5732f | Moritz Kassner | 01 March 2015, 10:32:04 UTC | used a fixed version of the old `clean()` implementation. Its faster and IMHO a bit cleaner. added a nicer str representation of class. | 01 March 2015, 10:32:04 UTC |
ae9faec | mkassner | 01 March 2015, 10:10:00 UTC | Merge pull request #92 from toshikurauchi/master Refactoring Plugin_List and fixing some typos | 01 March 2015, 10:10:00 UTC |
71aff4a | Moritz Kassner | 01 March 2015, 09:56:04 UTC | copy paste fix | 01 March 2015, 09:56:04 UTC |
d4621ec | Moritz Kassner | 01 March 2015, 09:55:18 UTC | a bit of cleanup of the code from last merge | 01 March 2015, 09:55:18 UTC |
0781c16 | mkassner | 01 March 2015, 09:49:36 UTC | Merge pull request #90 from cpicanco/upstream_master Increased vertical scroll in player (linux) and added SBT2 files to gitignore | 01 March 2015, 09:49:36 UTC |
2279834 | Toshi Kurauchi | 28 February 2015, 23:00:26 UTC | Refactoring Plugin_List: removing inheritance from list (storing list in an attribute) and fixing method clean (not removing elements inside for loop) | 28 February 2015, 23:00:26 UTC |
e90680d | cpicanco | 28 February 2015, 20:16:12 UTC | increase ui vertical bar increment for player | 28 February 2015, 20:16:12 UTC |
e9719bc | cpicanco | 28 February 2015, 20:08:03 UTC | sublime text 2 files on .gitignore | 28 February 2015, 20:08:03 UTC |
4e7b7e6 | Moritz Kassner | 28 February 2015, 15:36:26 UTC | Merge branch 'master' of https://github.com/pupil-labs/pupil | 28 February 2015, 15:36:26 UTC |
03571c5 | Moritz Kassner | 28 February 2015, 15:35:56 UTC | updated linux bundle process to use debian .deb installers for capture | 28 February 2015, 15:35:56 UTC |
52f2300 | Michael Barz | 27 February 2015, 18:47:50 UTC | Fixations get visualized | 27 February 2015, 18:47:50 UTC |
addbda8 | Michael Barz | 27 February 2015, 17:59:58 UTC | Added initial version of a fixation detector (does not display results) | 27 February 2015, 17:59:58 UTC |
47f084f | Moritz Kassner | 27 February 2015, 07:43:30 UTC | collect out of window menus when ui scale is changed. | 27 February 2015, 07:43:30 UTC |
ed3da37 | Moritz Kassner | 26 February 2015, 16:59:43 UTC | adding new camera to know aproved devices for hw timestamping | 26 February 2015, 16:59:43 UTC |
f70cca9 | Moritz Kassner | 25 February 2015, 15:28:44 UTC | fixed broken merge | 25 February 2015, 15:28:44 UTC |
a67f3de | Moritz Kassner | 25 February 2015, 15:22:16 UTC | fixed broken merge && version bump | 25 February 2015, 15:22:16 UTC |
fb3810b | Moritz Kassner | 25 February 2015, 14:00:04 UTC | Merged `v0.4_restruct` into `master` | 25 February 2015, 14:00:04 UTC |
d75e02a | Will Patera | 25 February 2015, 12:53:48 UTC | bug fix - cygl pylon requires arguments (pts,thickness,RGBA,GL_LINE_TYPE) TODO - clear the polyline from the world screen after calibration is complete or add toggle to show/hide convex hull - remove audio other than count | 25 February 2015, 12:53:48 UTC |
02c04ae | Moritz Kassner | 25 February 2015, 10:27:52 UTC | center pattern in window. | 25 February 2015, 10:27:52 UTC |
e640135 | Moritz Kassner | 25 February 2015, 09:59:02 UTC | added pattern render window and exit fn. | 25 February 2015, 09:59:02 UTC |
2641361 | Moritz Kassner | 25 February 2015, 09:58:42 UTC | feedback text scales with window | 25 February 2015, 09:58:42 UTC |
fd95a73 | Moritz Kassner | 25 February 2015, 09:07:29 UTC | added submenu to general settings. | 25 February 2015, 09:07:29 UTC |
da22382 | Moritz Kassner | 25 February 2015, 09:07:10 UTC | typo fix | 25 February 2015, 09:07:10 UTC |
4164faf | Moritz Kassner | 25 February 2015, 08:30:46 UTC | Made window size of Capture and player persistent and added a reset window size button. Renamed main window in eye and world to be in player `main_window` because from the fn point of view that more concise as eye and world don't really know each other. | 25 February 2015, 08:30:46 UTC |
74e1297 | Moritz Kassner | 23 February 2015, 11:19:34 UTC | fixed typo in font location for player bundle | 23 February 2015, 11:19:34 UTC |
62ed36b | Moritz Kassner | 24 February 2015, 13:28:08 UTC | exclude libSystem for mac bundles. | 24 February 2015, 13:28:08 UTC |
93eb057 | Moritz Kassner | 23 February 2015, 10:58:12 UTC | updated py av bundle.spec for linux | 23 February 2015, 10:58:12 UTC |
979e352 | Moritz Kassner | 24 February 2015, 09:37:12 UTC | updated bundle | 24 February 2015, 09:37:12 UTC |
517eb9e | Moritz Kassner | 24 February 2015, 08:38:26 UTC | bumpy array comparison with None should be using `is` instead of `==` as the latter will soon be overloaded with element wise comparisons by bumpy. | 24 February 2015, 08:38:26 UTC |
ecc3b59 | Will Patera | 24 February 2015, 08:07:44 UTC | cosmetics - capitalization of menu items | 24 February 2015, 08:07:44 UTC |
6c31d90 | Moritz Kassner | 23 February 2015, 13:41:26 UTC | fixed os version for module path. This should be done smarter... | 23 February 2015, 13:41:26 UTC |
144589d | Moritz Kassner | 23 February 2015, 13:38:46 UTC | one more bundle fix. | 23 February 2015, 13:38:46 UTC |
3836fe2 | Moritz Kassner | 23 February 2015, 13:36:05 UTC | fixed path for av binary target. | 23 February 2015, 13:36:05 UTC |
b8bf56a | Moritz Kassner | 23 February 2015, 13:31:43 UTC | Revert "removed broken command line start app for Mac bundle" This reverts commit 664c919719787e50ba8ee0ebdd552120482a0a64. | 23 February 2015, 13:31:43 UTC |
764cbb7 | Moritz Kassner | 23 February 2015, 13:31:20 UTC | re-added missing lib. removed old starter app from bunlde | 23 February 2015, 13:31:20 UTC |
664c919 | Moritz Kassner | 23 February 2015, 13:24:45 UTC | removed broken command line start app for Mac bundle | 23 February 2015, 13:24:45 UTC |
6a966da | Moritz Kassner | 23 February 2015, 13:21:59 UTC | needed to pass one more exception. | 23 February 2015, 13:21:59 UTC |
4b0f755 | Moritz Kassner | 23 February 2015, 13:21:38 UTC | updated PyAv path for MacOs | 23 February 2015, 13:21:38 UTC |
69b5d3d | Moritz Kassner | 23 February 2015, 13:13:24 UTC | updated bundle.spec for v0.4 dependencies. | 23 February 2015, 13:13:24 UTC |
ca0aaf8 | Moritz Kassner | 23 February 2015, 11:40:51 UTC | more smartness catching init failures on plugins. | 23 February 2015, 11:40:51 UTC |
cae36ff | Moritz Kassner | 23 February 2015, 10:00:49 UTC | experimenting with update textures. | 23 February 2015, 10:00:49 UTC |
a90eb5f | Moritz Kassner | 23 February 2015, 10:00:20 UTC | added option to slow down playback for debugging/developement | 23 February 2015, 10:00:20 UTC |
3021838 | Moritz Kassner | 23 February 2015, 09:59:59 UTC | improved logger text. | 23 February 2015, 09:59:59 UTC |
30cd5cf | Moritz Kassner | 23 February 2015, 09:25:01 UTC | fixed bug that sampled data when calibration was started via click on ui. | 23 February 2015, 09:25:01 UTC |
73fdb18 | Moritz Kassner | 23 February 2015, 09:19:06 UTC | moved eye graphs down to avoid overflow. | 23 February 2015, 09:19:06 UTC |
6720c80 | Moritz Kassner | 23 February 2015, 09:18:30 UTC | fixed overflowing cpu graph issue by moving the graphs down 20px. | 23 February 2015, 09:18:30 UTC |
08eaeee | Moritz Kassner | 23 February 2015, 09:13:26 UTC | Merge branch 'v0.4_restruct' of https://github.com/pupil-labs/pupil into v0.4_restruct | 23 February 2015, 09:13:26 UTC |
9c0d877 | Moritz Kassner | 23 February 2015, 09:13:18 UTC | typo fix | 23 February 2015, 09:13:18 UTC |
1574ffa | Will Patera | 23 February 2015, 03:30:40 UTC | Fixing text display - will close issue #70 -- here we revert back to flipping the y axis for the points in the denormalize step. | 23 February 2015, 03:30:40 UTC |
3abf423 | Will Patera | 23 February 2015, 03:24:34 UTC | minor change to the quick fix for text rendering | 23 February 2015, 03:24:34 UTC |
5d56887 | Will Patera | 23 February 2015, 03:21:51 UTC | quick fix -- flipping the axes for proper text rendering. Works, but could be improved. | 23 February 2015, 03:21:51 UTC |
ec1987c | Moritz Kassner | 22 February 2015, 17:38:22 UTC | undo debugging hack, tweaked slider val | 22 February 2015, 17:38:22 UTC |
261929f | Moritz Kassner | 22 February 2015, 17:34:39 UTC | code simplification, cleanup | 22 February 2015, 17:34:39 UTC |
ec87aa7 | Moritz Kassner | 22 February 2015, 17:10:10 UTC | cygl only needs to be initialised once per process not once per fn import. | 22 February 2015, 17:10:38 UTC |
b8526cf | Moritz Kassner | 22 February 2015, 17:06:13 UTC | fixes for hdpi mode. | 22 February 2015, 17:06:13 UTC |
6eccca8 | Moritz Kassner | 22 February 2015, 17:05:46 UTC | bugfix. | 22 February 2015, 17:05:46 UTC |
0b79d47 | Will Patera | 22 February 2015, 14:33:55 UTC | minor change - default size of the marker should be larger. Also implementing a scaling factor for high dpi screens - @mkassner please test this out/revise the scaling if necessary. | 22 February 2015, 14:33:55 UTC |
91ed5c6 | Will Patera | 22 February 2015, 13:18:27 UTC | bug fix - if camera intrinsics are `None` then don't allow the user to toggle 3D localization | 22 February 2015, 13:18:27 UTC |
a4aa78a | Will Patera | 22 February 2015, 13:12:01 UTC | bug fix -- typo - the capitalization for `Show Markers and Frames` vs `Show markers and frames` created a duplicate entry in the drop down menu. | 22 February 2015, 13:12:01 UTC |
4e1ff4b | Moritz Kassner | 22 February 2015, 12:26:24 UTC | renaming `bilateral` to `binocular`. 1) The word is specific to vision. 2) I find it more precise. 3) Unlike bilateral it as a meaningful counterpart: `monocular`. | 22 February 2015, 12:26:24 UTC |
ed1cb05 | Moritz Kassner | 21 February 2015, 16:39:42 UTC | Merge branch 'v0.4_restruct' of https://github.com/pupil-labs/pupil into v0.4_restruct | 21 February 2015, 16:39:42 UTC |
039bae5 | Moritz Kassner | 21 February 2015, 16:39:31 UTC | getting rid of unnesseray calls to frame.img in canny detector. | 21 February 2015, 16:39:31 UTC |
da70728 | Michael Barz | 21 February 2015, 16:05:22 UTC | adapted automatic stream selection for windows video | 21 February 2015, 16:05:22 UTC |
20435d9 | Michael Barz | 21 February 2015, 16:02:50 UTC | Merge branch 'v0.4_restruct' of https://github.com/pupil-labs/pupil.git into v0.4_restruct | 21 February 2015, 16:02:50 UTC |
6a1b08d | Michael Barz | 21 February 2015, 16:02:36 UTC | Added implementation for greyscale image for win video backend Added handling of timeout (try 5 times) | 21 February 2015, 16:02:36 UTC |
3b491fd | Moritz Kassner | 21 February 2015, 15:50:23 UTC | set capture to camera src again | 21 February 2015, 15:50:23 UTC |
b60e219 | Moritz Kassner | 21 February 2015, 15:48:11 UTC | Merge branch 'v0.4_restruct' of https://github.com/pupil-labs/pupil into v0.4_restruct Conflicts: pupil_src/capture/main.py | 21 February 2015, 15:48:11 UTC |
91bde1e | Moritz Kassner | 21 February 2015, 15:47:30 UTC | more work for bilateral setup | 21 February 2015, 15:47:30 UTC |
27fad89 | Moritz Kassner | 21 February 2015, 15:47:06 UTC | added GUI fn for file capture added option to selector preferred index for matches in auto_create_capture | 21 February 2015, 15:47:06 UTC |
9376bfa | Moritz Kassner | 21 February 2015, 15:46:03 UTC | bugfix: show marker with id was indented to much | 21 February 2015, 15:46:03 UTC |
d836367 | Will Patera | 21 February 2015, 03:06:46 UTC | bug fix - this should be `p_eye0.join()` and not `p_eye1.join()` if monocular, right? | 21 February 2015, 03:06:46 UTC |
f30e2af | Moritz Kassner | 20 February 2015, 17:54:23 UTC | todo: remove pipe with something that can talk to two processes. (Queue,two pipes, value... ) | 20 February 2015, 17:54:23 UTC |
98cbc8f | Moritz Kassner | 20 February 2015, 17:38:02 UTC | added option to start capture in bilateral mode. If 'bilateral' is given as sysarg two eye processes are launched. | 20 February 2015, 17:38:02 UTC |
856a6cd | Michael Barz | 20 February 2015, 17:32:50 UTC | adapted basic vid menu | 20 February 2015, 17:32:50 UTC |
39f939d | Moritz Kassner | 20 February 2015, 16:38:55 UTC | removed unneeded check in marker detector, added needed check in server | 20 February 2015, 16:38:55 UTC |
30eb2d4 | mkassner | 20 February 2015, 16:33:28 UTC | Merge pull request #61 from hookdump/v0.4_restruct broadcast mapped gaze on surfaces | 20 February 2015, 16:33:28 UTC |
4ce9df6 | Moritz Kassner | 20 February 2015, 16:25:03 UTC | added basic ui menu | 20 February 2015, 16:25:03 UTC |
28be0db | Ignacio | 20 February 2015, 15:16:59 UTC | broadcast mapped gaze on surfaces | 20 February 2015, 15:16:59 UTC |
7da3c2c | Moritz Kassner | 20 February 2015, 11:39:33 UTC | bugfix in marker detector | 20 February 2015, 11:39:33 UTC |
da90997 | Moritz Kassner | 20 February 2015, 11:30:25 UTC | remove gl rendered font in favour of cv2 rendered font to size feedback. Its more appropriate in this case | 20 February 2015, 11:30:25 UTC |
7a727de | Moritz Kassner | 20 February 2015, 11:05:57 UTC | Merge branch 'v0.4_restruct' of https://github.com/pupil-labs/pupil into v0.4_restruct | 20 February 2015, 11:05:57 UTC |
a58015f | Moritz Kassner | 20 February 2015, 11:05:49 UTC | updated recording data format. | 20 February 2015, 11:05:49 UTC |
4ae5c15 | Moritz Kassner | 20 February 2015, 11:05:10 UTC | ui label tweak | 20 February 2015, 11:05:10 UTC |
dc16983 | Will Patera | 20 February 2015, 10:41:23 UTC | bug fix - sign error -- should be `-1` not `+1` for max_y | 20 February 2015, 10:41:23 UTC |