mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-25 22:17:59 +07:00
Code Issues Packages Projects Releases Wiki Activity
9,976 Commits 4 Branches 160 Tags 2.3 GiB
0e354dbf23
Commit Graph

8491 Commits

Author SHA1 Message Date
Anuken
cf71356bdb Merge branch 'genNAowl-unit-stats' 2020-11-13 14:42:58 -05:00
Anuken
a9756aefad Cleanup of weapon stats 2020-11-13 14:42:46 -05:00
Anuken
e0b4eb7f8f Merge branch 'unit-stats' of git://github.com/genNAowl/Mndstry into genNAowl-unit-stats 2020-11-13 14:14:38 -05:00
Anuken
ad620971d9 Cleanup 2020-11-13 14:14:29 -05:00
Anuken
648150df65 Fixed #3380 2020-11-13 12:57:49 -05:00
Anuken
3b3b1520f9 Apparently every base part had a base tier of 0 this whole time 2020-11-13 12:40:23 -05:00
Anuken
75df515234 Merge remote-tracking branch 'origin/master' 2020-11-13 11:33:45 -05:00
Anuken
0908176079 Campaign changes 2020-11-13 11:33:31 -05:00
Bohaska
eaf76b5513
Knockback for Spectre 
just made knockback for spectre on par with water.
 2020-11-13 19:52:34 +08:00
Bohaska
bda5393a74
Knockback for Spectre 
Suggested in https://github.com/Anuken/Mindustry-Suggestions/issues/1170
 2020-11-13 19:10:34 +08:00
DeltaNedas
e9bcf9e8b8
Merge branch 'master' into files 2020-11-13 07:10:39 +00:00
Anuken
6eaec7d505 Bugfixes + Binary and 2020-11-12 18:46:20 -05:00
DeltaNedas
6da6c9426d add file picker interface for mods 2020-11-12 23:21:49 +00:00
Anuken
d1d3ef0c67 Sound framework improvements 2020-11-12 18:07:26 -05:00
Vanguard
4a1300f789
1 changed line 
mods.reloadexit
 2020-11-12 21:48:39 +03:00
Leonwang4234
636fffc750 scaling(Scaling.fit) 
Untested
 2020-11-12 08:37:38 -08:00
Anuken
d163cacb6a Merge remote-tracking branch 'origin/master' 2020-11-12 09:41:54 -05:00
Anuken
e847a74a25 Fixed #3362 2020-11-12 09:41:49 -05:00
younggam
f03c022db8
Update Pump.java 2020-11-12 20:52:23 +09:00
genNAowl
21a8a39344
Merge branch 'master' into unit-stats 2020-11-11 16:50:37 -08:00
Leonwang4234
14ee997a76 Merge remote-tracking branch 'upstream/master' into unit-stats 2020-11-11 16:49:29 -08:00
Anuken
b1b84fe380 Minor sound changes 2020-11-11 18:11:38 -05:00
Anuken
536a8f6085 Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-11-11 17:13:26 -05:00
Anuken
538f1d7330 Fixed #3352 / Fixed #3355 / Quad sounds 2020-11-11 17:12:42 -05:00
Leonwang4234
4d3c6879b5 Fix many things 2020-11-11 13:27:03 -08:00
Anuken
9ef57c0366
Merge pull request #3345 from DeltaNedas/nothing 
nothing
 2020-11-11 15:01:36 -05:00
Prosta4okua
c263a1e52f
Добридень 2020-11-11 21:58:39 +02:00
Anuken
cf4f912cef Cleanup 2020-11-11 14:55:16 -05:00
YellOw139
56fece1a30
[Bundle][RO] Translation Update 
This PR was tested in-game and is ready to merge at any time (unless marked as draft).

Changelog:

- New strings/changes up to commit ddc2cc7098
- Typo fixes & various other improvements
 2020-11-11 21:51:00 +02:00
Anuken
988fdb0c9b Fixed impact0078 missing wave 2020-11-11 14:08:57 -05:00
Anuken
0f61e8cfd9 arc 2020-11-11 13:42:30 -05:00
DeltaNedas
a3d4c239d1 nothing 2020-11-11 18:28:42 +00:00
Vanguard
8c99a5cce0
1 changed line 
sector.impact0078.name
 2020-11-11 21:09:04 +03:00
Anuken
529bae8972 Fixed #3344 2020-11-11 12:45:30 -05:00
Anuken
d909683f1d Fixed #3342 2020-11-11 11:45:50 -05:00
Anuken
d266227827 Merge remote-tracking branch 'origin/master' 2020-11-11 10:55:32 -05:00
Anuken
a4f5c1c55f Back to OGG 2020-11-11 10:55:19 -05:00
Anuken
2990972130
Merge pull request #3271 from DaGamerFiles/patch-3 
Update bundle_in_ID.properties
 2020-11-11 09:48:13 -05:00
Anuken
ec956ae5f3
Merge pull request #3332 from jimmy927/master 
Better and more complete swedish translations.
 2020-11-11 09:42:15 -05:00
Anuken
da3572a900
Merge pull request #3315 from Prosta4okua/master 
[Bundle][RU] actual L10n
 2020-11-11 09:42:03 -05:00
Anuken
e48dc2ea5e
Merge pull request #3259 from YellOw139/patch-1 
[Bundle][RO] Translation Update
 2020-11-11 09:41:24 -05:00
Anuken
d1d793b16c Merge remote-tracking branch 'origin/master' 2020-11-11 09:28:28 -05:00
Anuken
12843af977 Cleanup 2020-11-11 09:28:17 -05:00
Anuken
d10960817d
Merge pull request #3335 from DeltaNedas/error 
add more info to schematic errors
 2020-11-10 18:47:37 -05:00
DeltaNedas
6ba0bfe06a h 2020-11-10 23:33:53 +00:00
Anuken
887ce28fc2 Fix for render mocking 2020-11-10 18:16:18 -05:00
Anuken
ac4f2cac32 Merge remote-tracking branch 'origin/master' 2020-11-10 18:13:53 -05:00
Anuken
f089f2c2ff Bugfixes 2020-11-10 18:13:49 -05:00
DeltaNedas
71ae9e1274 add more info to schematic errors 2020-11-10 22:46:57 +00: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
Jimmy Engelbrecht
89788d1fa8 Better and more complete swedish translations. 2020-11-10 21:13:07 +01:00
Anuken
2d7562255a More sector overview visual changes 2020-11-10 14:54:07 -05:00
Anuken
ddc2cc7098 New preset / Indication of vulnerable sectors 2020-11-10 13:47:55 -05:00
Anuken
f0c4ebfd31 Removed LCategory 2020-11-10 08:57:30 -05:00
Vanguard
a723edb2e1
4 new lines; 3 line changed; 1 line removed 
New:
servers.showhidden
server.shown
server.hidden
ability.movelightning

Changed:
boss.health
block.overflow-gate.description
block.underflow-gate.description

Removed:
block.launch-pad-large.description
 2020-11-10 15:56:56 +03:00
YellOw139
a209933307
new (humming) strings 2020-11-10 12:50:30 +02:00
Leonwang4234
3a27e6e94e Merge remote-tracking branch 'upstream/master' into unit-stats 2020-11-09 21:52:42 -08: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
MEEP of Faith
742cac3e75
Add Movement Lightning to bundle 2020-11-09 15:50:01 -08:00
Anuken
89589c3258 Converted music to mp3 / New tracks / Minor cleanup 2020-11-09 17:02:36 -05:00
Anuken
fe27ac6aec Testing mp3 sounds + hiding servers 2020-11-09 14:33:28 -05:00
Vanguard
74ba9ca04f
1 line reverted (I don't remember this change) 
schematic.exportfile
 2020-11-09 21:54:59 +03:00
Anuken
43e6da0fed Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-11-09 12:45:34 -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
Quick-Korc
bd0f155f75
Item and building details translate 
Note : details is not description
 2020-11-09 19:06:38 +07:00
Thomas Widyantoko
dfc5923ca4
unnecessary "-mu" 2020-11-09 18:18:37 +07:00
Thomas Widyantoko
ea22c5cc12
Kepingan (Scrap) -> Rongsokan 2020-11-09 18:17:01 +07:00
YellOw139
eebc39668c
Engmanian fixes/improvements 2020-11-09 10:47:39 +02:00
Anuken
2d4f4015b1 Fixed mono presence "corrupting" older saves 2020-11-08 20:24:31 -05:00
Leonwang4234
e9c00d8a9f remove unused imports 2020-11-08 17:23:05 -08: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
Leonwang4234
490beb242a Merge remote-tracking branch 'upstream/master' into unit-stats 2020-11-08 15:21:27 -08: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
Leonwang4234
82348d4fff update sprite generation + update bullet stats 2020-11-08 14:35:06 -08:00
Anuken
28dfe2b1f7 More sound fixes 2020-11-08 16:40:32 -05: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
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
YellOw139
629f2c988c
Mono 2020-11-08 14:51:28 +02:00
Leonwang4234
d133709423 update sprites 2020-11-07 18:31:47 -08: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
Leonwang4234
b448b90999 bundles 2020-11-07 17:21:16 -08:00
Leonwang4234
1555e77348 Create WeaponListValue.java 2020-11-07 17:21:03 -08:00
Leonwang4234
f9954ea4c7 initial implementation 2020-11-07 17:20:58 -08:00
Anuken
ae1965a5c7 Sound echo fixes + minor tweaks 2020-11-07 19:19:16 -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
Anuken
94dd1416ee Testing filters + new natives 2020-11-07 11:48:04 -05:00
Skat
9f979cba0d Rollback 2020-11-07 19:46:37 +03:00
DeltaNedas
7ec50fb800 type.speed -> speed() 2020-11-07 11:59:37 +00:00
Skat
f8914d0543 Old style 2020-11-07 13:01:24 +03:00
Skat
ed36390f3c Great cleanup 2020-11-07 11:37:46 +03:00
Anuken
29b8db0a85
Merge pull request #3282 from DeltaNedas/master 
use realSpeed in input stuff
 2020-11-06 21:35:40 -05:00
Anuken
78af4e2120 Fixed iOS sharing 2020-11-06 21:02:08 -05:00
Anuken
c51fcd3839 Export last log with crashes 2020-11-06 20:36:04 -05:00
DeltaNedas
7af8327650 use realSpeed in input stuff 2020-11-07 01:25:01 +00:00
Anuken
7e45d9b5b4 revert 2020-11-06 20:04:03 -05:00
Anuken
8c3577c55a ??? 2020-11-06 19:45:56 -05:00
Anuken
0f31eb7d23 Changed arc sound backend 2020-11-06 18:09:08 -05:00
Anuken
fda2ed8b41 Cleanup 2020-11-06 13:34:57 -05:00
MEEP of Faith
a621aa7eab
Tractor Beam Status Effects 2020-11-06 09:50:55 -08:00
Anuken
bfb3cf32f6
Merge pull request #3265 from summetdev/editor/blocks-searchbar 
[editor] Searchable Blocks Implementation
 2020-11-06 09:54:35 -05:00
Summet-V
255d1c511e Optimization tweaks 2020-11-06 17:45:35 +03:00
Vanguard
b0054af5d4
2 new lines; 1 changed line 
New:
stat.canboost
stat.flying

Changed:
editor.exportimage.description
 2020-11-06 15:47:03 +03:00
Summet-V
275395b553 Cleanup & Padding changes 2020-11-06 14:28:08 +03:00
YellOw139
e3818398ba
Consistency, fixes, typos, improvements 2020-11-06 11:26:03 +02:00
YellOw139
cc418c6fc1
Improperly gendered item descriptions 2020-11-06 11:10:25 +02:00
Thomas Widyantoko
18bd731b3c
host-only research line replacement 2020-11-06 12:37:47 +07:00
Thomas Widyantoko
f44af4b4bb
removes duplicated lines 2020-11-06 12:32:27 +07:00
Anuken
ad3ce9fb14 Icon cleanup 2020-11-05 22:05:32 -05:00
Vanguard
68ee91a65b 77 new lines; 111 changed lines 
New:
crash.export
crash.none
crash.exported
memory
memory2
stat.description
category.purpose
block.block-forge.name
block.block-loader.name
block.block-unloader.name
item.copper.details
item.lead.details
item.coal.details
item.scrap.details
item.spore-pod.details
block.router.details
block.cultivator.details
block.core-shard.details
block.core-foundation.details
block.core-nucleus.details
block.foreshadow.description
block.parallax.description
block.tsunami.description
block.silicon-crucible.description
block.disassembler.description
block.overdrive-dome.description
block.payload-conveyor.description
block.payload-router.description
block.command-center.description
block.ground-factory.description
block.air-factory.description
block.naval-factory.description
block.additive-reconstructor.description
block.multiplicative-reconstructor.description
block.exponential-reconstructor.description
block.tetrative-reconstructor.description
block.switch.description
block.micro-processor.description
block.logic-processor.description
block.hyper-processor.description
block.memory-cell.description
block.memory-bank.description
block.logic-display.description
block.large-logic-display.description
unit.dagger.description
unit.mace.description
unit.fortress.description
unit.scepter.description
unit.reign.description
unit.nova.description
unit.pulsar.description
unit.quasar.description
unit.vela.description
unit.corvus.description
unit.crawler.description
unit.atrax.description
unit.spiroct.description
unit.arkyid.description
unit.toxopid.description
unit.flare.description
unit.horizon.description
unit.zenith.description
unit.antumbra.description
unit.eclipse.description
unit.mono.description
unit.poly.description
unit.mega.description
unit.quad.description
unit.oct.description
unit.risso.description
unit.minke.description
unit.bryde.description
unit.sei.description
unit.omura.description
unit.alpha.description
unit.beta.description
unit.gamma.description

Changed:
block.armored-conveyor.description
block.illuminator.description
item.copper.description
item.lead.description
item.metaglass.description
item.graphite.description
item.sand.description
item.coal.description
item.titanium.description
item.thorium.description
item.scrap.description
item.silicon.description
item.plastanium.description
item.phase-fabric.description
item.surge-alloy.description
item.spore-pod.description
item.blast-compound.description
item.pyratite.description
liquid.water.description
liquid.slag.description
liquid.oil.description
liquid.cryofluid.description
block.message.description
block.graphite-press.description
block.multi-press.description
block.silicon-smelter.description
block.kiln.description
block.phase-weaver.description
block.alloy-smelter.description
block.cryofluid-mixer.description
block.blast-mixer.description
block.pyratite-mixer.description
block.melter.description
block.separator.description
block.spore-press.description
block.coal-centrifuge.description
block.incinerator.description
block.copper-wall.description
block.copper-wall-large.description
block.titanium-wall.description
block.titanium-wall-large.description
block.plastanium-wall.description
block.plastanium-wall-large.description
block.thorium-wall.description
block.thorium-wall-large.description
block.phase-wall.description
block.phase-wall-large.description
block.surge-wall.description
block.surge-wall-large.description
block.door.description
block.door-large.description
block.mender.description
block.mend-projector.description
block.force-projector.description
block.shock-mine.description
block.conveyor.description
block.titanium-conveyor.description
block.plastanium-conveyor.description
block.junction.description
block.bridge-conveyor.description
block.phase-conveyor.description
block.sorter.description
block.inverted-sorter.description
block.router.description
block.distributor.description
block.mass-driver.description
block.mechanical-pump.description
block.rotary-pump.description
block.thermal-pump.description
block.conduit.description
block.pulse-conduit.description
block.plated-conduit.description
block.liquid-router.description
block.liquid-tank.description
block.liquid-junction.description
block.bridge-conduit.description
block.phase-conduit.description
block.surge-tower.description
block.diode.description
block.battery.description
block.battery-large.description
block.combustion-generator.description
block.thermal-generator.description
block.steam-generator.description
block.differential-generator.description
block.rtg-generator.description
block.solar-panel-large.description
block.thorium-reactor.description
block.impact-reactor.description
block.mechanical-drill.description
block.cultivator.description
block.core-shard.description
block.core-foundation.description
block.core-nucleus.description
block.vault.description
block.container.description
block.unloader.description
block.duo.description
block.scatter.description
block.hail.description
block.wave.description
block.lancer.description
block.arc.description
block.swarmer.description
block.salvo.description
block.fuse.description
block.ripple.description
block.cyclone.description
block.spectre.description
block.meltdown.description
block.repair-point.description
 2020-11-06 04:21:56 +03:00
Anuken
a18ae3ccf9 Icon refactoring 2020-11-05 20:21:30 -05:00
Anuken
fab282e8be Unlock core units on respawn 2020-11-05 14:02:10 -05:00
YellOw139
d803d82ef1
Cleaned up force projector desc 2020-11-05 16:21:09 +02:00
Anuken
479cad3d0c Un-protected IORunner 2020-11-05 09:16:54 -05:00
Anuken
df7b8e78e9 Merge remote-tracking branch 'origin/master' 2020-11-05 09:09:27 -05:00
Anuken
47b123c219 Cleanup 2020-11-05 09:09:19 -05:00
Anuken
cfdc30ab7e
Merge pull request #3269 from YellOw139/patch-3 
[Bundle] Power void is sandbox only
 2020-11-05 08:43:07 -05:00
Quick-Korc
a724e2c349
Unit Desc translation and retranslate sectors 2020-11-05 19:42:28 +07:00
Thomas Widyantoko
00a2892a7e
Update bundle_in_ID.properties 
fixes and stuff, incomplete
 2020-11-05 18:26:34 +07:00
YellOw139
99999498cc
Opted for singular 2020-11-05 12:05:36 +02:00
YellOw139
ae504eb11c
[Bundle] Power void is sandbox only 
I assumed this must have been a mistake.

Either that or power voids coming to campaign confirmed.
 2020-11-05 08:16:51 +02:00
QmelZ
db265e3471
delete repeated line 
delete repeated line from foreshadow
 2020-11-05 05:04:31 +03:00
Anuken
70db073054 Higher PvP map core radius / Unit type balancing 2020-11-04 15:09:12 -05:00
Anuken
6bdde8b964 Packet spam, rate limit fix / Flying unit command limit nerf 2020-11-04 14:41:19 -05:00
Summet-V
c3a57a744c Cleanup 2020-11-04 22:09:46 +03:00
Summet-V
fce5f23a49 [editor] Searchbar <none> label 2020-11-04 21:46:50 +03:00
Anuken
e8a5e35f50 More achievement cleanup 2020-11-04 12:45:51 -05:00
Summet-V
ec61734f5d [editor] Searchable blocks 2020-11-04 19:10:25 +03:00
Summet-V
b9b69c899b Unused import 2020-11-04 17:54:49 +03:00
Summet-V
6b90bbe421 Controlled property for blocks 2020-11-04 17:53:33 +03:00
Anuken
caec96615f More achievement cleanup 2020-11-03 22:19:50 -05:00
Anuken
696ad92b59 Merged changes 2020-11-03 17:20:43 -05:00
Anuken
df81ac2129 Merge remote-tracking branch 'origin/master' 2020-11-03 17:19:04 -05:00
Anuken
775327ebcb Minor achievement cleanup 2020-11-03 17:19:00 -05:00
YellOw139
c7ef48acf8
Not quite completely unfinished eh 2020-11-03 21:38:39 +02:00
Summet-V
7985df9afa Tooltips for editor blocks 2020-11-03 22:25:47 +03:00
Anuken
2751ca90b4 Removed dynamic terrain 2020-11-03 13:38:53 -05:00
YellOw139
fd4fd30e7a
Misc and experimental stuff for Apple 2020-11-03 19:15:57 +02:00
YellOw139
8eebdc2ad2
[Bundle][RO] Translation Update 
This PR was tested in-game and is ready to merge at any time (unless marked as draft).

Changelog:

- New strings/changes up to commit 8f53d44278
- Improved & new descriptions, as expected. 
- Completely ditched the term ”boost”. While used in Romanian gaming, we've got some good national alternatives.
- Typo fixes & various other improvements
 2020-11-03 19:08:56 +02:00
Anuken
797d6eaa4a Attempt at fixing mediump precision issues 2020-11-03 10:59:16 -05:00
Anuken
6cde363d77 Fixed #3250 2020-11-03 09:12:51 -05:00
Anuken
5d2e705923 asfehioafuhioaghuoytgfctyr 2020-11-02 20:54:39 -05:00
Anuken
65ab869468 Added button to export crash logs 2020-11-02 19:45:45 -05:00
Anuken
8ecbb46303 changelog 2020-11-02 18:35:28 -05:00
Anuken
8f417ef2d7
Merge pull request #3241 from Alstin112/patch-3 
Update bundle_pt_BR.properties
 2020-11-02 18:10:21 -05:00
Anuken
75d8d4f407
Merge pull request #3226 from Virtox/patch-1 
Some fixes and additions for NL language file
 2020-11-02 17:58:31 -05:00
Anuken
5aef551bd2
Merge pull request #3195 from QmelZ/master 
Turkish translation and some fixes
 2020-11-02 17:58:14 -05:00
Anuken
efcd84735d
Merge pull request #3190 from TheJaaju/patch-5 
Update bundle_fi.properties
 2020-11-02 17:58:00 -05:00
Anuken
edef90da58
Merge pull request #3177 from PetrGasparik/v112 
Czech translation for latest version
 2020-11-02 17:57:46 -05:00
Anuken
fa42dc9e17
Merge pull request #3113 from YellOw139/patch-2 
[Bundle][RO] Translation Update
 2020-11-02 17:54:54 -05:00
Anuken
9779478fe7
Merge pull request #3111 from laohuaji233/patch-40 
Update bundle_zh_CN.properties
 2020-11-02 17:54:41 -05:00
Anuken
3a4e939dee
Merge pull request #3110 from Catchears/german-v6 
Improve german translation for v6
 2020-11-02 17:54:30 -05:00
Anuken
006e27b61f
Merge pull request #3109 from Prosta4okua/patch-7 
[Bundle][Uk_ua] Update Ukrainian bundle.
 2020-11-02 17:53:55 -05:00
Anuken
544678009a
Merge pull request #3092 from Prosta4okua/master 
[Bundle][RU] actual L10n
 2020-11-02 17:53:42 -05:00
Anuken
aa81805f19
Merge pull request #3103 from MEEPofFaith/patch-1 
[Modding] Custom Base Support
 2020-11-02 17:53:14 -05:00
Anuken
51fa2bf30c blast should be after pyratite 2020-11-02 16:50:50 -05:00
Anuken
304f5b62b3 Sprites repacked 2020-11-02 16:49:24 -05:00
Anuken
e853ed6419 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/src/mindustry/logic/LCanvas.java
 2020-11-02 16:47:33 -05:00
Anuken
8f53d44278 Various fixes 2020-11-02 16:46:11 -05:00
Anuken
075b7d7dc6
Merge pull request #3225 from Voz-Duh/new-texture-for-blast-mixer 
New Texture For Blast Mixer
 2020-11-02 15:31:43 -05:00
Voz-Duh
cda8a9b3e9 Texture Fix 2020-11-02 23:02:56 +03:00
Voz-Duh
6e2f097803 Texture Fix 2020-11-02 22:16:46 +03:00
Alstin112
4f46486a14
Update bundle_pt_BR.properties 2020-11-01 22:17:18 -03:00
Anuken
f44cad4c08
Merge pull request #3230 from Quentinchampenois/translation/fr_keys 
Translates few keys in french
 2020-11-01 20:11:41 -05:00
DeltaNedas
fc94d68e10 remove redundant stack trace 2020-11-01 23:16:41 +00:00
DeltaNedas
47844e0204 properly log logic build errors 2020-11-01 23:01:18 +00:00
DeltaNedas
1f9ed90cc0 remove unused DataType.java 2020-11-01 19:35:46 +00:00
DeltaNedas
cda6a6973d make logic stuff public, cleanup 2020-11-01 19:35:22 +00:00
Anuken
a13f7f633e Fixed serverside error 2020-11-01 10:42:16 -05:00
Anuken
d786c8668e Fixed logic config() called in clients / JSON-compatible effects 2020-11-01 10:30:30 -05:00
Anuken
187cb79265 Fixed #3222 / Fixed #3218 / Fixed #3228 / Fixed #3217 2020-11-01 09:28:03 -05:00
quentinchampenois
692c4733e8
light translations from english to french keys 2020-11-01 14:11:09 +01:00
Voz-Duh
e8cfd63bc4 Texture Fix 2020-11-01 14:12:52 +03:00
Stijn van der Linden
e778f1ab5d
Update bundle_nl.properties 2020-11-01 11:45:13 +01:00
Stijn van der Linden
5f1d048eea
Update bundle_nl.properties 
Fixed some typo's, added couple more translated lines.
 2020-11-01 11:37:11 +01:00
Voz-Duh
3e03c3e49b New Texture For Blast Mixer 2020-11-01 13:27:09 +03:00
Anuken
54ba4b31a1 Fixed casing eject effects 2020-10-31 20:19:24 -04:00
Anuken
b5e2812d0b Bugfixes 2020-10-31 16:25:50 -04:00
Anuken
95c444a004 Merge remote-tracking branch 'origin/master' 2020-10-31 16:11:54 -04:00
Anuken
b1b03a7503 Extra legacy block substitution / iOS fixes 2020-10-31 16:11:51 -04:00
summetdev
e6f60505e6 Add group to UnitBlock 2020-10-31 23:03:25 +03:00
summetdev
afe3b0d111 Group for unit factory 2020-10-31 22:30:37 +03:00
Anuken
05dcd7622b Campaign tweaks 2020-10-31 14:52:03 -04:00
YellOw139
ae595b4564
[stat] where [stat] is needed 2020-10-31 20:47:36 +02:00
Anuken
9c54fcee2e Sector damage calculation fix 2020-10-31 13:42:43 -04:00
Anuken
4d34f16fcd Merge remote-tracking branch 'origin/master' 2020-10-31 13:03:22 -04:00
Anuken
2079cfaece Fixed #3208 2020-10-31 13:03:19 -04:00
Anuken
df54fb0534
Merge pull request #3209 from summetdev/database-button 
Show Core Database Button in Custom Game.
 2020-10-31 12:57:45 -04:00
summetdev
51e490e667 Core database button 2020-10-31 19:26:50 +03:00
Anuken
04fcf06ad5 Merge remote-tracking branch 'origin/master' 2020-10-31 12:03:38 -04:00
Anuken
9af8b64046 #3191 2020-10-31 12:03:35 -04:00
DeltaNedas
865beac7fb fix modded bullets 2020-10-31 15:35:45 +00:00
Anuken
d68ef73407 Fixed bloom resizing improperly 2020-10-31 11:01:39 -04:00
Anuken
8d6ea6b197 Correct team display on maps 2020-10-31 10:35:21 -04:00
Anuken
2c29a06eb5 Fixed #3206 2020-10-31 10:07:01 -04:00
Anuken
b75a03aed8 Fixed #3204 2020-10-31 09:56:35 -04:00
Anuken
42b8ece85a Fixed #3200 / Fixed #3196 / Fixed #3198 2020-10-31 09:01:06 -04:00
Prosta4okua
ab947c4fe7
Update bundle_uk_UA.properties 2020-10-31 02:25:38 +02:00
Anuken
4ec8e24bd8 Cleanup of merged PR 2020-10-30 19:03:05 -04:00
Anuken
e02458122b
Merge pull request #2970 from genNAowl/ground-support-heal 
Allow Ground Support Units to Heal Blocks
 2020-10-30 18:52:04 -04:00
QmelZ
d837879bd8 translation 2020-10-31 00:51:34 +03:00
Anuken
181ad1016c Reduced tech costs / Added missing blocks to fungal pass 2020-10-30 16:05:40 -04:00
Anuken
466183ffd0 Possibly more accurate wave linear regressions 2020-10-30 15:39:49 -04:00
genNAowl
60f2c67bde
Merge branch 'master' into ground-support-heal 2020-10-30 12:37:33 -07:00
Anuken
28240f730f Don't show guardian warning when above win wave 2020-10-30 14:57:34 -04:00
Anuken
ed93fa45d3 Preset tweaks 2020-10-30 13:16:59 -04:00
Anuken
a12583eb4d Campaign survival wave display tweaks 2020-10-30 12:54:24 -04:00
Leonwang4234
de483990ef formatting 
Why do I always make these mistakes?

And I saw that I did the same thing in my incendiary-fire PR too...
 2020-10-30 09:04:44 -07:00
Anuken
76ff55d7f1 Campaign tweaks 2020-10-30 11:50:38 -04:00
Anuken
784a280bef Merge remote-tracking branch 'origin/master' 2020-10-30 10:36:11 -04:00
Anuken
14869041b8 Cleanup 2020-10-30 10:36:07 -04:00
Anuken
17fd3d0bc1
Merge pull request #3099 from skykatik/patch-2 
Removing spaces at start and end of a message (trim)
 2020-10-30 10:29:42 -04:00
Anuken
968d94904a
Merge pull request #3058 from MEEPofFaith/speed-lightning 
v5 Javelin Movement Lightning Ability
 2020-10-30 09:40:21 -04:00
Anuken
c8e5994b2f
Merge pull request #3174 from genNAowl/alternate-recalculation 
Change "Alternate" calculation in Turret.java
 2020-10-30 09:30:59 -04:00
Anuken
73035b9211
Merge branch 'master' into formatting 2020-10-30 09:26:51 -04:00
Anuken
513ccfe581 Merge remote-tracking branch 'origin/master' 2020-10-30 09:24:09 -04:00
Anuken
782307374f Fixed #3189 / Fixed #3187 2020-10-30 09:24:05 -04:00
Anuken
c0d1ff0f08
Merge pull request #3192 from Voz-Duh/full-unit-in-menu 
Full Unit In Menu
 2020-10-30 09:21:58 -04:00
Voz-Duh
36fdf4afbc Full Unit In Menu 2020-10-30 14:21:13 +03:00
YellOw139
790a802236
Indev pop-up slip-by fix 2020-10-30 12:33:40 +02:00
TheJaaju
b45e7cd8f3
Update bundle_fi.properties 
More translations
 2020-10-30 11:17:58 +02:00
Sunny Kim
ecaa0a4eaa
Some liquid turrets are not caring enough 2020-10-30 16:44:54 +09:00
Anuken
a9f5aa9220 suffering 2020-10-29 19:58:10 -04:00
Anuken
ae35b2ff7e arc 2020-10-29 19:04:37 -04:00
Anuken
1663497e6c Better save validation 2020-10-29 19:03:58 -04:00
YellOw139
fca8d6741c
Yet another typo 2020-10-29 23:27:15 +02:00
YellOw139
97e9cdc1fd
Fixed real confusing entry 2020-10-29 23:25:44 +02:00
YellOw139
e9089aae68
Update bundle_ro.properties 2020-10-29 21:53:18 +02:00
Anuken
afed4c4239
Merge pull request #3184 from MEEPofFaith/any-layer-effects 
Any Layer Effects
 2020-10-29 13:58:55 -04:00
Anuken
3eb655402f
Merge pull request #2978 from Volas171/patch-1 
Update bundle_es.properties
 2020-10-29 13:39:11 -04:00
Anuken
0c418d1a09 Libs 2020-10-29 11:51:17 -04:00
Anuken
2ad14cc884 Merge remote-tracking branch 'origin/master' 2020-10-29 10:26:35 -04:00
Anuken
77e6030c59 Fixed #3173 2020-10-29 10:26:32 -04:00
Sunny Kim
f2b5553f54
bug squish 2020-10-29 19:04:38 +09:00
Petr Gašparík
bced413810 Czech translation for latest version 
up to commit 44286ce
 2020-10-29 09:08:14 +01:00
MEEP of Faith
a14ae1bdf8
Lightning chance fix. 2020-10-28 21:00:24 -07:00
MEEP of Faith
1e3b498671 Any Layer Effects 2020-10-28 20:46:50 -07:00
Leonwang4234
19bc6f6e48 Update Turret.java 2020-10-28 20:09:45 -07:00