 Anuken
|
2e19504b65
|
it begins
|
2020-03-05 20:27:42 -05:00 |
|
|
Anuken
|
5a0d079a78
|
oh no
|
2020-03-05 18:05:59 -05:00 |
|
 AnukenandGitHub
|
89a5c957fd
|
add mod name to js print() (#1677)
* add mod name to js print()
* add mod name to errors
|
2020-03-05 15:58:10 -05: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 |
|
|
Anuken
|
2dfbbdfd5b
|
Beginning work on respawning
|
2020-03-05 12:12:03 -05:00 |
|
|
Patrick 'Quezler' Mounier
|
4a3e00f822
|
Fix early return
|
2020-03-05 15:21:41 +01:00 |
|
|
Anuken
|
39ee31d748
|
Fixed #1673
|
2020-03-05 08:45:14 -05:00 |
|
|
Patrick 'Quezler' Mounier
|
3ac50a3f3e
|
,
|
2020-03-05 14:42:37 +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
|
9df875354a
|
Revert "Repurpose branch to be played"
This reverts commit ff578c8540.
# Conflicts:
# tools/crater-deploy.sh
|
2020-03-05 10:10:00 +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
|
882076030d
|
Added back tapping
|
2020-03-04 19:58:48 -05:00 |
|
|
Anuken
|
c02c00cdfb
|
Schematic tweaks and improvements
|
2020-03-04 19:21:40 -05:00 |
|
|
Anuken
|
3eea0ea065
|
Bugfixes, tweaks
|
2020-03-04 13:48:00 -05:00 |
|
|
Anuken
|
cf31293d7b
|
Many internal changes
|
2020-03-04 13:32:31 -05:00 |
|
|
Patrick 'Quezler' MounierandGitHub
|
3b2b7be72a
|
Remove nested app.post (#1667)
|
2020-03-04 11:58:16 -05:00 |
|
|
Anuken
|
c96427c722
|
Bugfixes
|
2020-03-04 09:01:41 -05:00 |
|
|
Anuken
|
503607e36a
|
Fixed #1661
|
2020-03-04 08:39:48 -05:00 |
|
|
Anuken
|
aeae286273
|
Merge branch '6.0' of https://github.com/Anuken/Mindustry into object-config
# Conflicts:
# core/src/mindustry/entities/traits/BuilderTrait.java
# core/src/mindustry/entities/type/TileEntity.java
# core/src/mindustry/game/EventType.java
# core/src/mindustry/game/Schematics.java
# core/src/mindustry/input/InputHandler.java
# core/src/mindustry/io/TypeIO.java
# core/src/mindustry/world/Block.java
# core/src/mindustry/world/blocks/distribution/Sorter.java
|
2020-03-04 08:38:36 -05:00 |
|
|
Anuken
|
2581353c5e
|
Merge branch '6.0' of https://github.com/Anuken/Mindustry into object-config
# Conflicts:
# core/src/mindustry/entities/traits/BuilderTrait.java
# core/src/mindustry/entities/type/TileEntity.java
# core/src/mindustry/game/EventType.java
# core/src/mindustry/game/Schematics.java
# core/src/mindustry/input/InputHandler.java
# core/src/mindustry/io/TypeIO.java
# core/src/mindustry/world/Block.java
# core/src/mindustry/world/blocks/distribution/Sorter.java
|
2020-03-03 21:33:03 -05:00 |
|
|
Anuken
|
087f8129b9
|
Tile code cleanup
|
2020-03-03 19:29:41 -05:00 |
|
|
Anuken
|
bac1648d4b
|
Added support for changing cached floor/terrain
|
2020-03-03 17:01:09 -05:00 |
|
|
Anuken
|
f1aadd97a8
|
Merge branch 'master' of https://github.com/Anuken/Mindustry into 6.0
# Conflicts:
# core/src/mindustry/core/Logic.java
# gradle.properties
|
2020-03-03 12:12:25 -05:00 |
|
|
Anuken
|
2a191a45be
|
Cleanup
|
2020-03-03 12:11:47 -05:00 |
|
|
Anuken
|
3858cdd4c5
|
Added map region class
|
2020-03-03 12:08:31 -05:00 |
|
|
Anuken
|
ceac809c1d
|
Cleanup
|
2020-03-02 10:44:56 -05:00 |
|
|
Anuken
|
182a8837be
|
Save satellite presence
|
2020-03-01 20:58:33 -05:00 |
|
|
Anuken
|
c3a790bfd2
|
2
|
2020-03-01 16:29:04 -05:00 |
|
|
Anuken
|
7d84300c31
|
Updated arc
|
2020-03-01 16:22:38 -05:00 |
|
|
Anuken
|
ab7e840eee
|
Cleanup
|
2020-03-01 16:20:42 -05:00 |
|
|
Anuken
|
a31de609ce
|
BufferUtils -> Buffers
|
2020-03-01 16:19:04 -05:00 |
|
|
Anuken
|
9ddd76d6cb
|
Cleanup
|
2020-03-01 15:41:10 -05:00 |
|
|
Anuken
|
3ed5282e14
|
Better sector null checks
|
2020-03-01 12:15:38 -05:00 |
|
|
Anuken
|
a2a9cffdee
|
Moved some methods around
|
2020-03-01 00:09:03 -05:00 |
|
|
Anuken
|
4b36a6d5bd
|
Bugfixes
|
2020-02-29 19:37:14 -05:00 |
|