Anuken
3b991952b1
Merge remote-tracking branch 'origin/master'
2020-11-21 14:06:06 -05:00
Anuken
6fba84959c
New hint tutorial system (unfinished!)
2020-11-21 14:05:58 -05:00
YellOw139
0662fd8427
Sector not found
2020-11-21 20:55:53 +02:00
Patrick 'Quezler' Mounier
c6657109b1
Sync construction blocks
2020-11-21 16:59:09 +01:00
Nikolass1000
0422cf79b2
Polish language update.
2020-11-21 15:33:21 +01:00
DeltaNedas
09eed078cd
unified extend and extendContent to work for any class
2020-11-21 13:04:17 +00:00
Skat
2b22170318
[Typo] communitycommunity servers
2020-11-21 10:31:10 +03:00
Felix Corvus
589971a8c3
1 new line
...
sector.curlost
2020-11-21 02:09:15 +03:00
Anuken
522a7f4728
Fixed #3493 but for point defense turrets
2020-11-20 12:53:51 -05:00
Anuken
06921b53be
Fixed #3493
2020-11-20 12:53:09 -05:00
Anuken
1372fc4079
Fixed sector gameover ghost bug
2020-11-20 12:38:16 -05:00
Angel_24
07b12890e8
Update bundle_es.properties
2020-11-20 18:14:55 +01:00
Angel_24
c014f86f2b
Update bundle_es.properties
...
"Titanium" conveyor duplicated on "Plastanium"
2020-11-20 17:39:52 +01:00
Anuken
814065bf8e
Removed Rules#tutorial
2020-11-20 11:23:30 -05:00
Anuken
abdccbb1bd
Fixed #3487 / Fixed #3484
2020-11-20 09:13:36 -05:00
YellOw139
88535665e8
revert
2020-11-20 07:36:11 +02:00
YellOw139
75744256f9
Brief test
2020-11-20 07:31:50 +02:00
Anuken
a0f1f52a8b
CI cleanup
2020-11-19 19:44:49 -05:00
Anuken
a7aad1a1f9
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# .github/workflows/gradle.yml
2020-11-19 18:53:15 -05:00
Anuken
f71b726877
Testing Github Actions CI
2020-11-19 18:53:02 -05:00
Petr Gašparík
e700ef179e
Czech translation up to commit 72d5a8a
.
...
Hell of a work.
2020-11-20 00:33:13 +01:00
Patrick 'Quezler' Mounier
a6d1ac0b86
Use icon font in favor of def
2020-11-19 21:08:07 +01:00
Patrick 'Quezler' Mounier
637cca2e66
Probably one more
2020-11-19 20:50:14 +01:00
Patrick 'Quezler' Mounier
72136ebea3
Or is it?
2020-11-19 20:36:58 +01:00
Patrick 'Quezler' Mounier
ce045a470a
Update NetClient.java
2020-11-19 20:34:49 +01:00
Patrick 'Quezler' Mounier
07893eee9c
Allow for plugins to trigger the same alerts as sectors and guardians
2020-11-19 19:50:30 +01:00
Anuken
15ef32447c
Merge remote-tracking branch 'origin/master'
2020-11-19 13:31:03 -05:00
Anuken
aef6ac4335
Made RepairAI only move toward ally buildings
2020-11-19 13:30:59 -05:00
Angel_24
ef2ff385b8
Añadido el "cada" de nuevo
...
Sabía que se me olvidaba algo, pero no tuve tiempo de revisarlo.
2020-11-19 19:21:40 +01:00
Patrick 'Quezler' Mounier
dd9b85f79b
Give some techtree brackets a new line
2020-11-19 18:32:03 +01:00
Anuken
97c3d36bae
Re-added preloading of ground enemy path / Core unit casing FX
2020-11-19 12:31:27 -05:00
Anuken
7612a22480
Implemented legacy (V5) research loading
2020-11-19 11:55:46 -05:00
Felix Corvus
f07a108410
1 line changed
...
block.interplanetary-accelerator.description
2020-11-19 19:08:25 +03:00
Anuken
bbc8c05f93
Merge pull request #3354 from Prosta4okua/master
...
[Bundle][RU] actual L10n
2020-11-19 10:39:15 -05:00
Anuken
bfbb082fd8
Merge pull request #3393 from Prosta4okua/patch-8
...
Ukrainian translation
2020-11-19 10:37:05 -05:00
Anuken
89ef2ac4d3
Naval research requirements for final sector
2020-11-19 10:23:46 -05:00
Anuken
506175212c
Merge remote-tracking branch 'origin/master'
2020-11-19 10:14:49 -05:00
Anuken
b57b1966a7
Switched to ALSA Soloud backend / Fixed sound muffling at start
2020-11-19 10:14:44 -05:00
Anuken
08a50edb23
Merge pull request #3456 from DeltaNedas/mapsize
...
add @mapx/y to logic processor
2020-11-19 10:12:32 -05:00
Anuken
95c242a2e1
Fixed final sector missing waves / Fixed audio not working on Android
2020-11-19 09:43:15 -05:00
Felix Corvus
49a1a0b768
5 new lines; 1 line changed
...
New:
- indev.campaign
- launch.from
- sector.planetaryTerminal.name
- block.interplanetary-accelerator.name
- block.interplanetary-accelerator.description
Changed:
- sector.extractionOutpost.name
2020-11-19 17:43:08 +03:00
Angel_24
31d401340c
Update bundle_es.properties
2020-11-19 14:57:16 +01:00
Angel_24
c3df430a4e
Update bundle_es.properties
2020-11-19 14:56:12 +01:00
YellOw139
babb6616ef
Interplanetary strings
2020-11-19 10:02:32 +02:00
DeltaNedas
a44ef1f063
wh
2020-11-19 07:10:51 +00:00
Anuken
72d5a8a768
Added "Launching From" info
2020-11-18 20:05:45 -05:00
Anuken
8692639e62
Fixed foreshadow coolant stat roundoff error
2020-11-18 19:08:26 -05:00
Anuken
1ef264d560
Added final campaign map (WIP, untested)
2020-11-18 18:58:54 -05:00
Anuken
63d4428527
Fixed #3453
2020-11-18 18:29:31 -05:00
DeltaNedas
4beca5e07d
add @mapx/y to logic processor
2020-11-18 23:22:11 +00:00
Angel_24
071d98dbfa
Update bundle_es.properties
2020-11-18 20:48:12 +01:00
Anuken
2758e65e19
Fixed typo
2020-11-18 13:30:35 -05:00
Anuken
129d76ad7e
Fixed #3449
2020-11-18 13:20:23 -05:00
Anuken
f4a7288633
Fixed #3447
2020-11-18 09:26:31 -05:00
Felix Corvus
8b48ef4f92
3 changed lines
...
- stats
- sector.curcapture
- sector.fungalPass.description
2020-11-18 13:15:08 +03:00
YellOw139
9fe01eec38
Translation Allowed + few commit bumps
2020-11-18 10:55:41 +02:00
Felix Corvus
0ee8c2362f
18 new lines; 2 changed lines; 3 removed lines
...
New:
- gameover.disconnect
- gameover.waiting
- stats
- showui
- wave.enemycores
- wave.enemycore
- requirement.produce
- sectors.export
- sectors.time
- sectors.threat
- sectors.wave
- sector.curcapture
- sector.attacked
- sector.lost
- sector.captured
- planets
- sector.extractionOutpost.name
- block.resupply-point.description
Changed:
- indev.popup
- item.scrap.description
Removed:
- bestwave
- sector.crags.name
Various notes & todos
2020-11-18 11:51:13 +03:00
Anuken
adc7b30eab
Limited all logic strings/symbols to 30 characters
2020-11-17 21:01:25 -05:00
Anuken
527be41e32
Merged Unit & Builder components / Cleanup
2020-11-17 19:40:18 -05:00
Anuken
8280166485
Cleanup
2020-11-17 16:06:02 -05:00
Anuken
e453c6033a
Cleanup
2020-11-17 15:05:24 -05:00
Prosta4okua
949ad79ade
Update bundle_uk_UA.properties
2020-11-17 20:48:01 +02:00
Prosta4okua
daabdf486f
Update bundle_uk_UA.properties
2020-11-17 20:40:27 +02:00
Prosta4okua
8b50bb68e7
Update bundle_uk_UA.properties
2020-11-17 20:33:05 +02:00
Prosta4okua
bd654fda76
Update bundle_uk_UA.properties
2020-11-17 20:29:26 +02:00
Anuken
40ae2e64c8
Merge remote-tracking branch 'origin/master'
2020-11-17 11:23:54 -05:00
Anuken
78ae6dde4f
Fixed deconstruction area not being queued [Mobile]
2020-11-17 11:23:50 -05:00
Anuken
2071bad22d
Merge pull request #3426 from MEEPofFaith/continuous-weapon-recoil
...
Begin reloading continuous weapons after the bullet finishes.
2020-11-17 11:05:17 -05:00
Anuken
1e2b593152
Added more validaiton for sector capture events
2020-11-17 10:20:57 -05:00
Anuken
b46676014b
Fixed #3431 / Fixed #3432 / Fixed #3429 / Fixed #3435 / Fixed #3434
2020-11-17 10:18:08 -05:00
Anuken
3c36749990
Implemented automatic co-op sector change sync
2020-11-17 09:39:28 -05:00
YellOw139
73955611d1
sector stuff
2020-11-17 11:22:04 +02:00
Anuken
280e345faf
Cleanup
2020-11-16 19:50:15 -05:00
Anuken
f296d23cfa
Bugfixes
2020-11-16 19:43:56 -05:00
MEEP of Faith
c72a9166a6
;)
2020-11-16 16:22:38 -08:00
MEEP of Faith
ffca824474
Begin reloading continuous weapons after the bullet finishes.
2020-11-16 16:11:36 -08:00
Anuken
3b609f698a
Fixed #3422
2020-11-16 17:41:42 -05:00
Anuken
242109f34e
Mobile font border fix
2020-11-16 17:00:14 -05:00
Anuken
4b733fe244
Merge remote-tracking branch 'origin/master'
2020-11-16 16:32:10 -05:00
Anuken
74f083b897
Better sector icons
2020-11-16 16:31:55 -05:00
Anuken
f9580c7864
Merge pull request #3421 from MEEPofFaith/fix-absorbing-lasers
...
Lasers cannot and should not collide with anything.
2020-11-16 15:41:36 -05:00
MEEP of Faith
361ed26907
Lasers cannot and should not collide with anything.
2020-11-16 12:24:36 -08:00
Anuken
3b47cb03bc
Merge remote-tracking branch 'origin/master'
2020-11-16 14:21:39 -05:00
Anuken
8577eb9484
New sector display UI
2020-11-16 14:21:30 -05:00
Anuken
272a7af1ae
Merge pull request #2575 from Voz-Duh/team-colors-for-payload-distributions
...
Team Colors For Payload Conveyor and Router
2020-11-16 12:35:27 -05:00
Anuken
33e8489f42
Bugfixes
2020-11-16 09:18:53 -05:00
YellOw139
f56c944329
translation forbidden
2020-11-16 07:55:48 +02:00
Anuken
bdee65e925
Sector preset display
2020-11-15 23:09:40 -05:00
Anuken
bf79e1a3d7
Map fixes
2020-11-15 20:34:02 -05:00
Anuken
bedf93f0e0
Cleanup
2020-11-15 20:20:37 -05:00
Anuken
a172c12e5d
Auto-destruction of enemies after attack sector capture
2020-11-15 18:59:23 -05:00
Anuken
7bd05ad9ad
New campaign map / Fixed #3414
2020-11-15 17:11:52 -05:00
YellOw139
7affde5a2e
oh no no ui
2020-11-15 23:49:30 +02:00
YellOw139
4a46baecae
Updated indev and scrap
2020-11-15 22:46:13 +02:00
Anuken
9928b0f788
#3412 but not broken
2020-11-15 15:29:31 -05:00
Anuken
c95872e992
#3413 but better
2020-11-15 15:05:34 -05:00
Anuken
c0786b31be
Merge remote-tracking branch 'origin/master'
2020-11-15 12:52:33 -05:00
Anuken
d53b074760
Tutorial removed / Logic block group
2020-11-15 12:52:29 -05:00
Anuken
18cb0eeec6
Merge pull request #3323 from DeltaNedas/files
...
add file picker interface for mods
2020-11-15 11:51:50 -05:00
Anuken
1959ada854
Merge remote-tracking branch 'origin/master'
2020-11-15 11:40:20 -05:00
Anuken
fca1cacb30
Fixed #3411 / Fixed unit tests
2020-11-15 11:40:17 -05:00
YellOw139
e9f7ba5f41
Enemy Cores in Sectors
2020-11-15 18:16:58 +02:00
Anuken
3870c64b60
Merge pull request #3388 from younggam/patch-5
...
protected->public for mod supports
2020-11-15 11:07:48 -05:00
Anuken
aebd3f959f
Fixed #3402 / Fixed #3403 / Fixed #3401 / Fixed #3404 / Disabled derelict updates
2020-11-15 10:54:09 -05:00
Anuken
49e4aaa49b
Bugfixes
2020-11-14 19:49:11 -05:00
Anuken
135c780f35
Fixed #3400
2020-11-14 19:06:21 -05:00
Anuken
6c2541491f
More campaign water
2020-11-14 17:34:35 -05:00
Antsiferov Andrew
d94765f470
content.sector.name
2020-11-15 01:09:34 +03:00
Anuken
4975def352
Cleanup
2020-11-14 17:00:12 -05:00
YellOw139
775b3592a3
reqs typos/improvements
2020-11-14 22:14:13 +02:00
YellOw139
59a7b584fb
req.produce
2020-11-14 22:10:24 +02:00
Anuken
0c050a3ef4
Merge remote-tracking branch 'origin/master'
2020-11-14 15:02:51 -05:00
Anuken
bd4badc274
More campaign tweaks
2020-11-14 15:02:47 -05:00
Anuken
21b1a0aedf
Merge pull request #3387 from MEEPofFaith/patch-1
...
Remove extra Omura cannon image.
2020-11-14 14:28:54 -05:00
Anuken
87050b6c56
Merge pull request #3396 from DeltaNedas/master
...
add mining/mineX/mineY sensors
2020-11-14 13:37:47 -05:00
Anuken
c96f4609d0
Research system changes, unfinished
2020-11-14 13:36:43 -05:00
DeltaNedas
9bde0dc18a
multiple inheritance h
2020-11-14 18:18:52 +00:00
DeltaNedas
b66294b50a
add mining/mineX/mineY sensors
2020-11-14 18:09:46 +00:00
Prosta4okua
4a25063a29
Update bundle_uk_UA.properties
2020-11-14 15:50:53 +02:00
Prosta4okua
6b2ba8b432
Update bundle_uk_UA.properties
2020-11-14 15:48:59 +02:00
Prosta4okua
6753ab7c6e
Update bundle_uk_UA.properties
2020-11-14 15:33:53 +02:00
Felix Corvus
dbc446f400
11 new lines
...
New:
threat.low
threat.medium
threat.high
threat.extreme
threat.eradication
sector.biomassFacility.name
sector.windsweptIslands.name
stat.weapons
stat.bullet
bullet.sapping
bullet.healpercent
2020-11-14 12:20:28 +03:00
YellOw139
3055485e17
Good stuff I can't even translate
2020-11-14 10:22:59 +02:00
younggam
bfc2b08bcc
ammo protectd->public
2020-11-14 14:56:47 +09:00
younggam
4d66d63da2
requirements protected->public
2020-11-14 14:55:59 +09:00
younggam
4ee4e39518
constructor protected->public
2020-11-14 14:54:22 +09:00
MEEP of Faith
659be11b7d
Remove extra omura cannon image.
...
It has the `-heat` prefix, so the game is using this instead of its actual heat sprite to draw heat.
2020-11-13 19:00:21 -08:00
Anuken
7559996227
Bugfixes / New campaign map
2020-11-13 19:03:27 -05:00
Anuken
04c465c8f0
Bugfixes
2020-11-13 17:33:32 -05:00
YellOw139
bd992b4612
Unit stats look threatening
2020-11-14 00:01:17 +02:00
Prosta4okua
ea41e38706
Оновлення
...
Залишилось перевіти десь зо 30 рядків
2020-11-13 23:59:24 +02:00
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