Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,283 Commits 4 Branches 180 Tags
ad248e2e202ddfd7dc2cc0c06fb4ec37064fcec4
Commit Graph

101 Commits

Author SHA1 Message Date
Anuken
ad248e2e20 Autogeneration of some IO code 2020-02-13 13:30:30 -05:00
Anuken
47f075133f Merge 2020-02-13 11:22:29 -05:00
Anuken
e798619679 Bugfixes 2020-02-12 11:25:00 -05:00
Anuken
5c48ae2158 Fixed #1558 / Fixed #1556 2020-02-12 10:16:43 -05:00
Anuken
bb380f7feb Fixed #1555 2020-02-11 23:15:51 -05:00
Anuken
6fd0205495 Merge 2020-02-11 19:55:02 -05:00
Anuken
fb302d49c7 Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
Anuken
a4a3e7fc48 Merge pull request #1514 from Arkanic/patch-7 
make batteries glow based on power contents (a redo that works)
 2020-02-11 16:31:14 -05:00
Anuken
1b94eed9d3 Fixed conveyors blending with enemy teams 2020-02-11 15:54:16 -05:00
Anuken
d1840e7c2a Item selection scrolling 2020-02-11 11:55:38 -05:00
Anuken
d6b5f6a311 buildTable improvements 2020-02-11 11:30:22 -05:00
Anuken
6c6861a97a Cleanup 2020-02-10 10:47:21 -05:00
Anuken
e9b066b866 Fires, puddles, feature reimplementations 2020-02-09 23:43:08 -05:00
Anuken
a2706a80b1 Merged with master 2020-02-09 12:27:44 -05:00
Anuken
e23119e330 Feature re-implementations 2020-02-08 21:54:41 -05:00
Anuken
ba1f59aa71 Better physics 2020-02-08 15:39:27 -05:00
Anuken
0ffcd0b94c Fixed #1507 / Fixed #1504 2020-02-07 20:21:45 -05:00
Anuken
e5fd3dec4c Fixed #1526 2020-02-07 20:09:37 -05:00
Anuken
70c06b58ef Conveyor cleanup 2020-02-06 11:38:36 -05:00
Anuken
dfecfa3964 . 2020-02-05 20:11:49 -05:00
Patrick 'Quezler' Mounier
e06d8eabec [formatting] add newline to file(s) (#1508) 
* Trail appropriate files with a new line

* For some ironic reason it ignored itself

Probably because it wasn’t tracked/commited yet.

* Rename newlines to server executable naming pattern
 2020-02-05 18:36:56 -05:00
Anuken
f6b1420103 c l e a n u p 2020-02-05 18:28:19 -05:00
Anuken
84748afc55 the errors are back 2020-02-05 15:00:35 -05:00
Anuken
da97aee8e4 it never ends 2020-02-05 13:03:22 -05:00
Arkanic
ff06a005a0 become exist 2020-02-05 00:53:15 +00:00
Arkanic
fd500f5405 heh make branch 2020-02-05 13:27:36 +13:00
Anuken
a7b39e56bd Cleanup continues 2020-02-04 18:00:32 -05:00
Anuken
012421afcb Class ID mapping 2020-02-04 13:57:42 -05:00
Anuken
be50997f94 Merge branches '6.0' and 'splinterface-impl' of https://github.com/Anuken/Mindustry into splinterface-impl 
# Conflicts:
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites3.png
#	core/assets/sprites/sprites5.png
#	core/src/mindustry/Vars.java
#	core/src/mindustry/entities/traits/SaveTrait.java
#	core/src/mindustry/maps/generators/MapGenerator.java
#	core/src/mindustry/ui/dialogs/DeployDialog.java
#	core/src/mindustry/world/blocks/Floor.java
#	desktop/src/mindustry/desktop/DesktopLauncher.java
#	gradle.properties
 2020-02-04 12:25:18 -05:00
Anuken
36b9451e01 Read-only component fields / Removed get/set prefix 2020-02-04 12:14:09 -05:00
Anuken
006004fd70 Decal cleanup 2020-02-04 09:39:12 -05:00
Anuken
a942ed2cad More cleanup 2020-02-03 20:24:49 -05:00
Anuken
141cf518a2 Refactoring 2020-02-03 14:07:06 -05:00
Anuken
f937cb30f0 More components, less entities 2020-02-02 23:38:16 -05:00
Anuken
f2f31120a0 Gradual component conversion 2020-02-02 20:17:22 -05:00
Anuken
89e1c5afc0 Conveyor tweaks 2020-01-28 00:21:05 -05:00
Anuken
ad6e0bcd0f Merge branches 'master' and 'mech-rework' of https://github.com/Anuken/Mindustry into mech-rework 
# Conflicts:
#	android/src/mindustry/android/AndroidLauncher.java
#	annotations/src/main/java/mindustry/annotations/SerializeAnnotationProcessor.java
#	annotations/src/main/java/mindustry/annotations/impl/AssetsAnnotationProcessor.java
#	build.gradle
#	core/assets-raw/fontgen/config.json
#	core/assets/bundles/bundle_cs.properties
#	core/assets/bundles/bundle_it.properties
#	core/assets/fonts/font.ttf
#	core/assets/fonts/icon.ttf
#	core/assets/icons/icons.properties
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites3.png
#	core/assets/sprites/sprites5.png
#	core/src/mindustry/content/UnitTypes.java
#	core/src/mindustry/core/NetClient.java
#	core/src/mindustry/core/NetServer.java
#	core/src/mindustry/entities/bullet/BulletType.java
#	core/src/mindustry/entities/type/TileEntity.java
#	core/src/mindustry/maps/filters/FilterOption.java
#	core/src/mindustry/mod/Scripts.java
#	core/src/mindustry/ui/Fonts.java
#	core/src/mindustry/ui/dialogs/DeployDialog.java
#	core/src/mindustry/ui/fragments/HudFragment.java
#	core/src/mindustry/ui/fragments/MenuFragment.java
#	core/src/mindustry/world/blocks/production/Cultivator.java
#	core/src/mindustry/world/blocks/units/CommandCenter.java
#	gradle.properties
#	tools/src/mindustry/tools/FontGenerator.java
 2020-01-27 15:51:02 -05:00
Anuken
5ad0193a86 Fixed reduced conveyor edge throughput 2020-01-27 13:15:12 -05:00
Anuken
65211a6021 Fixed #1447 2020-01-27 11:01:48 -05:00
Anuken
a61234d21e Minor tweaks 2020-01-26 21:50:55 -05:00
Anuken
9baaacc8ac Crash fix 2020-01-26 16:55:24 -05:00
Anuken
621233a5b3 More optimization 2020-01-26 16:12:11 -05:00
Anuken
9a3245c23e Clamp 2020-01-26 15:13:55 -05:00
Anuken
6fe2697185 2x faster conveyor optimization 2020-01-26 15:04:00 -05:00
Anuken
adbfb15932 Cleanup 2020-01-26 13:13:01 -05:00
Anuken
93cada6a16 Conveyor benchmark test 2020-01-26 11:40:09 -05:00
Anuken
923d576a5f Fixed #1436 / Fixed crawlers not exploding 2020-01-24 23:21:23 -05:00
Anuken
f2bc3e78d7 Fixed #1429 2020-01-24 14:00:06 -05:00
Anuken
2fe6a3525b Added null check for attribute 2020-01-24 13:37:23 -05:00
Anuken
b9876e267b Headless load fix 2020-01-24 12:31:34 -05:00