Commit Graph

9707 Commits

Author SHA1 Message Date
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
Anuken
4e7d6e9a9d Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-11-12 18:46:24 -05:00
Anuken
6eaec7d505 Bugfixes + Binary and 2020-11-12 18:46:20 -05:00
Anuken
d9d4360b49 Merge pull request #3372 from L0615T1C5-216AC-9437/patch-2
Add Chaotic Neutral's name and new attack server
2020-11-12 18:28:49 -05:00
Anuken
d1d3ef0c67 Sound framework improvements 2020-11-12 18:07:26 -05:00
L0615T1C5-216AC-9437
addcf350b2 Add Chaotic Neutral's name and new attack server 2020-11-12 14:55:36 -05: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
Anuken
c2aa655d87 Merge pull request #3365 from younggam/patch-4
little java mod support
2020-11-12 09:35:52 -05:00
younggam
f03c022db8 Update Pump.java 2020-11-12 20:52:23 +09: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 v113.2 2020-11-11 17:13:26 -05:00
Anuken
6cb22dd190 arc 2020-11-11 17:13:19 -05:00
Anuken
538f1d7330 Fixed #3352 / Fixed #3355 / Quad sounds 2020-11-11 17:12:42 -05:00
Anuken
9ef57c0366 Merge pull request #3345 from DeltaNedas/nothing
nothing
2020-11-11 15:01:36 -05:00
Anuken
cf4f912cef Cleanup 2020-11-11 14:55:16 -05:00
Anuken
988fdb0c9b Fixed impact0078 missing wave 2020-11-11 14:08:57 -05:00
Anuken
f86984b5fc Merge branch 'master' of https://github.com/Anuken/Mindustry v113.1 2020-11-11 13:42:35 -05:00
Anuken
0f61e8cfd9 arc 2020-11-11 13:42:30 -05:00
DeltaNedas
a3d4c239d1 nothing 2020-11-11 18:28:42 +00:00
Anuken
a0e2fc3a67 Updated servers to new format 2020-11-11 13:27:27 -05:00
Anuken
112b91469b arc 2020-11-11 13:19:57 -05:00
Anuken
529bae8972 Fixed #3344 2020-11-11 12:45:30 -05:00
Anuken
d909683f1d Fixed #3342 v113 2020-11-11 11:45:50 -05:00
Anuken
eba559d0ff But does the iOS version need MP3s now? 2020-11-11 11:22:41 -05:00
Anuken
f5ffee54ac arc 2020-11-11 10:57:36 -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
4f4f8f08bb arc 2020-11-11 09:28:28 -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
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
Thomas Widyantoko
0ec8bcc778 Merge pull request from Quick-korkc
Item and building details translate
2020-11-11 04:02:38 +07:00
Jimmy Engelbrecht
89788d1fa8 Better and more complete swedish translations. 2020-11-10 21:13:07 +01:00
Anuken
8d3df82f81 arc 2020-11-10 14:54:49 -05:00
Anuken
002265f911 arc 2020-11-10 14:54:46 -05:00