Ben Hambrecht 3bdeeafe2d resolved conflict ...

# Conflicts:
#	topics/light.py

2018-02-20 23:12:04 +01:00

..

__init__.py

Beginning Hilbert project

2015-11-23 10:34:42 -08:00

arithmetic.py

Finally changed to

2018-01-15 19:15:05 -08:00

characters.py

Bug fix to PiCreatureScene handling bubbles

2018-01-25 23:50:32 -08:00

combinatorics.py

Finally changed to

2018-01-15 19:15:05 -08:00

common_scenes.py

Further fourier progress

2018-01-20 19:31:43 -08:00

complex_numbers.py

Unified display location (but not yet the code behind) labels in NumberPlane and ComplexPlane

2018-02-07 17:24:31 -08:00

counting.py

Beginning Leibniz project

2017-05-09 14:54:58 -07:00

fractals.py

Addressed places which depended on rotate being about the origin

2018-01-20 13:14:17 -08:00

functions.py

Improved how functions are drawn

2018-01-18 16:46:38 -08:00

geometry.py

Small uncertainty additions

2018-02-13 15:39:57 -08:00

graph_scene.py

Added point_to_coords method to graph_scene. Also, modified MOVIE_DIR in constants.py

2018-01-08 17:24:54 -08:00

graph_theory.py

Addressed places which depended on rotate being about the origin

2018-01-20 13:14:17 -08:00

light.py

resolved conflict

2018-02-20 23:12:04 +01:00

matrix.py

Finally changed to

2018-01-15 19:15:05 -08:00

number_line.py

Added binary search solution to case where input_to_graph_point doesn't take in a graph

2018-02-15 16:13:32 -08:00

numerals.py

Fixed numerals merge issue

2018-01-29 12:17:25 -08:00

objects.py

Merge branch 'master' of github.com:3b1b/manim into uncertainty

2018-02-15 18:36:41 -08:00

probability.py

Added slider objects for highD.py

2017-08-07 16:17:35 -07:00

three_dimensions.py

Merge pull request #109 from frozar/3D_camera_moving

2018-02-13 15:46:21 -08:00

vector_space_scene.py

Addressed places which depended on rotate being about the origin

2018-01-20 13:14:17 -08:00