Commit graph

959 commits

Author SHA1 Message Date
Ben Hambrecht
c051749905 old Integer implem lingering around 2018-01-27 13:29:20 +01:00
Ben Hambrecht
a9f3bbd4a3 Revert "Added my playground for syncing btw my machines"
This reverts commit 698373c428.
2018-01-26 22:59:51 +01:00
bhbr
3f93924881 cleanup 2018-01-26 22:05:09 +01:00
bhbr
49ed0ab4f4 Added my playground 2018-01-26 19:56:49 +01:00
Ben Hambrecht
698373c428 Added my playground for syncing btw my machines 2018-01-26 19:51:08 +01:00
Ben Hambrecht
b3d2795ee3 Merge branch 'master' into lighthouse 2018-01-26 19:50:25 +01:00
Ben Hambrecht
daadc857c4 Revert "Added my playground files (for syncing btw my machines)"
This reverts commit 2fd0687b59.
2018-01-26 19:50:12 +01:00
Ben Hambrecht
2fd0687b59 Added my playground files (for syncing btw my machines) 2018-01-26 19:49:15 +01:00
bhbr
3589a292cb gitignore 2018-01-26 19:33:22 +01:00
bhbr
65eba27ab5 Merge remote-tracking branch 'origin/lighthouse' into lighthouse
# Conflicts:
#	topics/geometry.py
2018-01-26 19:32:55 +01:00
bhbr
98982d20e0 Merge branch 'master' into lighthouse
# Conflicts:
#	topics/geometry.py
2018-01-26 19:29:06 +01:00
Ben Hambrecht
a24738be18 Merge branch 'master' into lighthouse 2018-01-25 23:33:17 +01:00
Ben Hambrecht
9e57ac2be6 Annulus: symmetrized code 2018-01-25 23:23:43 +01:00
Ben Hambrecht
afc0c0d5ae Trying to make light cones update correctly 2018-01-25 23:23:04 +01:00
Grant Sanderson
932d056ff7
Merge pull request #90 from 3b1b/mapping-camera-fix
Fixed bug with MappingCamera set to allow_object_intrusion
2018-01-24 12:15:12 -08:00
Grant Sanderson
3c86caa488 Fixed bug with MappingCamera set to allow_object_intrusion 2018-01-24 12:14:37 -08:00
Grant Sanderson
730c94461f
Merge pull request #89 from 3b1b/fourier-work
Made slicing into Mobjects return a Group or VGroup instead of a list
2018-01-24 11:27:23 -08:00
Grant Sanderson
ebf44f9bdb Scaffolding for ScaleUpCenterOfMass scene in fourier 2018-01-24 11:26:13 -08:00
Grant Sanderson
c7fa8c59ad Made slicing into mobjects return a Group or VGroup instead of a list 2018-01-24 11:25:55 -08:00
Ben Hambrecht
738d6974b7 Resolved conflicts in 2018-01-24 18:53:07 +01:00
Ben Hambrecht
a4a146a54e Merge branch 'master' into lighthouse
# Conflicts:
#	topics/numerals.py
2018-01-24 18:50:44 +01:00
Ben Hambrecht
ea18d984ce Not my changes, but I have to commit them?! 2018-01-24 18:50:01 +01:00
Grant Sanderson
239addea72 Finished WriteComplexExponentialExpression of fourier 2018-01-24 08:55:53 -08:00
Grant Sanderson
b3d6ab9d47 Added background rectangle to DecimalNumber 2018-01-24 08:55:26 -08:00
Grant Sanderson
82905e38bd Removed axes config from Rotating animation 2018-01-24 08:54:36 -08:00
Grant Sanderson
8dd42af2e9 Merge branch 'master' of github.com:3b1b/manim into fourier-work 2018-01-23 14:03:43 -08:00
Grant Sanderson
fb23644b5a Further fourier work 2018-01-23 14:03:25 -08:00
Grant Sanderson
b9a292fbfc
Merge pull request #88 from 3b1b/fourier-work
Fourier work
2018-01-23 13:43:19 -08:00
Grant Sanderson
a389e5353f Extended DecimalNumber to handles complex numbers and background rectangles 2018-01-23 13:42:18 -08:00
Grant Sanderson
bf5480c33b Improved VMobject.match_style method to handle submobjects in a smarter way 2018-01-23 13:41:43 -08:00
Grant Sanderson
64b5399bc5 Extended Mobject.align_to to handle aligning centers of mobjects 2018-01-23 13:41:14 -08:00
Grant Sanderson
1294b9b2fe Lingering typo 2018-01-23 12:25:03 -08:00
Grant Sanderson
47c41139bf Final merge conflict cleanup 2018-01-23 12:23:29 -08:00
Grant Sanderson
b93e28754f Whoops, some lingering changes that should have been in last commit 2018-01-23 12:19:56 -08:00
Grant Sanderson
eabe989eda Resolved a few merge conflicts 2018-01-23 12:18:19 -08:00
Ben Hambrecht
d4ea12b6fc Merge branch 'master' into lighthouse 2018-01-23 21:12:36 +01:00
Ben Hambrecht
7d44dab379 Merge remote-tracking branch 'origin/lighthouse' into lighthouse
# Conflicts:
#	topics/geometry.py
2018-01-23 21:12:05 +01:00
Ben Hambrecht
963956cca7 resolved merge conflicts (#85) 2018-01-23 21:09:53 +01:00
Grant Sanderson
f6c9c6eec6
Merge pull request #85 from 3b1b/lighthouse
New methods for Arcs and Sectors
2018-01-23 12:08:36 -08:00
Grant Sanderson
6eee427c5e
Merge branch 'master' into lighthouse 2018-01-23 12:08:27 -08:00
Grant Sanderson
68143cf4a4
Merge pull request #87 from 3b1b/fourier-work
Fourier work
2018-01-23 12:06:12 -08:00
Ben Hambrecht
2cbf016dff Merge branch 'master' into lighthouse
# Conflicts:
#	topics/geometry.py
2018-01-23 21:05:35 +01:00
Grant Sanderson
d9f0c31eb1 Began setup of WhiteComplexExponentialExpression in fourier 2018-01-23 12:05:17 -08:00
Grant Sanderson
0c7698da55 Added ability to give a unit to a decimal, and changing decimal 2018-01-23 12:04:56 -08:00
Grant Sanderson
9ded033c7c Slightly improved match_style in vmobject, but it's styll suboptimal 2018-01-23 12:04:31 -08:00
Grant Sanderson
245ee91f02 Added initial_config to digest_config, so that there is a way to recall how a mobject/animation/scene was initialized 2018-01-23 12:04:05 -08:00
Ben Hambrecht
66e001d77a Added units to DecimalNumer 2018-01-23 10:53:24 -08:00
Grant Sanderson
c5202f2c62
Merge pull request #86 from 3b1b/fourier-work
Fourier work + super minor cleanup
2018-01-22 21:59:20 -08:00
Grant Sanderson
9b400c322e Scoped out WhiteComplexExponentialExpression of fourier 2018-01-22 21:58:26 -08:00
Grant Sanderson
4f356d7e8f Added simple R3_to_complex function 2018-01-22 21:57:38 -08:00