Commit graph

272 commits

Author SHA1 Message Date
Grant Sanderson
60a47d0e2e Reverted basel.py to original pre-grant state 2018-02-26 16:15:03 -08:00
Grant Sanderson
671b6e6fe8 Changes to basel, and replication of the file 2018-02-26 16:13:28 -08:00
Sridhar Ramesh
1a8266b5a3 Incremental WindingNumber changes (and hopefully fixes to merge snafu now removed frmo history)
For reference: There had been a giant merge snafu (a merge on the Master branch of changes from Lighthouse2 that somehow overwrote many other files to older versions), apparently fixed on the Master branch by doing a reset to an older version and then a push -f. Before it was fixed, the merge snafu from Master was pulled into Sridhar's local WindingNumber, and then pushed to the remote WindingNumber as well. This was fixed by also doing a reset on Sridhar's local WindingNumber to the last good version and a push --force-with-lease. (There were some uncommitted changes on WindingNumber.py lost in the process, but luckily, by manually saving the file, those changes were reinserted, in this very commit).
2018-02-26 16:07:50 -08:00
Sridhar Ramesh
07214127d8 Merge branch 'master' of https://github.com/3b1b/manim into WindingNumber 2018-02-26 16:01:49 -08:00
Ben Hambrecht
a06c9d32d9 microedits (not yet working) 2018-02-27 00:22:21 +01:00
Grant Sanderson
148c808b76 Merge branch 'lighthouse2' of github.com:3b1b/manim into lighthouse2 2018-02-26 11:59:32 -08:00
Grant Sanderson
26388d35f4 Merge branch 'master' of github.com:3b1b/manim into lighthouse2 2018-02-26 11:59:06 -08:00
Grant Sanderson
99783d77a0 Added edits to intro scene 2018-02-26 11:58:56 -08:00
Grant Sanderson
1ba56c3bba Satisfying finicky spacing desires 2018-02-26 11:41:44 -08:00
Grant Sanderson
2ff564af39 Merge branch 'master' of github.com:3b1b/manim into lighthouse-grant 2018-02-26 11:39:51 -08:00
Grant Sanderson
eb5f3e7aa6 Moving uncertainty and fourier to old_projects 2018-02-26 11:37:18 -08:00
Ben Hambrecht
123b45298a microedits 2018-02-26 18:39:33 +01:00
Grant Sanderson
ef08e1fcbe Finished uncertainty project 2018-02-24 19:13:19 -08:00
Grant Sanderson
f93679fa47 Full HangingWeightsScene scene 2018-02-23 11:07:05 -08:00
Ben Hambrecht
f5e545e3dd finished IntroScene tweaks 2018-02-23 19:38:27 +01:00
Ben Hambrecht
e6dca3b44d finished sum manipulation scene 2018-02-23 14:44:29 +01:00
Sridhar Ramesh
2966c1c31e Incremental 2018-02-22 15:32:49 -08:00
Ben Hambrecht
e2f6a1f2a0 Merge branch 'master' into lighthouse2 2018-02-22 23:03:37 +01:00
Ben Hambrecht
4f8bc1fee9 working on final scene 2018-02-22 23:03:05 +01:00
Sridhar Ramesh
6365de0b81 Incremental 2018-02-22 12:05:57 -08:00
Sridhar Ramesh
d24eab9979 Merge branch 'master' of https://github.com/3b1b/manim into WindingNumber 2018-02-22 11:08:01 -08:00
Ben Hambrecht
fd91761f89 Finalized PondScene (save overlays), working on final scenes 2018-02-22 18:20:25 +01:00
Ben Hambrecht
25744bdb54 rewriting PondScene with ThreeDCamera 2018-02-22 11:18:20 +01:00
Sridhar Ramesh
cf8b25bcc0 Incremental 2018-02-21 17:12:45 -08:00
Grant Sanderson
e7e85897a3 Finished AmbiguityInLongEchos 2018-02-21 15:17:52 -08:00
Grant Sanderson
542958199a 3/4 of AmbiguityInLongEchos in uncertainty 2018-02-21 13:14:09 -08:00
Grant Sanderson
2c5c651e99 Gives fourier graphs created with FFT and underlying function attribute 2018-02-21 13:13:24 -08:00
Sridhar Ramesh
f7f359ffaf Merge branch 'master' of https://github.com/3b1b/manim into WindingNumber 2018-02-21 10:36:35 -08:00
Ben Hambrecht
831257b68a day's work 2018-02-21 19:09:33 +01:00
Ben Hambrecht
e8d9f6d6e5 incremental changes in basel 2018-02-21 19:09:33 +01:00
Grant Sanderson
e34f66fafe Merge branch 'master' of github.com:3b1b/manim into lighthouse2 2018-02-21 10:03:53 -08:00
Grant Sanderson
c55287220c uncertainty progress 2018-02-21 09:28:19 -08:00
Grant Sanderson
bae06cc05b Half of AmbiguityInLongEchos 2018-02-20 22:59:53 -08:00
Sridhar Ramesh
e4569a6f63 Merge branch 'master' of https://github.com/3b1b/manim into WindingNumber 2018-02-20 21:54:50 -08:00
Sridhar Ramesh
c84b26ccce Incremental 2018-02-20 21:54:40 -08:00
Ben Hambrecht
18357e909b working on getting the pond's LS to scale correctly 2018-02-20 23:12:08 +01:00
Ben Hambrecht
59deed97aa added ArcHighLighterOverlayScene 2018-02-20 21:20:55 +01:00
Grant Sanderson
a71b9692bf Small uncertainty progress 2018-02-20 11:29:17 -08:00
Ben Hambrecht
2d93c45624 Pond now smoothly morphs into a number line 2018-02-20 15:37:19 +01:00
Ben Hambrecht
88dfb772f6 Merge branch 'master' into lighthouse2 2018-02-20 11:26:11 +01:00
Ben Hambrecht
5e9ab3a6ce ScreenScalingScene 2018-02-20 11:21:01 +01:00
Grant Sanderson
4fdab1ae98
Merge pull request #130 from 3b1b/WindingNumber
Winding number
2018-02-19 17:25:41 -08:00
Sridhar Ramesh
b1f5252bb9 Merge branch 'master' of https://github.com/3b1b/manim into WindingNumber 2018-02-19 14:32:58 -08:00
Sridhar Ramesh
e07fc600f2 Incremental 2018-02-19 14:32:46 -08:00
Grant Sanderson
36a4aacdf9 Uncertainty progress 2018-02-19 10:07:07 -08:00
Ben Hambrecht
3caa58cd0b Merge branch 'master' into lighthouse2 2018-02-19 09:17:06 +01:00
Ben Hambrecht
7eca959e2f incremental progress 2018-02-19 09:17:00 +01:00
Grant Sanderson
321a5ccc1e Further progress in IntroduceDopplerRadar 2018-02-16 21:22:32 -08:00
Grant Sanderson
7415b0aa6b Uncertainty progress 2018-02-16 12:15:27 -08:00
Ben Hambrecht
79fe27a16e cleanup in ScreenShapingScene, in prep for 3D scene 2018-02-16 17:53:55 +01:00