Commit Graph
54 Commits
Author SHA1 Message Date
gnembon 8ed4561a98 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/script/utils/ShapeDispatcher.java
2021-04-12 14:26:22 -03:00
gnembon 92cc545896 less restricting use of shapes 2021-04-12 07:57:04 -03:00
gnembon 5dd2a12aa7 mapping 2021-04-02 18:38:55 -03:00
gnembon ab553187c5 its a doozie 2021-03-24 10:35:52 -03:00
gnembon e795a38b17 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/script/utils/ShapesRenderer.java
2021-03-18 00:52:13 -03:00
gnembon 4fdee473f0 added lean and turn to labels 2021-03-18 00:49:21 -03:00
gnembon 5c4744a93b Merge branch 'master' into 1.17 2021-03-09 19:41:49 -04:00
gnembon 2d1b53258c simplify error messages 2021-03-09 13:29:20 -04:00
altrisi 86dabe0080 Add exception hierarchy 2021-02-21 00:57:37 +01:00
altrisi a155494d11 Allow some exceptions to be handled 2021-02-19 19:54:41 +01:00
gnembon b14cf288a1 mappings 2021-01-15 04:51:06 -04:00
gnembon 59575ec607 refactor breaking up API and language defs 2020-09-09 15:37:03 -03:00
gnembon 7f8735021f Merge branch 'master' into 1.16 2020-07-28 20:05:07 -03:00
gnembon bca31c6b22 adjusted label positioning 2020-07-28 00:52:49 -03:00
gnembon 16033dfa1a Merge branch 'master' into 1.16 2020-07-28 00:09:22 -03:00
gnembon 7a1e05cfa1 tweaked line particle display and chunk display app 2020-07-27 22:10:13 -03:00
gnembon e67ec14285 mappings 2020-07-20 21:06:03 -03:00
gnembon e8a357ca72 Merge branch 'master' into 1.16 2020-07-19 21:52:38 -03:00
gnembon 022c091fff attempt to solve hash collisions like vec3d(-8,8,-8)==vec3d(8,8,8) 2020-07-19 21:52:18 -03:00
gnembon 86b6723b6a Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/script/utils/ShapeDispatcher.java
2020-07-19 11:26:22 -03:00
gnembon ca0ddbb9e2 allow for discrete snapping of drawn shapes 2020-07-19 11:19:49 -03:00
gnembon ca9f029996 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/script/utils/ShapeDispatcher.java
2020-07-18 17:03:20 -03:00
gnembon 02d985bafc added doublesided 2020-07-18 17:02:43 -03:00
gnembon e38fb896c2 fix label text to work with 1.16 2020-07-18 14:16:53 -03:00
gnembon eb79ea98e7 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/script/utils/ShapesRenderer.java
2020-07-18 13:21:33 -03:00
gnembon 57b5bace32 added label to displayed shapes 2020-07-18 13:20:49 -03:00
gnembon b6a5cc5e8c Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/script/utils/ShapeDispatcher.java
2020-06-10 23:21:19 -03:00
gnembon 39f0b86272 fixes 2020-06-10 23:20:21 -03:00
gnembon 2912fd2936 Merge branch 'master' into 1.16 2020-06-10 12:31:00 -03:00
gnembon 118554dbab added 'cylinder' shape 2020-06-10 12:30:33 -03:00
gnembon bca8c2bb3c fix 2020-06-10 01:51:26 -03:00
gnembon 9aa580cfa5 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/script/CarpetExpression.java
#	src/main/java/carpet/script/utils/ShapeDispatcher.java
#	src/main/java/carpet/script/utils/ShapesRenderer.java
2020-06-10 01:36:11 -03:00
gnembon 58862fca11 added snap to shape
added bulk shape rendering
2020-06-10 01:25:51 -03:00
gnembon f5868b24e2 Duration can be sent as 0 2020-06-09 02:59:53 -03:00
gnembon 2f102a7785 Switched to 64FNV-1a as shapes keying algorithm as collision resistant
Allow shapes to be sent in bulk as one / few packets
Optimized rendering of shapes that not render all faces
Moving shapes render now smoothly with higher framerates
2020-06-08 21:24:56 -03:00
gnembon d4c0c7307b Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/script/utils/ShapeDispatcher.java
2020-06-05 00:50:20 -03:00
gnembon 50b414727c refactor 2020-06-05 00:48:02 -03:00
gnembon 0a21c4fa21 Merge branch 'master' into 1.16 2020-06-04 13:28:27 -03:00
gnembon 8b2e703128 adding width as optional for Spheres 2020-06-04 13:27:58 -03:00
gnembon 252dc29e18 update 1.16 2020-06-04 02:40:40 -03:00
gnembon 8fe3508fdd Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/script/utils/ShapeDispatcher.java
2020-06-04 02:35:05 -03:00
gnembon 2e8ebc402e allowed 'follow' in draw_shape 2020-06-04 02:33:32 -03:00
gnembon 5285eb33d6 tuning of shapes 2020-06-03 22:49:23 -03:00
gnembon bf2d412a66 Merge branch 'master' into 1.16 2020-06-03 03:47:55 -03:00
gnembon f14fcbba9f added spheres to draw_shape 2020-06-03 03:47:38 -03:00
gnembon 46409c8daa added optional options for draw_shape and fixed docs 2020-06-02 11:58:14 -03:00
gnembon 59be8b3fb4 redocced to draw_shape 2020-06-01 12:05:01 -03:00
gnembon f97ca9e9bd mappings 2020-06-01 03:25:09 -03:00
gnembon d5cb99d7f9 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/network/ClientNetworkHandler.java
#	src/main/java/carpet/script/CarpetExpression.java
#	src/main/java/carpet/script/utils/ShapeDispatcher.java
#	src/main/java/carpet/script/utils/ShapesRenderer.java
2020-06-01 03:05:23 -03:00
gnembon a86c127c72 added params and changed syntax for draw_shape 2020-06-01 03:01:39 -03:00