Wykres commitów

559 Commity (b071af41a962343ad3d5b1e4e32e3273227a3775)

Autor SHA1 Wiadomość Data
Dakota Benjamin fb0f48e62a Merge conflicts
Former-commit-id: a7e283c25e
2015-08-27 09:27:13 -04:00
Dakota Benjamin f49b8dc370 Merge
Former-commit-id: aeec2d1b5e
2015-08-27 09:24:25 -04:00
Dakota Benjamin f9774c1d79 Remove redundant argument
Former-commit-id: 9ae8e80ed9
2015-08-27 09:22:30 -04:00
Dakota Benjamin 2c0adf332e Merge branch 'python-port' of https://github.com/dakotabenjamin/OpenDroneMap into dakotabenjamin-python-port
Former-commit-id: ef69d57af2
2015-08-27 09:09:38 -04:00
Dakota Benjamin 8aa6818712 Merge branch 'python-port' of https://github.com/OpenDroneMap/OpenDroneMap into dakotabenjamin-python-port
Conflicts:
	run.py

Former-commit-id: 32589345ca
2015-08-27 09:08:32 -04:00
Dakota Benjamin 89d553c541 Update code to nearly comply with PEP8
Former-commit-id: e966c411dc
2015-08-27 08:59:35 -04:00
Dakota Benjamin 8e8ac4994c Merge pull request #158 from dakotabenjamin/pp-argparse
Clean argument parsing with argparse

Former-commit-id: 4a9b753df1
2015-08-27 08:56:48 -04:00
Dakota Benjamin ae307c1bd6 Merge pull request #1 from paulinus/pp-argparse-add-missing
Add missing command argument

Former-commit-id: 89b607f55e
2015-08-27 08:56:07 -04:00
Pau Gargallo e302bb5873 Add missing command argument
Former-commit-id: 06420948dc
2015-08-27 12:01:54 +02:00
Pau Gargallo 5f0713a6b7 Merge branch 'upstream--gh-pages' into opensfm
Conflicts:
	run.pl

Former-commit-id: 163dcda3e1
2015-08-26 14:30:45 +02:00
Dakota Benjamin a7b52c9a8a Clean argument parsing with argparse
Former-commit-id: 05c006a655
2015-08-25 11:17:00 -04:00
Dakota Benjamin dc8ccdc122 Merge branch 'python-port' of https://github.com/dakotabenjamin/OpenDroneMap into python-port
Former-commit-id: 53233d39f0
2015-08-21 14:35:07 -04:00
Dakota Benjamin 843562ecc7 Revert "Revert "Upgrade Bundler + add support for Ceres solver""
This reverts commit b64592a921 [formerly 667ea4e8ff].

Conflicts:
	.gitignore
	install.sh

Former-commit-id: 5041494d32
2015-08-21 14:13:42 -04:00
Dakota Benjamin 56572ecf9f Fix argument parsing bug, simplify t/f args
Former-commit-id: 11e18e2aa3
2015-08-21 11:03:30 -04:00
Dakota Benjamin 26b0ca48b6 Merge branch 'gh-pages' of https://github.com/OpenDroneMap/OpenDroneMap into python-port
Former-commit-id: 93ceffb3a2
2015-08-20 19:23:19 +00:00
Dakota Benjamin f07323ac34 Add Python files and update installation script
Former-commit-id: 3bd80dcab5
2015-08-20 19:16:25 +00:00
Dakota Benjamin 50a4f3261c Merge pull request #132 from xxfelixxx/patch-2
Add pre-commit hook and script to check that ccd_defs.json compiles

Former-commit-id: 57b3bfe3e3
2015-08-19 08:15:41 -04:00
Felix Tubiana dfbde9b73a Updated README.md with details on running ccd_defs_check.pl
Run ccd_defs_check.pl to test that ccd_defs.json compiles.
    Add the pre-commit hook to .git/hooks to test compilation automatically.


Former-commit-id: 93af498913
2015-08-19 06:42:49 -04:00
Felix Tubiana 083cb27c16 Fixed ccd_def.json
Former-commit-id: 6e28050b2c
2015-08-19 06:27:28 -04:00
Felix Tubiana e9e2cfbf32 Merge remote-tracking branch 'upstream/gh-pages' into patch-2
Former-commit-id: ee1e5a2cb9
2015-08-19 06:25:38 -04:00
Dakota Benjamin e281c5c5aa Merge remote-tracking branch 'OpenDroneMap/gh-pages' into gh-pages
Former-commit-id: c6932c459d
2015-08-18 09:14:10 -04:00
Stephen Mather cf3617a8ae Merge pull request #148 from OpenDroneMap/revert-123-bundler-ceres
Revert "Upgrade Bundler + add support for Ceres solver"

Former-commit-id: 0228f671d2
2015-08-18 08:49:57 -04:00
Dakota Benjamin 33dedc2885 Update ccd_defs for PHANTOM VISION FC200
Former-commit-id: 507bf2ed2f
2015-08-18 08:20:11 -04:00
Stephen Mather b64592a921 Revert "Upgrade Bundler + add support for Ceres solver"
Former-commit-id: 667ea4e8ff
2015-08-16 08:49:41 -04:00
Stephen Mather ba36c8185e Merge pull request #145 from sstippa-usgs/gh-pages
Update ccd_defs.json - Phantom 3 Pro

Former-commit-id: 6770b13c79
2015-08-13 15:31:03 -04:00
Stephen Mather c94657db40 Merge pull request #143 from coredump-ch/docker
Added Dockerfile (yay!)

Former-commit-id: 83caf6ae85
2015-08-13 15:24:47 -04:00
Stephen Mather 83e97653f7 Merge pull request #142 from coredump-ch/newlines
Added missing newlines to print statement in run.pl

Former-commit-id: 6654a937b1
2015-08-13 14:49:31 -04:00
sstippa-usgs 7f05d99fac Update ccd_defs.json
Former-commit-id: 35e7c47225
2015-08-12 12:48:47 -04:00
Danilo Bargen 3396651b79 Added Dockerfile
Former-commit-id: 8976bf5349
2015-08-09 13:28:53 +02:00
Danilo Bargen 8556589412 Added missing newlines to print statement in run.pl
Former-commit-id: 57d10d868a
2015-08-09 00:03:27 +02:00
Stephen Mather 549f9627d2 Merge pull request #141 from coredump-ch/ccd
ccd_defs.json: SONY ILCE-5100

Former-commit-id: 9a84200ab6
2015-08-08 13:59:22 -04:00
Stephen Mather 2eb9827e75 add overview video
Former-commit-id: a9d160ad4d
2015-08-08 13:58:45 -04:00
Danilo Bargen 2f9ccd9314 ccd_defs.json: SONY ILCE-5100
Added support for Sony Alpha 5100 (ILCE 5100).

Source for sensor length:
http://www.dpreview.com/products/sony/slrs/sony_a5100/specifications

Former-commit-id: 9b73856e85
2015-08-08 19:56:42 +02:00
Stephen Mather 9b6cbf4f98 Merge pull request #140 from coredump-ch/readme
README Improvements

Former-commit-id: 515d14e4be
2015-08-08 13:55:57 -04:00
Danilo Bargen 46008daa6a README cleanup
Former-commit-id: 8b8a8cb61e
2015-08-08 19:47:54 +02:00
Danilo Bargen 81f5da7d2d Added another youtube link to README
Former-commit-id: efbe760f9e
2015-08-08 19:47:06 +02:00
Danilo Bargen 701f1fe143 Added documentation section to README
Former-commit-id: 68cb3aaf45
2015-08-08 19:44:57 +02:00
Stephen Mather d9757a2eac Merge pull request #139 from hwiyoung/gh-pages
Update ccd_defs.json

Former-commit-id: 4ef6fa4daa
2015-08-07 06:21:03 -04:00
hwiyoung d1619dcdf9 Update ccd_defs.json
Add 'Sony NEX-5R'


Former-commit-id: e541109e7b
2015-08-03 17:33:26 +09:00
Stephen Mather f911f239ba Merge pull request #134 from LeithHawkins/patch-2
Former-commit-id: ebf5e26740
2015-07-23 07:48:58 -04:00
Leith 490130a7f7 Update ccd_defs.json
Former-commit-id: 27685c5dea
2015-07-23 13:11:43 +10:00
Leith e5ef8a5021 Update ccd_defs.json
Added the `Silver` as well as some of my files where uploaded as silver and some as S

Former-commit-id: 2c95ea4b19
2015-07-21 17:10:44 +10:00
Felix Tubiana 3aa4ef2256 Added ccd_defs_check.pl to verify that ccd_defs.json compiles.
Former-commit-id: c85e3890d9
2015-07-21 11:26:51 +08:00
Felix Tubiana 75bb4ba4a6 Added pre-commit hook to check that ccd_defs.json compiles.
Enable this hook by creating a symlink to .git/hooks/


Former-commit-id: f4252ad4e1
2015-07-21 11:25:57 +08:00
Stephen Mather 2f3dbcbafb Merge pull request #129 from xxfelixxx/patch-1
Former-commit-id: d682f8e604
2015-07-20 19:04:53 -04:00
Felix 99311d477a Updated run.pl, fixed usage typo.
Former-commit-id: 7e90a4bb07
2015-07-20 19:50:55 +08:00
Stephen Mather 92c72c90d6 fix for missing comma
Former-commit-id: 6b4d8b8cfc
2015-07-18 15:56:53 -04:00
Dakota Benjamin 8e23217fe4 Merge pull request #125 from bcdodd/patch-1
Update ccd_defs.json

Former-commit-id: 5af1d2247d
2015-07-14 14:38:59 -04:00
bcdodd 0cfbb38310 Update ccd_defs.json
added sensor for Raven UAV

Former-commit-id: 27dc127d85
2015-07-14 19:37:06 +01:00
Stephen Mather 076660b333 Merge pull request #123 from chris-cooper/bundler-ceres
Upgrade Bundler + add support for Ceres solver

Former-commit-id: f95c49c142
2015-07-10 08:20:23 -04:00