Commit Graph

7073 Commits

Author SHA1 Message Date
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
14a97976cc
Realign pixels
Bothered me for ages.
2020-03-05 19:48:36 +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
bcb87f8f76
Update description accordingly 2020-03-05 12:15:38 +01:00
Patrick 'Quezler' Mounier
ecb09c0f04
Dump like bridges do 2020-03-05 12:11:55 +01:00
Patrick 'Quezler' Mounier
e7298702a1
Delete drafts 2020-03-05 10:50:21 +01:00
Patrick 'Quezler' Mounier
b74cf71f40
Come up with a new description 2020-03-05 10:50:08 +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
0534a4da45
Update bundle_zh_TW.properties (#1665) 2020-03-04 13:53:54 -05:00
Anuken
31c9b61358
Updated join.info (#1666) 2020-03-04 13:53:47 -05:00
Anuken
ff44b0ca85
Small RU fix (#1670) 2020-03-04 13:53:27 -05:00
Anuken
a36a0cad53
RU updates to Android description (#1663) 2020-03-04 13:53:19 -05:00
Anuken
0dfb3b1c1b
Update achievements.vdf (#1668)
* Update achievements.vdf

* Update achievements.vdf

* Update achievements.vdf

Co-authored-by: Anuken <arnukren@gmail.com>
2020-03-04 13:53:12 -05:00
Anuken
c7112a706a
Update bundle_uk_UA.properties (#1636)
* Update bundle_uk_UA.properties

* Update uk metadata

* Update uk bundles

* Update achievemnts
2020-03-04 13:52:20 -05:00
Anuken
2684a960fa
Create 104.4 (#1671)
* Create 104.4

* Update 104.4
2020-03-04 13:52:02 -05:00
Anuken
a5e07bfd29
Created fastlane/metadata/android/ru-RU/changelogs (#1669)
* Created fastlane/metadata/android/ru-RU/changelogs

104.4.txt

* Update 104.4.txt
2020-03-04 13:51:56 -05:00
Anuken
3eea0ea065 Bugfixes, tweaks 2020-03-04 13:48:00 -05:00
Anuken
fbbec816e8 Merged in object configuration 2020-03-04 13:33:14 -05:00
Anuken
cf31293d7b Many internal changes 2020-03-04 13:32:31 -05:00
Patrick 'Quezler' Mounier
3b2b7be72a
Remove nested app.post (#1667) 2020-03-04 11:58:16 -05:00
Vanguard
307f9ee297
2 changed lines
link.trello.description
link.feathub.description
2020-03-04 19:51:48 +03: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
Vanguard
1bbdedec72
1 changed line
join.info
2020-03-04 14:59:57 +03: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
64c1800391 Merge remote-tracking branch 'origin/master' 2020-03-03 12:11:49 -05:00
Anuken
2a191a45be Cleanup 2020-03-03 12:11:47 -05:00
Anuken
e8823fab36 More concise stream class 2020-03-03 12:11:35 -05:00
Anuken
3858cdd4c5 Added map region class 2020-03-03 12:08:31 -05:00