mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-02 12:23:47 +07:00
Code Issues Packages Projects Releases Wiki Activity
9,643 Commits 4 Branches 160 Tags 2.3 GiB
6ba0bfe06a
Commit Graph

9643 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DeltaNedas
6ba0bfe06a h 2020-11-10 23:33:53 +00:00
DeltaNedas
71ae9e1274 add more info to schematic errors 2020-11-10 22:46:57 +00:00
Anuken
9822b6c67a
Merge pull request #3334 from buthed010203/patch-2 
Small grammar fix
 2020-11-10 17:37:34 -05:00
buthed010203
ed374509b2
Small grammar fix 
Its bothering me ok
 2020-11-10 17:20:24 -05:00
Anuken
dbd677efed
Merge pull request #3333 from buthed010203/patch-1 
Fix bleeding edge updater
 2020-11-10 17:04:33 -05:00
buthed010203
c9670abff7
Fix bleeding edge updater 
The updater previously didn't update the original jar that was launched due to the use of the wrong function lol
 2020-11-10 16:19:07 -05:00
Anuken
8d3df82f81 arc 2020-11-10 14:54:49 -05:00
Anuken
002265f911 arc 2020-11-10 14:54:46 -05:00
Anuken
2d7562255a More sector overview visual changes 2020-11-10 14:54:07 -05:00
Anuken
e68eda3e58 Merge remote-tracking branch 'origin/master' 2020-11-10 13:48:05 -05:00
Anuken
ddc2cc7098 New preset / Indication of vulnerable sectors 2020-11-10 13:47:55 -05:00
Anuken
26d8fe0a56
Update gradle.yml 2020-11-10 09:47:49 -05:00
Anuken
f0c4ebfd31 Removed LCategory 2020-11-10 08:57:30 -05:00
Anuken
ebdced5c6c Merge remote-tracking branch 'origin/master' 2020-11-09 19:15:51 -05:00
Anuken
5eb4d25fe9 Fixed #3320 2020-11-09 19:15:37 -05:00
Anuken
eeb540409a
Merge pull request #3319 from MEEPofFaith/patch-1 
Add Movement Lightning to bundle
 2020-11-09 18:51:15 -05:00
MEEP of Faith
742cac3e75
Add Movement Lightning to bundle 2020-11-09 15:50:01 -08:00
Anuken
e1541b8c06
Merge pull request #3275 from PAP6/patch-1 
New 6.0 server(Now with DDNS)
 2020-11-09 18:44:23 -05:00
Anuken
89589c3258 Converted music to mp3 / New tracks / Minor cleanup 2020-11-09 17:02:36 -05:00
Anuken
29c6d7fe6c arc 2020-11-09 14:41:35 -05:00
Anuken
fe27ac6aec Testing mp3 sounds + hiding servers 2020-11-09 14:33:28 -05:00
Anuken
43e6da0fed Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-11-09 12:45:34 -05:00
Anuken
2ae9be6335
Merge pull request #3284 from skykatik/cleanup-2 
Cleanup
 2020-11-09 12:38:02 -05:00
Anuken
548dc79fb0 Beginning work on grouped servers 2020-11-09 12:34:34 -05:00
Skat
f84e780f3b
Merge branch 'master' into cleanup-2 2020-11-09 20:21:01 +04:00
Anuken
acb14a0986 Bugfixes 2020-11-09 10:40:02 -05:00
Anuken
2d4f4015b1 Fixed mono presence "corrupting" older saves 2020-11-08 20:24:31 -05:00
Anuken
23403d0c51 Fixed #3300 2020-11-08 19:54:27 -05:00
Anuken
ccfc1f57cc Unit prefRotation / Class unification (monos will vanish) 2020-11-08 18:52:09 -05:00
Anuken
84c4e0d74c Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-11-08 17:50:30 -05:00
Anuken
cbfb703cfb prefRotation for units 2020-11-08 17:50:27 -05:00
Anuken
58c3af4291
Merge pull request #3286 from DeltaNedas/fast 
type.speed -> speed()
 2020-11-08 17:50:04 -05:00
Anuken
a35f62d181 Merge remote-tracking branch 'origin/master' 2020-11-08 16:40:36 -05:00
Anuken
28dfe2b1f7 More sound fixes 2020-11-08 16:40:32 -05:00
Anuken
b40c39b4e2
Merge pull request #3299 from summetdev/patch-8 
[readme] Better Discord Badge.
 2020-11-08 16:28:47 -05:00
Antsiferov Andrew
42661fea8a
Better Discord Badge 2020-11-09 00:15:48 +03:00
Anuken
7bb23c3384 Some new sounds 2020-11-08 15:58:23 -05:00
DeltaNedas
17b09fbd51 h 2020-11-08 20:51:14 +00:00
Anuken
99d32b9903 arc 2020-11-08 13:55:27 -05:00
Anuken
a211fceab4 SFX changes 2020-11-08 13:55:09 -05:00
Anuken
0a67576133 Fixed #3291 2020-11-08 08:49:49 -05:00
DeltaNedas
8c2307eb83 sleep 2020-11-08 13:13:28 +00:00
Anuken
e636059ddf Corvus shoot SFX 2020-11-07 21:14:41 -05:00
Anuken
8910a9d537 Basic weather sounds, other tweaks 2020-11-07 20:57:49 -05:00
Anuken
ae1965a5c7 Sound echo fixes + minor tweaks 2020-11-07 19:19:16 -05:00
Anuken
2ab897ef69 arc 2020-11-07 14:23:04 -05:00
Anuken
846f3a29eb Sound fixes 2020-11-07 14:13:35 -05:00
Anuken
65990ad817 max sound fix 2020-11-07 12:12:13 -05:00
Anuken
d11a03e7d8
Merge pull request #3163 from summetdev/logic-bounded 
"Controlled" property for logic
 2020-11-07 12:04:43 -05:00
Anuken
de7a99aee4 Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-11-07 11:48:14 -05:00