Commit graph

5413 commits

Author SHA1 Message Date
Richard Feldman
1b6d03d0ee
Merge pull request #775 from rtfeldman/editor_color_fix
refactoring, fixed color shader bug
2020-12-05 16:49:23 -05:00
Folkert
0a08caac7f clippy things 2020-12-05 21:37:46 +01:00
Folkert
1fe0f5d780 Merge remote-tracking branch 'origin/trunk' into editor-ir 2020-12-05 20:58:27 +01:00
Folkert
f04c97828f cleanup 2020-12-05 20:51:47 +01:00
Richard Feldman
62f34669e1 cargo fmt 2020-12-05 13:23:21 -05:00
Anton-4
c908f19989
Merge branch 'trunk' into editor_color_fix 2020-12-05 18:03:20 +01:00
Anton-4
202cba9f81 Undo unnecessary color type change 2020-12-05 17:58:45 +01:00
Richard Feldman
05a05fed42
Merge pull request #774 from rtfeldman/adjust-examples
Adjust examples to current platform interface
2020-12-05 11:54:28 -05:00
Anton-4
0d46835135 refactored text drawing, fixed color shader bug 2020-12-05 17:53:05 +01:00
Anton-4
80cf1bde54
Merge pull request #773 from rtfeldman/editor_multiple_rects
editor: Drawing multiple rectangles
2020-12-05 11:55:31 +01:00
Anton-4
553baea320 Merge branch 'trunk' into editor_multiple_rects 2020-12-05 10:34:16 +01:00
Pit Capitain
ba11f9b7b9 Adjust examples to current platform interface 2020-12-05 09:17:03 +01:00
Richard Feldman
54ba54680d
Merge pull request #771 from rtfeldman/editor_refactor
Editor refactor
2020-12-04 21:56:22 -05:00
Richard Feldman
01a46aa454
Merge pull request #754 from rtfeldman/no-implicit-zig-allocator
Don't use the implicit libc allocator in RocStr
2020-12-04 21:47:48 -05:00
rvcas
0c8260d71a Merge branch 'trunk' into task_can 2020-12-04 20:03:27 -05:00
Folkert
81d0626db1 remove old stuff 2020-12-04 22:30:06 +01:00
Jared Ramirez
c39ac471ea Zig format 2020-12-04 14:25:29 -07:00
Jared Ramirez
d41ea3f2d7 Fix clippy 2020-12-04 14:21:18 -07:00
Jared Ramirez
8fd2816e6a
Merge branch 'trunk' into no-implicit-zig-allocator 2020-12-04 15:16:45 -06:00
Jared Ramirez
5697ec209b Fix call to str split; Move some comments around 2020-12-04 14:16:07 -07:00
Jared Ramirez
7e9cf27d94 [WIP] Use zig build system in build script; Nearly fix str tests 2020-12-04 14:07:47 -07:00
Folkert
66748d3a50 Merge remote-tracking branch 'origin/trunk' into editor-ir 2020-12-04 20:45:30 +01:00
Anton-4
e867dc72dc
Merge branch 'trunk' into editor_multiple_rects 2020-12-04 20:13:49 +01:00
Anton-4
6af26c9f75 editor: draw multiple rectangles 2020-12-04 20:05:29 +01:00
Richard Feldman
10c17c5999
Merge branch 'trunk' into editor_refactor 2020-12-04 07:50:06 -05:00
Richard Feldman
dc136eb782
Merge pull request #772 from rtfeldman/fix-test_mono
Fix test_mono tests
2020-12-04 07:49:28 -05:00
Richard Feldman
2485774184 Fix test_mono tests 2020-12-04 07:47:01 -05:00
Anton-4
c0fdc09ec7 Merge branch 'trunk' of rtfeldman/roc into editor_refactor 2020-12-04 11:28:30 +01:00
Anton-4
6dc2471c5b rustfmt 2020-12-04 11:28:20 +01:00
Richard Feldman
fc2a37b22b Use alloc over dupe 2020-12-04 01:35:20 -05:00
Richard Feldman
c5172436c6 Merge remote-tracking branch 'origin/trunk' into no-implicit-zig-allocator 2020-12-04 01:26:23 -05:00
Richard Feldman
3634761e07
Merge pull request #769 from rtfeldman/snake_case-vars
snake_case zig vars
2020-12-04 01:26:15 -05:00
Richard Feldman
7cf58678f3
Merge pull request #770 from rtfeldman/editor-file-access
Editor file access
2020-12-04 01:22:55 -05:00
Richard Feldman
c83e3ce27f Merge branch 'trunk' into no-implicit-zig-allocator 2020-12-04 00:59:23 -05:00
Richard Feldman
7b5eb08617 Re-snake_case main.zig args 2020-12-04 00:38:33 -05:00
Richard Feldman
ee9f426ed8 Re-camelCase function names 2020-12-04 00:38:33 -05:00
Richard Feldman
0b16f5c1ea Revert "Use camelCase in str.zig"
This reverts commit 0583cc1a27.
2020-12-04 00:38:33 -05:00
Richard Feldman
3ee990b0a0 Explicitly link libc in build.zig 2020-12-04 00:34:31 -05:00
Chadtech
cadb58f418 Improve test name in test_file 2020-12-04 00:29:53 -05:00
Richard Feldman
497e1538b0 fix some memory leaks in tests 2020-12-04 00:29:47 -05:00
Chadtech
85e96a36d7
Merge branch 'trunk' into editor-file-access 2020-12-04 00:26:12 -05:00
Chadtech
17f796a824 prefix DoesntHaveRocExtension error 2020-12-04 00:25:00 -05:00
Chadtech
2a02b2d917 Make simple module a bit less simple, delete SimpleFmt module since it isnt used in testing 2020-12-04 00:20:36 -05:00
Richard Feldman
505ade3282 Don't try to free empty strings 2020-12-04 00:17:46 -05:00
Chadtech
17ccec6aa5 'correct' formatting for SimpleFmt.roc 2020-12-04 00:16:04 -05:00
Chadtech
1326219415 File module with read, fmt, and write functionality for the editor 2020-12-04 00:14:32 -05:00
Richard Feldman
ef258fe675 deinit more in tests 2020-12-04 00:05:07 -05:00
Richard Feldman
e0f88a5de2 Merge remote-tracking branch 'origin/trunk' into no-implicit-zig-allocator 2020-12-03 23:53:50 -05:00
Richard Feldman
f55af7282c Merge branch 'trunk' into no-implicit-zig-allocator 2020-12-03 23:53:46 -05:00
Richard Feldman
9167e03705
Merge pull request #768 from rtfeldman/zig-str
camelCase str.zig
2020-12-03 23:53:37 -05:00