Commit graph

1328 commits

Author SHA1 Message Date
JozsefA
7aa175dd9c fix gantry cogs skipping every half rotation 2021-02-16 15:13:48 -08:00
Franco Paladini
ed04fd1d52
Update es_es.json 2021-02-16 19:54:49 -03:00
JozsefA
d2e30eeab5 finish merge
remove old assets
2021-02-16 14:47:03 -08:00
Zelophed
bec13b8e7d Assisted Placement, Part IV-b 2021-02-16 22:50:11 +01:00
grimmauld
c6f82bff5e Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2021-02-16 20:29:40 +01:00
simibubi
fd99acc00a Merge branch 'mc1.15/dev' into mc1.15/ponder-ui 2021-02-16 19:36:12 +01:00
simibubi
18067e8d5c Ponder
- rebrand
- support for particles
- support for fluids
- support for outliner
- coloured text labels
- debug scenes
- proper UI stuff
- proper layered rendering
2021-02-16 19:35:26 +01:00
Franco Paladini
e4fe371d4c
Add Spanish language (es_es) (unfinished) 2021-02-16 13:59:05 -03:00
JozsefA
15302495f5 Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/experimental-rendering-merge
# Conflicts:
#	src/main/java/com/simibubi/create/AllEntityTypes.java
#	src/main/java/com/simibubi/create/AllSpriteShifts.java
#	src/main/java/com/simibubi/create/content/contraptions/base/KineticTileEntity.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/OrientedContraptionEntityRenderer.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/MechanicalBearingTileEntity.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MountedContraption.java
#	src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerRenderer.java
#	src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltRenderer.java
#	src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltTileEntity.java
#	src/main/java/com/simibubi/create/foundation/command/AllCommands.java
#	src/main/java/com/simibubi/create/foundation/utility/outliner/Outliner.java
2021-02-15 21:27:08 -08:00
Zelophed
b9d1a586c1 Assisted Placement, Part IV
- added 👻-blocks as a placement preview
2021-02-16 00:48:13 +01:00
JozsefA
1e95fe4c7b avoid floating point accuracy errors at high coordinate values.
refactor contraption model translation to be a method in AbstractContraptionEntity.
 - this simplifies the setup required for the fast rendering.
2021-02-14 23:09:17 -08:00
Snownee
5e14ca71d9 Add max stack size check to ItemHelper.extract 2021-02-14 11:51:31 +08:00
Snownee
676a05ad07 Fix rose quartz duplication glitch (#1104) 2021-02-14 11:18:38 +08:00
JozsefA
11616a0b16 avoid 'glGet's at all costs 2021-02-13 16:26:34 -08:00
JozsefA
951a0c4769 contraption actors take into account self lighting 2021-02-13 13:10:14 -08:00
JozsefA
0ad6db4bf7 cache KTEs' renderBoundingBox 2021-02-12 23:06:41 -08:00
Snownee
2d2c7e653f Avoid unnecessary piston contraption assembling 2021-02-13 14:14:28 +08:00
JozsefA
b1905ddfd4 probably fix issue with phosphor crashing contraptions 2021-02-12 21:11:35 -08:00
Snownee
dae651c046 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2021-02-13 13:06:11 +08:00
JozsefA
e88dd89262 whoops null pointer is no more 2021-02-12 19:33:13 -08:00
JozsefA
485a0d2f95 hotswapping is more sane now. 2021-02-12 17:30:21 -08:00
JozsefA
a5f3d799d1 kinda separate system capability stuff, should probably clean this up more.
fix lighting glitches on world load.
2021-02-12 16:36:20 -08:00
simibubi
8ab27904db More Instructions 2021-02-12 17:08:48 +01:00
JozsefA
d824304f12 tile entities on contraptions account for self lighting 2021-02-12 00:13:39 -08:00
JozsefA
a8053ce472 these are somewhere else too 2021-02-11 23:41:52 -08:00
JozsefA
31a1fd71ce everything is somewhere else 2021-02-11 23:36:05 -08:00
JozsefA
67408e0dff better vertex attributes.
all shaders are now GL 2.0 compatible!!!
contraption structure rendering is technically 2.0 compatible now, need some better handling for that.
2021-02-11 20:03:24 -08:00
Zelophed
34de9a0319 Player Feedback, Part III 2021-02-12 03:13:19 +01:00
JozsefA
576165e3d6 some attrib stuff 2021-02-11 14:31:50 -08:00
Zelophed
82e922032a Merge branch 'mc1.15/feedback2' into mc1.15/dev
# Conflicts:
#	src/generated/resources/.cache/cache
#	src/generated/resources/assets/create/lang/unfinished/de_de.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/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingContraption.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/ClockworkContraption.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/StabilizedContraption.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MountedContraption.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonContraption.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyContraption.java
2021-02-11 20:07:38 +01:00
Zelophed
b4c881a6c8 Player Feedback, Part II 2021-02-11 17:47:55 +01:00
muffinbarde
5f6c94939c
Update de_de.json 2021-02-11 17:21:05 +01:00
JozsefA
3820e11954 get it working again 2021-02-11 02:26:30 -08:00
JozsefA
02114b1d9a begin 2.0 compatibility push, probably not going to be ready for the next release 2021-02-10 17:14:03 -08:00
Zelophed
f3fd32edd3 Assisted Placement, Part III
- blocks placed by helpers make sounds again
- helpers now trigger the proper event and can be cancelled
2021-02-11 00:28:47 +01:00
simibubi
fd3d7bd7fd Refined animations, key input 2021-02-10 16:40:30 +01:00
JozsefA
e93562569b world fog works, fluid fog still doesn't.
better dimension changes.
2021-02-09 21:18:05 -08:00
CKenJa
a8b1fe5f90 Localize Fixes 2021-02-10 13:07:41 +09:00
simibubi
e178cab4a8 Multiple scenes per doc 2021-02-10 03:13:33 +01:00
JozsefA
0cb9094913 non experimental contraption rendering is back.
schematic rendering is fixed.
both of these are kinda ugly hacks, and there is definitely some rewriting necessary for when it's time to be more opengl compatible.

maybe fix belt lighting, again.
remove old belt assets.
2021-02-09 16:14:44 -08:00
simibubi
6836bd97f4 First Steps 2021-02-09 22:34:14 +01:00
JozsefA
6736577e1b fix the rainbow debugger 2021-02-08 21:38:45 -08:00
JozsefA
cfff806df4 some micro optimizations.
cache hot getters.
reduce number of calls to getBeltFacing() in BeltRenderer.
preserve floating point accuracy over (insanely) long play times.
rotate some normals and light some quads.
2021-02-08 21:17:25 -08:00
simibubi
4a5479838c Merge branch 'mc1.15/dev' into mc1.15/metadoc 2021-02-08 16:51:52 +01:00
Snownee
607dbbfb90 Fix PSI item dupe 2021-02-08 22:40:55 +08:00
JozsefA
ee9962b27b fix some new rendering issues that popped up after the revert
proper? optifine shader handling. could use more testing
2021-02-07 22:11:29 -08:00
JozsefA
c9ff31b099 hot swappable rendering
kind of detects optifine
still some kinks to work out
2021-02-07 14:15:52 -08:00
Chexet48
05e62ced51
Update it_it.json 2021-02-07 22:51:43 +01:00
simibubi
cb2c56d772 Gantry shaft placement assist 2021-02-07 18:09:08 +01:00
Snownee
16991c2ce8 Fix NPE while deployer on a contraption trying to disassemble self 2021-02-07 15:49:25 +08:00