JozsefA
d2e30eeab5
finish merge
...
remove old assets
2021-02-16 14:47:03 -08: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
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
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
JozsefA
b1905ddfd4
probably fix issue with phosphor crashing contraptions
2021-02-12 21:11:35 -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
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
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
JozsefA
e93562569b
world fog works, fluid fog still doesn't.
...
better dimension changes.
2021-02-09 21:18:05 -08: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
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
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
simibubi
cb2c56d772
Gantry shaft placement assist
2021-02-07 18:09:08 +01:00
JozsefA
3e6ef34993
restore arm rendering
2021-02-06 14:39:58 -08:00
simibubi
6981848f8a
Clean-up
...
- Fixed smart chutes not filtering properly
- Fixed chutes not treating smart chutes like chutes
- Removed code leftovers
- Removed datagen cache from gitignore
2021-02-06 22:41:20 +01:00
simibubi
2315625c4b
Quickfix
...
- Fixed gantry shafts able to cause loops in kinetic connectivity when switching to powered state
2021-02-06 18:11:35 +01:00
simibubi
88f80c6240
Refresh unfinished/fr_fr template file
2021-02-06 17:48:03 +01:00
simibubi
ed997ec85b
Merge pull request #1039 from dindin-glitch/patch-2
...
Update fr_fr.json
2021-02-06 17:45:42 +01:00
Odin
577c0e4912
Update fr_fr.json
...
666 Unlocalized
2021-02-06 17:34:37 +01:00
simibubi
bed5a1d03a
Merge pull request #965 from Snownee/mc1.15/security-patches
...
Security patches
2021-02-06 17:20:58 +01:00
simibubi
85110f3ce8
Merge pull request #906 from Snownee/mc1.15/dev
...
Bug fixes
2021-02-06 16:23:35 +01:00
simibubi
3d8b10d9a7
Gantry improvements
...
- Fixed gantry shafts not locking to correct orientations when placed near others
- Gantry pinions can now be kickstarted by player interaction
- Gantry pinions now update properly after being moved onto different gantry shafts
- Fixed Encased Fans not providing kinetic power after being moved by contraption
- Sticky Mechanical Pistons now drag attached structures with them
- Mechanical piston heads and poles now drag their entire piston multiblock with them
2021-02-06 16:07:22 +01:00
JozsefA
5ba4477ada
restore old tile rendering from 3336778052
2021-02-06 02:26:56 -08:00
JozsefA
2aa06b0786
useful debug arg in build.gradle
2021-02-05 22:50:07 -08:00
JozsefA
90993ce8e1
start working on schematic rendering
2021-02-05 22:48:55 -08:00
Snownee
25daf28205
Format codes
2021-02-06 04:21:07 +08:00
Snownee
2baa3f9922
Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/security-patches
2021-02-06 04:16:26 +08:00
simibubi
ff96e80d81
ru_ru.json
...
- Integrated changes to russian localization made by #819 on correct branch to the correct file
2021-02-05 20:31:49 +01:00
simibubi
b3ee203701
fr_fr.json
...
- Reorganize localization file
2021-02-05 20:11:52 +01:00
simibubi
4a357bb729
Merge pull request #1027 from dindin-glitch/patch-2
...
Translated a bunch of random things
2021-02-05 20:05:42 +01:00
simibubi
16e871feba
it_it.json
...
- Move lang file to correct location
2021-02-05 20:02:39 +01:00
simibubi
0b55ba2c55
Merge pull request #967 from Chexet48/patch-1
...
Update it_it.json
2021-02-05 19:59:56 +01:00
simibubi
ed84343f38
Merge branch 'mc1.15/dev' into patch-1
2021-02-05 19:59:43 +01:00
simibubi
60c66980c6
datagen pass
2021-02-05 19:55:50 +01:00
simibubi
df6b92cf19
Merge pull request #985 from dunois2737/mc1.15/dev
...
Create zh_tw.json
2021-02-05 19:52:19 +01:00
