Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
974ebe6937930a29bb9edfe97dd9b30365d9323a
Mindustry/core/assets
History
Anuken 974ebe6937 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/content/Blocks.java
2021-06-05 11:57:14 -04:00
..
baseparts
Generic node/bridge placement system
2020-12-18 12:41:13 -05:00
bloomshaders
Partial 7.0 merge - API preview
2021-06-02 11:08:08 -04:00
bundles
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
2021-06-05 11:57:14 -04:00
cubemaps/stars
Added cubemap stars
2020-03-29 19:39:29 -04:00
cursors
Cursor antialiasing
2019-08-04 09:41:25 -04:00
fonts
Add fixed font.woff
2020-11-22 12:59:42 +02:00
icons
Unspoiled
2021-06-02 11:15:30 -04:00
maps
Partial 7.0 merge - API preview
2021-06-02 11:08:08 -04:00
music
Converted music to mp3 / New tracks / Minor cleanup
2020-11-09 17:02:36 -05:00
scripts
Partial 7.0 merge - API preview
2021-06-02 11:08:08 -04:00
shaders
Partial 7.0 merge - API preview
2021-06-02 11:08:08 -04:00
sounds
Serializable -> JsonSerializable
2021-02-12 15:41:28 -05:00
sprites
Unspoiled
2021-06-02 11:15:30 -04:00
contributors
I would like to join contributor gang (#5327)
2021-06-02 08:51:55 -04:00