Patrick 'Quezler' Mounier
|
424e58ff7d
|
Merge branch 'master' into crater
|
2020-04-16 11:20:16 +02:00 |
|
Patrick 'Quezler' Mounier
|
68c20ae728
|
Complete me senpai (#1810)
|
2020-04-03 10:48:51 -04:00 |
|
Patrick 'Quezler' Mounier
|
74e94e5344
|
Merge branch 'master' into crater
|
2020-04-02 12:05:04 +02:00 |
|
Anuken
|
767719d410
|
Power balance tweak
|
2020-03-27 18:23:02 -04:00 |
|
whert-dev
|
1e1fbbc37b
|
Bind plasma sprite's size to reactor's size (#1754)
This will be useful for modded ImpactReactors that have different sizes. (Please correct my code if it is wrong).
|
2020-03-25 19:55:33 -04:00 |
|
Patrick 'Quezler' Mounier
|
104fd78966
|
Collapse while
|
2020-03-23 17:07:11 +01:00 |
|
Patrick 'Quezler' Mounier
|
6b27d19057
|
Alter comments
|
2020-03-23 17:05:03 +01:00 |
|
Patrick 'Quezler' Mounier
|
6228b5353f
|
Pack dump into conveyor rotation
|
2020-03-23 17:01:47 +01:00 |
|
Anuken
|
966321baca
|
Merge remote-tracking branch 'origin/master'
|
2020-03-19 20:02:48 -04:00 |
|
Anuken
|
f2f39573bb
|
Color cleanup
|
2020-03-19 20:02:43 -04:00 |
|
Patrick 'Quezler' Mounier
|
4f195b72d1
|
Merge branch 'master' into crater
|
2020-03-15 22:00:51 +01:00 |
|
ma44
|
ec34e27102
|
map setting refund (#1709)
|
2020-03-15 14:02:47 -04:00 |
|
Patrick 'Quezler' Mounier
|
f931469132
|
This does ¬ seem nececary anymore somehow
|
2020-03-06 18:08:18 +01:00 |
|
Patrick 'Quezler' Mounier
|
73414d7c2a
|
Collapse if
|
2020-03-06 14:59:12 +01:00 |
|
Patrick 'Quezler' Mounier
|
c1f025db52
|
Rename reload to cooldown
|
2020-03-06 14:57:11 +01:00 |
|
Patrick 'Quezler' Mounier
|
087aef6b85
|
Move capacity into crater
|
2020-03-06 11:06:35 +01:00 |
|
Patrick 'Quezler' Mounier
|
7ddcd93a57
|
Use extended position
|
2020-03-06 10:28:49 +01:00 |
|
Patrick 'Quezler' Mounier
|
caa25b811b
|
Condense single use rotation
|
2020-03-06 10:22:37 +01:00 |
|
Patrick 'Quezler' Mounier
|
5a60ab1d2a
|
Privatize drawer
|
2020-03-06 10:20:47 +01:00 |
|
Patrick 'Quezler' Mounier
|
8a25d57c83
|
This looks good to
|
2020-03-06 10:17:02 +01:00 |
|
Patrick 'Quezler' Mounier
|
c5de6706e0
|
Eyecandyfi
|
2020-03-06 10:14:52 +01:00 |
|
Patrick 'Quezler' Mounier
|
f50ee2ecf2
|
Try to clean up the end of tile logic
|
2020-03-06 09:52:28 +01:00 |
|
Patrick 'Quezler' Mounier
|
11fc494284
|
Clean up transfer code
|
2020-03-06 09:34:09 +01:00 |
|
Patrick 'Quezler' Mounier
|
e05f755a4e
|
Remove unused import
|
2020-03-05 21:30:18 +01:00 |
|
Patrick 'Quezler' Mounier
|
44bff5b7cf
|
Remove conveyor integration remnants
|
2020-03-05 21:29:19 +01:00 |
|
Patrick 'Quezler' Mounier
|
e2b9977ebc
|
Remove omnidirectional due to issues
|
2020-03-05 21:27:28 +01:00 |
|
Patrick 'Quezler' Mounier
|
3e51abf6eb
|
Try to fix blending with omnidirectional
|
2020-03-05 21:24:51 +01:00 |
|
Patrick 'Quezler' Mounier
|
c1f765a467
|
Bodge in a rotational blend bypass
|
2020-03-05 20:26:34 +01:00 |
|
Patrick 'Quezler' Mounier
|
e67667e4a3
|
Remove preemtive unload
|
2020-03-05 20:09:09 +01:00 |
|
Patrick 'Quezler' Mounier
|
4a3e00f822
|
Fix early return
|
2020-03-05 15:21:41 +01:00 |
|
Patrick 'Quezler' Mounier
|
6fb4c79f82
|
Fix sleeping while reloading
|
2020-03-05 14:29:27 +01:00 |
|
Patrick 'Quezler' Mounier
|
9c75133fc8
|
Blend tripod dumper with conveyors
|
2020-03-05 14:21:41 +01:00 |
|
Patrick 'Quezler' Mounier
|
fd61add2e4
|
Cleanup update loop
|
2020-03-05 14:10:28 +01:00 |
|
Patrick 'Quezler' Mounier
|
acd695a469
|
Messy cleanup
|
2020-03-05 13:40:44 +01:00 |
|
Patrick 'Quezler' Mounier
|
5036506547
|
Rotate smoother
|
2020-03-05 13:28:23 +01:00 |
|
Patrick 'Quezler' Mounier
|
b0becbad38
|
Fix unloading prematurely
|
2020-03-05 13:22:50 +01:00 |
|
Patrick 'Quezler' Mounier
|
ecb09c0f04
|
Dump like bridges do
|
2020-03-05 12:11:55 +01:00 |
|
Patrick 'Quezler' Mounier
|
2025c7c669
|
Fix mech dropoff ¬ working
|
2020-03-05 10:35:48 +01:00 |
|
Patrick 'Quezler' Mounier
|
00249f62b6
|
Cleanup if chains
|
2020-03-05 10:28:10 +01:00 |
|
Patrick 'Quezler' Mounier
|
9bc340ba17
|
Fix end ¬ rendering
|
2020-03-05 10:08:22 +01:00 |
|
Patrick 'Quezler' Mounier
|
79c965bf8d
|
Move sleep detector to renderer
|
2020-03-05 10:08:15 +01:00 |
|
Patrick 'Quezler' Mounier
|
e5e4884448
|
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
# core/src/mindustry/world/modules/ItemModule.java
|
2020-03-05 10:00:02 +01:00 |
|
Anuken
|
38ab1473f2
|
Backport of fixed lighting + overflow crash fix
|
2020-02-28 13:46:16 -05:00 |
|
DeltaNedas
|
fe22d334dc
|
Separate ambient light and solar panel efficiency (#1593)
* new branch
* Separate ambient light and solar panel efficiency
* Made ambient light -> solar efficiency default
|
2020-02-21 11:38:56 -05:00 |
|
Anuken
|
0f43690aaf
|
More unlocks?
|
2020-02-18 11:43:06 -05:00 |
|
Anuken
|
b96d5c417f
|
Fixed #1601
|
2020-02-17 09:27:51 -05:00 |
|
Anuken
|
d37886b2cd
|
Fixed #1585
|
2020-02-14 09:51:09 -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 |
|