Commit Graph

3807 Commits

Author SHA1 Message Date
Anuken
6d30840eb1 Fixed #1358 2020-01-11 12:57:21 -05:00
Anuken
35835cacd3 Fixed #1355 2020-01-11 12:47:54 -05:00
Anuken
fbedc95ad9 Mesh-based rendering 2020-01-11 10:44:07 -05:00
Anuken
f26e0b4609 Hexagonal planet 2020-01-11 00:39:37 -05:00
Anuken
f918cdeced More rendering stuff 2020-01-10 20:27:10 -05:00
Anuken
6f3c771d73 Refactoring 2020-01-10 17:28:37 -05:00
Anuken
49137d4f58 an actual planet 2020-01-10 15:54:39 -05:00
Anuken
e45df98f26 Merge branch 'master' of https://github.com/Anuken/Mindustry into 6.0
# Conflicts:
#	core/src/mindustry/graphics/Bloom.java
#	gradle.properties
2020-01-10 15:19:07 -05:00
Anuken
677aa0d0bf Shortening of a few classes 2020-01-10 15:13:34 -05:00
Anuken
b123b8b074 Removed Mech/UnitType 2020-01-10 15:08:13 -05:00
Anuken
18e73b1a4a Fixed mech pad indicators displaying onscreen 2020-01-10 11:39:38 -05:00
Anuken
f7791a2bb2 Merge; internal changes 2020-01-10 11:30:42 -05:00
Patrick 'Quezler' Mounier
ed765ad10a Merge branch 'master' into crater
# 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
2020-01-10 12:02:07 +01:00
Anuken
6050274c0f Bugfixes 2020-01-09 14:56:21 -05:00
Anuken
e06f514023 Added basic subnet bans 2020-01-09 12:03:45 -05:00
Anuken
50355b45d5 Tech tree balance 2020-01-08 23:28:25 -05:00
Anuken
a7cddf97b8 Implemented bridge opacity from #1006 2020-01-08 16:16:19 -05:00
Anuken
7b4ee27fe4 Bugfixes 2020-01-08 11:37:12 -05:00
Anuken
8f208920f7 Merged in liquid void 2020-01-08 11:04:12 -05:00
Patrick 'Quezler' Mounier
406c11a14d Make rebuildable a block attribute (#1338) 2020-01-08 10:28:28 -05:00
Anuken
6e5d506a35 Stub implementation of action filters 2020-01-08 09:37:18 -05:00
Patrick 'Quezler' Mounier
5f047603bf Revert "Blend prototype"
This reverts commit 35afc94d34.

# Conflicts:
#	core/assets/sprites/sprites.png
2020-01-08 12:17:28 +01:00
Patrick 'Quezler' Mounier
0f2f8f2411 Revert "Stash cursed loading dock"
This reverts commit 9bdf475049.
2020-01-08 10:42:34 +01:00
Patrick 'Quezler' Mounier
9bdf475049 Stash cursed loading dock 2020-01-08 10:41:09 +01:00
Patrick 'Quezler' Mounier
35afc94d34 Blend prototype 2020-01-08 10:27:06 +01:00
Anuken
f4a819ba28 Fixed text wrapping for credits in Russian 2020-01-07 20:14:11 -05:00
Anuken
cf5e8c6463 Point planet renderer 2020-01-07 20:09:21 -05:00
Anuken
c183b2dac4 Fixed incorrect variable usage 2020-01-07 15:54:51 -05:00
Anuken
1f3bab5fa3 Added untested rate limits 2020-01-07 14:16:48 -05:00
Anuken
6f25ba4541 squares. 2020-01-07 13:55:45 -05:00
Anuken
c611ce9d58 Removed old Matrix4 class 2020-01-07 11:16:04 -05:00
Anuken
3e0556de05 Merge remote-tracking branch 'origin/master' 2020-01-07 10:32:39 -05:00
Anuken
7a71468388 Updated arc hash just in case 2020-01-07 10:32:34 -05:00
Anuken
c8980163e9 3D progress 2020-01-07 10:32:00 -05:00
DeltaNedas
b0d65dcedb let mechs override drawStats and do custom power cell stuff (#1309)
* let mechs override drawStats and do custom power cell stuff

* Update Player.java

* Update Mech.java

* Update Player.java
2020-01-07 09:30:18 -05:00
Patrick 'Quezler' Mounier
8fc84fad0a Scale foobar correctly with different capacities 2020-01-07 10:48:31 +01:00
Patrick 'Quezler' Mounier
12c3b22b7c Fix poofing ¬ working if conveyor was backed up 2020-01-07 10:44:37 +01:00
Patrick 'Quezler' Mounier
252817abb7 Bar 2020-01-07 10:33:58 +01:00
Patrick 'Quezler' Mounier
781fbb6255 Foo 2020-01-07 10:33:04 +01:00
Patrick 'Quezler' Mounier
add19ed7f1 Start rotating 50% through reload 2020-01-07 10:17:24 +01:00
Anuken
81602dc3d5 Cleanup 2020-01-07 00:25:33 -05:00
Anuken
c474b082cd Cleanup 2020-01-07 00:24:37 -05:00
Anuken
b730cd52d5 GL cleanup 2020-01-06 23:47:29 -05:00
Anuken
3ae8065cf1 Merge 2020-01-06 17:20:16 -05:00
Anuken
7f23803db1 Visual changes 2020-01-06 16:25:08 -05:00
Patrick 'Quezler' Mounier
ecae603f50 Prevent (world border) crash
Learned my lesson from the diode :)
2020-01-06 18:13:40 +01:00
Patrick 'Quezler' Mounier
0b3d4da92d Block trading 2020-01-06 18:12:10 +01:00
Patrick 'Quezler' Mounier
6e8ba927dd Final cleanup before the draft phase ends ❤️ 2020-01-06 18:09:19 +01:00
Patrick 'Quezler' Mounier
207d95dbd8 Refractor away throughput stat 2020-01-06 17:57:14 +01:00
Patrick 'Quezler' Mounier
78951113d6 Remove maxunits stat entry 2020-01-06 17:55:02 +01:00