mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-26 15:39:56 +07:00
Code Issues Packages Projects Releases Wiki Activity
5,876 Commits 4 Branches 160 Tags 2.3 GiB
f6af699428
Commit Graph

5876 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Patrick 'Quezler' Mounier
f6af699428
Revert "🎩" 
This reverts commit 10e4268dd5.

# Conflicts:
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
 2020-01-03 17:26:19 +01:00
Patrick 'Quezler' Mounier
5a21387762
Add inb4 2020-01-03 17:23:57 +01:00
Patrick 'Quezler' Mounier
1f6d3dca0e
Give craters surfboards to stream 2020-01-03 17:18:48 +01:00
Patrick 'Quezler' Mounier
0b0007502f
Revert "Differentiate texture from armored conveyor" 
This reverts commit 59451fcc0b.
 2020-01-03 17:09:13 +01:00
Patrick 'Quezler' Mounier
59451fcc0b
Differentiate texture from armored conveyor 
By removing the turtleshell it looks less armored while still somewhat high-tech (ish)
 2020-01-03 17:09:06 +01:00
Patrick 'Quezler' Mounier
12b034d16b
Tweak default conveyor stats 2020-01-03 16:47:37 +01:00
Patrick 'Quezler' Mounier
68dca82ab8
Refractor for readability 2020-01-03 16:42:28 +01:00
Patrick 'Quezler' Mounier
edbe50d8c4
Get rid of track enum 2020-01-03 16:20:23 +01:00
Patrick 'Quezler' Mounier
644d54c3f1
Move drawer back from crater to tile 2020-01-03 16:12:38 +01:00
Patrick 'Quezler' Mounier
f4a7f98b0b
Fix blending 2020-01-03 16:00:58 +01:00
Patrick 'Quezler' Mounier
315bb483f2
Replace headless check with inactivity 2020-01-03 12:30:55 +01:00
Patrick 'Quezler' Mounier
d843f29e09
Make crater speed configurable 2020-01-03 12:19:33 +01:00
Patrick 'Quezler' Mounier
0807e1bd25
List boostable item capacity in stats 2020-01-03 12:13:33 +01:00
Patrick 'Quezler' Mounier
4aaaf3292e
Add cooldown after crater moved 2020-01-03 11:56:29 +01:00
Patrick 'Quezler' Mounier
8c7d8abddd
Inflate crater properties 2020-01-03 11:40:45 +01:00
Patrick 'Quezler' Mounier
aa64dcfe27
Update target before launch 
So it has the chance to make room before it receives the crater from the caller.
 2020-01-03 11:28:46 +01:00
Patrick 'Quezler' Mounier
f94c7e6105
Move launch checks 2020-01-03 11:23:47 +01:00
Patrick 'Quezler' Mounier
7b0456a227
Launch only when full 2020-01-03 11:11:54 +01:00
Patrick 'Quezler' Mounier
cad13b61bb
Merge branch 'master' into crater 
# Conflicts:
#	core/src/mindustry/mod/ClassAccess.java
 2020-01-03 08:01:22 +01:00
Anuken
7fa61eaf3b Added server MOTD 2020-01-02 22:09:33 -05:00
Patrick 'Quezler' Mounier
4a238cff77
Begone 🔭 2020-01-02 22:09:12 +01:00
Patrick 'Quezler' Mounier
3f754116d8
Tweak crater movement 2020-01-02 22:06:41 +01:00
Patrick 'Quezler' Mounier
13e378c7d3
Birth base conveyor class 2020-01-02 22:06:18 +01:00
Patrick 'Quezler' Mounier
e289f13d27
- newline 2020-01-02 21:40:04 +01:00
Patrick 'Quezler' Mounier
f0bfe24008
Remove crater bundle entry 2020-01-02 21:34:56 +01:00
Patrick 'Quezler' Mounier
0ae6527584
Sacrifice hivemind to convert craters to drawings 
Sad, yes, but crater units would never sync well over the net in its current state, so faking them unto conveyors is the only real option.

Forgive me future ai overlord <3
 2020-01-02 21:29:19 +01:00
Anuken
5f3c10e397 arc 2020-01-02 14:33:21 -05:00
Anuken
e214a8e7c0 Merge remote-tracking branch 'origin/master' 2020-01-02 14:10:22 -05:00
Anuken
cb76e80836 Bugfixes 2020-01-02 14:08:41 -05:00
KSean222
d161ba442f Set primitive wrapping to false for scripts (#1302) 
* Set primitive wrapping to false for scripts

* Added one newline cause why not
 2020-01-02 14:07:38 -05:00
Anuken
70e6e52eba
Update README.md 2020-01-02 14:04:12 -05:00
Patrick 'Quezler' Mounier
10e4268dd5
🎩 
Leaving this here until it gets merged or something :)
 2020-01-02 09:02:37 +01:00
Patrick 'Quezler' Mounier
317f40eecd
Use tree score instead of looping each crater twice 2020-01-02 08:51:49 +01:00
Patrick 'Quezler' Mounier
ec32f65646
Avoid recursion 2020-01-02 08:11:37 +01:00
Patrick 'Quezler' Mounier
f1a455d7f1
Uproot the way the update order works 2020-01-02 07:57:32 +01:00
Patrick 'Quezler' Mounier
481c5753e7
Fixes a crash somehow 2020-01-01 22:23:10 +01:00
Patrick 'Quezler' Mounier
7f434fb625
❤️ 
https://youtu.be/gzkItR1jkKY?t=105
 2020-01-01 20:55:20 +01:00
Patrick 'Quezler' Mounier
5c31009495
Remove unused alteration 2020-01-01 20:54:29 +01:00
Patrick 'Quezler' Mounier
549efa472a
Always keep moving towards its purpose 2020-01-01 20:51:26 +01:00
Patrick 'Quezler' Mounier
70b43ee31c
Keep unloading if it succeeds 2020-01-01 20:45:22 +01:00
Patrick 'Quezler' Mounier
2fcdae4c7e
Dirty, but works even better <3 2020-01-01 20:32:09 +01:00
Patrick 'Quezler' Mounier
15311fa4ed
This looks acceptable 2020-01-01 20:31:01 +01:00
Patrick 'Quezler' Mounier
0ce1164ffa
Brainstorm dibs logic 2020-01-01 20:29:14 +01:00
Patrick 'Quezler' Mounier
12f51d477e
Purge anti collision 2020-01-01 20:17:52 +01:00
Patrick 'Quezler' Mounier
00933f0e30
Merge branch 'master' into crater 2020-01-01 20:13:21 +01:00
Patrick 'Quezler' Mounier
197118e16e
Doesn’t really close the gap 2020-01-01 20:13:07 +01:00
Patrick 'Quezler' Mounier
b8cede1cf5
Start reworking tile assigner 2020-01-01 20:07:22 +01:00
Patrick 'Quezler' Mounier
163bf15930
Rework dibs into hivemind 
Imperfect, will require tweaking.
 2020-01-01 20:06:47 +01:00
Anuken
af9be8584e Merge remote-tracking branch 'origin/master' 2020-01-01 12:16:29 -05:00
Anuken
ddb0d7eff2 Fixed #1304 2020-01-01 12:16:23 -05:00