mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-20 11:38:00 +07:00
Code Issues Packages Projects Releases Wiki Activity
6,430 Commits 4 Branches 160 Tags 2.3 GiB
afdb0aa8c2
Commit Graph

6430 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Patrick 'Quezler' Mounier
afdb0aa8c2
Fix sleep visualizer 2020-03-06 17:21:17 +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
14a97976cc
Realign pixels 
Bothered me for ages.
 2020-03-05 19:48:36 +01:00
Patrick 'Quezler' Mounier
4a3e00f822
Fix early return 2020-03-05 15:21:41 +01: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
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
Patrick 'Quezler' Mounier
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
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