zelophed
3c4e504f61
Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev
...
# Conflicts:
# src/main/java/com/simibubi/create/events/ClientEvents.java
# src/main/resources/create.mixins.json
2021-05-04 16:12:07 +02:00
JozsefA
bc5630e593
ShaderContexts
...
- A huge step towards more arbitrary shader usage
- Need to work on registration of the different parts
- Things are unorganized
2021-05-03 21:46:33 -07:00
PepperCode1
163361f5ca
Merge branch 'mc1.16/dev' of https://github.com/Creators-of-Create/Create into mc1.16/fix-bugs
2021-05-03 19:55:21 -07:00
simibubi
076783eb7e
Subcreatica
...
- Added the Copper Backtank
- Added Diving helmet and boots
2021-05-04 03:50:17 +02:00
PepperBell
77ee23c208
Fix crate rarity
2021-05-03 18:35:57 -07:00
zelophed
fd62f2f8f4
Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev
...
# Conflicts:
# src/main/java/com/simibubi/create/CreateClient.java
# src/main/java/com/simibubi/create/compat/jei/category/BlockzapperUpgradeCategory.java
# src/main/java/com/simibubi/create/content/curiosities/symmetry/SymmetryWandScreen.java
# src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperScreen.java
2021-05-03 19:58:39 +02:00
zelophed
2442e3ac00
merge & comment cleanup
2021-05-03 18:25:57 +02:00
zelophed
c36346b97d
Merge branch 'mc1.16/config-ui' into mc1.16/dev
...
# Conflicts:
# src/main/java/com/simibubi/create/content/contraptions/goggles/GoggleConfigScreen.java
# src/main/java/com/simibubi/create/foundation/command/AllCommands.java
# src/main/java/com/simibubi/create/foundation/command/FabulousWarningCommand.java
# src/main/java/com/simibubi/create/foundation/command/OverlayConfigCommand.java
# src/main/java/com/simibubi/create/foundation/command/PonderCommand.java
# src/main/java/com/simibubi/create/foundation/command/ToggleDebugCommand.java
# src/main/java/com/simibubi/create/foundation/command/ToggleExperimentalRenderingCommand.java
# src/main/java/com/simibubi/create/foundation/gui/AbstractSimiContainerScreen.java
# src/main/java/com/simibubi/create/foundation/gui/AbstractSimiScreen.java
# src/main/java/com/simibubi/create/foundation/gui/AllIcons.java
# src/main/java/com/simibubi/create/foundation/gui/UIRenderHelper.java
# src/main/java/com/simibubi/create/foundation/ponder/NavigatableSimiScreen.java
# src/main/java/com/simibubi/create/foundation/ponder/PonderProgressBar.java
# src/main/java/com/simibubi/create/foundation/ponder/PonderUI.java
# src/main/java/com/simibubi/create/foundation/ponder/content/PonderIndexScreen.java
# src/main/java/com/simibubi/create/foundation/ponder/content/PonderTagScreen.java
# src/main/java/com/simibubi/create/foundation/ponder/ui/ChapterLabel.java
# src/main/java/com/simibubi/create/foundation/ponder/ui/PonderButton.java
# src/main/resources/create.mixins.json
2021-05-03 16:54:32 +02:00
zelophed
ae76821190
more changes to color and theme
2021-05-03 16:14:58 +02:00
JozsefA
35768b5ade
Step towards arbitrary shader contexts
2021-05-02 14:16:02 -07:00
JozsefA
15f4cd305e
Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector
2021-05-02 11:50:39 -07:00
simibubi
4974df5c99
Merge pull request #1544 from PepperCode1/mc1.16/model-cleanup
...
Cleanup Models and Custom Item Rendering
2021-05-02 17:42:48 +02:00
simibubi
b086fbd1f2
Merge pull request #1520 from PepperCode1/mc1.16/reload-listeners
...
Tweak Reload Listener Classes
2021-05-02 17:39:29 +02:00
JozsefA
2112061db0
Vertex shader abstractions
2021-05-01 23:39:36 -07:00
JozsefA
67e75d747a
Move backend
2021-05-01 16:32:09 -07:00
JozsefA
2e16b85190
Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector
...
# Conflicts:
# src/generated/resources/.cache/cache
# src/generated/resources/assets/create/lang/unfinished/de_de.json
# src/generated/resources/assets/create/lang/unfinished/es_es.json
# src/generated/resources/assets/create/lang/unfinished/es_mx.json
# src/generated/resources/assets/create/lang/unfinished/fr_fr.json
# src/generated/resources/assets/create/lang/unfinished/it_it.json
# src/generated/resources/assets/create/lang/unfinished/ja_jp.json
# src/generated/resources/assets/create/lang/unfinished/ko_kr.json
# src/generated/resources/assets/create/lang/unfinished/nl_nl.json
# src/generated/resources/assets/create/lang/unfinished/pt_br.json
# src/generated/resources/assets/create/lang/unfinished/ru_ru.json
# src/generated/resources/assets/create/lang/unfinished/zh_cn.json
# src/generated/resources/assets/create/lang/unfinished/zh_tw.json
2021-05-01 16:18:32 -07:00
PepperBell
ffd4c75572
Merge remote-tracking branch 'upstream/mc1.16/dev' into
...
mc1.16/model-cleanup
Conflicts:
src/main/java/com/simibubi/create/content/curiosities/tools/DeforesterItemRenderer.java
src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperItemRenderer.java
2021-05-01 15:46:50 -07:00
PepperBell
9be5a3ec2a
Cleanup
2021-05-01 15:41:03 -07:00
simibubi
8fff3d6745
The great second purge of Tools
...
- Removed the Blockzapper
- Removed the Deforester
- Handheld Worldshaper -> Creative Worldshaper
- Worldshapers now have a "surface" and "cluster" brush type
- Worldshapers now follow the creative colour palette
- Some UI touch-ups for tools
2021-05-01 13:19:01 +02:00
JozsefA
dc3517eb3a
Inversion
2021-04-30 14:28:18 -07:00
JozsefA
37e8e87553
Merge branch 'mc1.16/dev' into mc1.16/chromatic-projector
...
# Conflicts:
# src/main/java/com/simibubi/create/foundation/render/backend/Backend.java
# src/main/java/com/simibubi/create/foundation/render/backend/ShaderLoader.java
# src/main/java/com/simibubi/create/foundation/render/backend/core/BasicProgram.java
# src/main/java/com/simibubi/create/foundation/render/backend/gl/GlBuffer.java
# src/main/java/com/simibubi/create/foundation/render/backend/gl/GlVertexArray.java
# src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/FogSensitiveProgram.java
# src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/GlProgram.java
# src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/ProgramSpec.java
# src/main/java/com/simibubi/create/foundation/render/backend/gl/versioned/GlCompat.java
# src/main/java/com/simibubi/create/foundation/render/backend/gl/versioned/instancing/DrawInstanced.java
# src/main/java/com/simibubi/create/foundation/render/backend/gl/versioned/instancing/InstancedArrays.java
# src/main/java/com/simibubi/create/foundation/render/backend/gl/versioned/instancing/VertexArrayObject.java
# src/main/java/com/simibubi/create/foundation/render/backend/instancing/InstancedModel.java
# src/main/java/com/simibubi/create/foundation/render/backend/instancing/RenderMaterial.java
2021-04-30 12:15:32 -07:00
JozsefA
c9718b0a1b
No more compartments in Flywheel.
...
It never really needed them in the first place.
2021-04-30 00:31:52 -07:00
JozsefA
322496f3b4
Reformat backend
2021-04-29 17:19:08 -07:00
JozsefA
d9b04138df
Whoops flywheels are straight again
2021-04-29 15:12:08 -07:00
JozsefA
063e98983f
Oh god the line endings
...
- Isolate AllBlockPartials to PartialModel
- Further cleanup to PartialBufferer
2021-04-29 14:03:52 -07:00
JozsefA
446b24f1cf
Random stuff
...
- Multiply by 31 in some hash functions
- Remove unused render utility classes
2021-04-29 11:44:45 -07:00
JozsefA
e33ab160ac
Start to cleanup the AllBlockPartials methods
2021-04-28 22:47:51 -07:00
JozsefA
81b0cf77e1
Contraption renderer checks for flywheel worlds
...
- Should fix an issue with smaller units
2021-04-28 22:08:45 -07:00
PepperBell
80921ebd6b
Remove ISimpleReloadListener lambda types
2021-04-28 21:25:06 -07:00
PepperBell
9140c2ad4c
Merge branch 'mc1.16/dev' of https://github.com/Creators-of-Create/Create.git into mc1.16/dev
2021-04-28 13:38:26 -07:00
PepperBell
61f2a35a61
Add ISimpleReloadListener
...
ISimpleReloadListener is a reload listener functional interface meant to
be used when preparation is not needed. All current reload listeners
have been moved to this interface, which allows them to be lambdas and
not have to create a new Object for every reload.
2021-04-28 13:37:21 -07:00
zelophed
f47feee20d
its called padding
...
- also includes some more changes to theme and colors
2021-04-28 21:44:03 +02:00
JozsefA
18d23f69e0
Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector
...
# Conflicts:
# src/generated/resources/.cache/cache
# src/generated/resources/assets/create/lang/en_us.json
# src/generated/resources/assets/create/lang/unfinished/de_de.json
# src/generated/resources/assets/create/lang/unfinished/es_es.json
# src/generated/resources/assets/create/lang/unfinished/es_mx.json
# src/generated/resources/assets/create/lang/unfinished/fr_fr.json
# src/generated/resources/assets/create/lang/unfinished/it_it.json
# src/generated/resources/assets/create/lang/unfinished/ja_jp.json
# src/generated/resources/assets/create/lang/unfinished/ko_kr.json
# src/generated/resources/assets/create/lang/unfinished/nl_nl.json
# src/generated/resources/assets/create/lang/unfinished/pt_br.json
# src/generated/resources/assets/create/lang/unfinished/ru_ru.json
# src/generated/resources/assets/create/lang/unfinished/zh_cn.json
# src/generated/resources/assets/create/lang/unfinished/zh_tw.json
2021-04-28 12:42:41 -07:00
simibubi
ab6b18e42d
SoundScapes, Part III
...
- Increased minimum sound threshold for ambient noise
- Sounds for contraption (dis-)assembly
- Sounds for more wrench interactions
- Hand crank clicks less furiously
- Block breakers now make block breaking noises
- Crafting noises
2021-04-28 17:55:05 +02:00
JozsefA
54f5783489
More versatile ui/settings
...
- The channel mask still needs work
- Add contrast filter
2021-04-28 00:01:26 -07:00
simibubi
35d0ce8387
Widget resize
...
- Condensed the main reading space of config UIs
- Reworked some of the widgets to better arrange themselves in a column
2021-04-27 20:07:29 +02:00
zelophed
de00f90a37
pondering all over again
2021-04-27 02:48:50 +02:00
zelophed
c85870ea2d
boxing elements
2021-04-25 19:54:18 +02:00
JozsefA
70188889be
Persistence is key
...
- Projectors now remember their setting and sync between clients
2021-04-23 17:20:16 -07:00
JozsefA
e8ab21c184
More polish
...
- UI icons
- Color masking
- Better scroll ux
- FilterSphere now has its own file
2021-04-23 14:38:31 -07:00
zelophed
33028e1087
please confirm
2021-04-23 18:11:32 +02:00
JozsefA
3879d55517
Better projector gui
2021-04-22 23:42:49 -07:00
JozsefA
fc919c4ac4
Basic projector gui
2021-04-22 16:02:16 -07:00
JozsefA
7b7c6ef3c5
Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector
...
# Conflicts:
# src/main/java/com/simibubi/create/AllBlocks.java
2021-04-20 14:07:54 -07:00
JozsefA
f75422f895
Instruction parallel ray sphere intersection
2021-04-20 14:05:50 -07:00
simibubi
559146ef04
SoundScapes, Part II
...
- Picking items off belts, depots, basins
- Arms collecting an item
- Mixing noises
- Cranking click noises
- Scroll-input noises
2021-04-20 17:26:46 +02:00
simibubi
9391700c26
SoundScapes, Part I
...
- Sounds for depots, funnels, cogwheels and generic kinetic rumbling, also fans
2021-04-20 02:19:12 +02:00
JozsefA
e50590f6b7
Start working on the blocks
...
- Also better control and visuals
2021-04-18 22:23:41 -07:00
tterrag
9697a30d76
Remove references to antlr IntegerList in favor of fastutil IntList
2021-04-18 14:04:08 -04:00
JozsefA
a6248daf7e
Better spheres and framebuffer compat layer
2021-04-17 18:55:29 -07:00
