Commit Graph

6417 Commits

Author SHA1 Message Date
Patrick 'Quezler' Mounier
e2b9977ebc
Remove omnidirectional due to issues 2020-03-05 21:27:28 +01:00
Patrick 'Quezler' Mounier
3e51abf6eb
Try to fix blending with omnidirectional 2020-03-05 21:24:51 +01:00
Patrick 'Quezler' Mounier
c1f765a467
Bodge in a rotational blend bypass 2020-03-05 20:26:34 +01:00
Patrick 'Quezler' Mounier
e67667e4a3
Remove preemtive unload 2020-03-05 20:09:09 +01:00
Patrick 'Quezler' Mounier
14a97976cc
Realign pixels
Bothered me for ages.
2020-03-05 19:48:36 +01:00
Patrick 'Quezler' Mounier
4a3e00f822
Fix early return 2020-03-05 15:21:41 +01:00
Patrick 'Quezler' Mounier
3ac50a3f3e
, 2020-03-05 14:42:37 +01:00
Patrick 'Quezler' Mounier
6fb4c79f82
Fix sleeping while reloading 2020-03-05 14:29:27 +01:00
Patrick 'Quezler' Mounier
9c75133fc8
Blend tripod dumper with conveyors 2020-03-05 14:21:41 +01:00
Patrick 'Quezler' Mounier
fd61add2e4
Cleanup update loop 2020-03-05 14:10:28 +01:00
Patrick 'Quezler' Mounier
acd695a469
Messy cleanup 2020-03-05 13:40:44 +01:00
Patrick 'Quezler' Mounier
5036506547
Rotate smoother 2020-03-05 13:28:23 +01:00
Patrick 'Quezler' Mounier
b0becbad38
Fix unloading prematurely 2020-03-05 13:22:50 +01:00
Patrick 'Quezler' Mounier
bcb87f8f76
Update description accordingly 2020-03-05 12:15:38 +01:00
Patrick 'Quezler' Mounier
ecb09c0f04
Dump like bridges do 2020-03-05 12:11:55 +01:00
Patrick 'Quezler' Mounier
e7298702a1
Delete drafts 2020-03-05 10:50:21 +01:00
Patrick 'Quezler' Mounier
b74cf71f40
Come up with a new description 2020-03-05 10:50:08 +01:00
Patrick 'Quezler' Mounier
2025c7c669
Fix mech dropoff ¬ working 2020-03-05 10:35:48 +01:00
Patrick 'Quezler' Mounier
00249f62b6
Cleanup if chains 2020-03-05 10:28:10 +01:00
Patrick 'Quezler' Mounier
9df875354a
Revert "Repurpose branch to be played"
This reverts commit ff578c8540.

# Conflicts:
#	tools/crater-deploy.sh
2020-03-05 10:10:00 +01:00
Patrick 'Quezler' Mounier
9bc340ba17
Fix end ¬ rendering 2020-03-05 10:08:22 +01:00
Patrick 'Quezler' Mounier
79c965bf8d
Move sleep detector to renderer 2020-03-05 10:08:15 +01:00
Patrick 'Quezler' Mounier
e5e4884448
Merge branch 'master' into crater
# Conflicts:
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites3.png
#	core/assets/sprites/sprites5.png
#	core/src/mindustry/world/modules/ItemModule.java
2020-03-05 10:00:02 +01:00
Anuken
0534a4da45
Update bundle_zh_TW.properties (#1665) 2020-03-04 13:53:54 -05:00
Anuken
31c9b61358
Updated join.info (#1666) 2020-03-04 13:53:47 -05:00
Anuken
ff44b0ca85
Small RU fix (#1670) 2020-03-04 13:53:27 -05:00
Anuken
a36a0cad53
RU updates to Android description (#1663) 2020-03-04 13:53:19 -05:00
Anuken
0dfb3b1c1b
Update achievements.vdf (#1668)
* Update achievements.vdf

* Update achievements.vdf

* Update achievements.vdf

Co-authored-by: Anuken <arnukren@gmail.com>
2020-03-04 13:53:12 -05:00
Anuken
c7112a706a
Update bundle_uk_UA.properties (#1636)
* Update bundle_uk_UA.properties

* Update uk metadata

* Update uk bundles

* Update achievemnts
2020-03-04 13:52:20 -05:00
Anuken
2684a960fa
Create 104.4 (#1671)
* Create 104.4

* Update 104.4
2020-03-04 13:52:02 -05:00
Anuken
a5e07bfd29
Created fastlane/metadata/android/ru-RU/changelogs (#1669)
* Created fastlane/metadata/android/ru-RU/changelogs

104.4.txt

* Update 104.4.txt
2020-03-04 13:51:56 -05:00
Patrick 'Quezler' Mounier
3b2b7be72a
Remove nested app.post (#1667) 2020-03-04 11:58:16 -05:00
Anuken
c96427c722 Bugfixes 2020-03-04 09:01:41 -05:00
Anuken
503607e36a Fixed #1661 2020-03-04 08:39:48 -05:00
Anuken
64c1800391 Merge remote-tracking branch 'origin/master' 2020-03-03 12:11:49 -05:00
Anuken
2a191a45be Cleanup 2020-03-03 12:11:47 -05:00
Anuken
e8823fab36 More concise stream class 2020-03-03 12:11:35 -05:00
Aldas
cdb8682d43
Updated data.import.confirm lane (#1658)
Updated data.import.confirm lane
2020-03-03 10:36:34 -05:00
fuzzbuck
8e9dabb350
Add "pardon" command for votekicks (#1570)
* Add "pardon" command

Allows players who have been incorrectly votekicked to join again

* isn't hasn't

* getInfoOptional & space

* pardon me

no pun intended

* Update ServerControl.java
2020-03-02 13:37:04 -05:00
Anuken
ceac809c1d Cleanup 2020-03-02 10:44:56 -05:00
Recessive
b512169d44
Added AA ffa to server list (#1605)
* Added AA ffa to server list

* Changed ip to use custom domain
2020-03-02 10:40:50 -05:00
Aldas
d3b7dd973f
Grammar corrections (#1656)
Grammar and logic corrections
2020-03-02 10:02:56 -05:00
Anuken
f88fe898ff Updated bundle 2020-03-01 21:23:50 -05:00
Lapis+
d93ca520ae
Update bundle_ja.properties (#1578) 2020-03-01 21:09:08 -05:00
Vanguard
cdf8514ac8
RU updates (#1584)
* 1 changed line, 1 removed line

Changed:
keybind.zoom.name

Removed:
keybind.zoom_hold.name

Moved some lines around to keep them in the same order with bundle.properties

* 1 changed line

tutorial.intro

* 3 new lines, 3 changed lines

New:
mod.erroredcontent
mod.errors
mod.noerrorplay

Changed:
mod.requiresversion
mod.remove.confirm
details

* 2 changed lines

mods.guide
mod.import.github

* 1 new line

link.feathub.description

* 1 changed line

item.graphite.description

* 1 changed line

block.mass-driver.description

* 9 new lines, 1 changed line

New:
be.update
be.update.confirm
be.updating
be.ignore
be.noupdates
be.check
server.kicked.serverRestarting
setting.coreselect.name
rules.blockhealthmultiplier

Changed:
wave.enemy

* 3 changed lines

quit.confirm.tutorial
setting.coreselect.name
public.confirm

* 22 changed lines

mod.missing
item.plastanium.name
block.plastanium-wall.name
block.plastanium-wall-large.name
block.plastanium-compressor.name
item.scrap.description
item.spore-pod.description
item.blast-compound.description
liquid.oil.description
unit.revenant.description
block.multi-press.description
block.plastanium-compressor.description
block.spore-press.description
block.power-source.description
block.force-projector.description
block.conveyor.description
block.mass-driver.description
block.liquid-junction.description
block.phase-conduit.description
block.thorium-reactor.description
block.blast-drill.description
block.cyclone.description

* 3 new lines, 2 removed lines

New:
setting.bridgeopacity.name
block.liquid-void.name
block.liquid-void.description

Removed:
block.signal
block.editsignal

* 1 new line

data.openfolder

* 1 changed line

block.cryofluidmixer.description

* 2 new lines

block.underflow-gate.name
block.underflow-gate.description

* 2 changed lines

unit.thousands
unit.millions

* 3 new lines

blocks.tiles
blocks.affinities
setting.playerlimit.name

* 1 changed line

block.underflow-gate.name

* 1 changed line

unit.thousands

* 1 changed line

blocks.affinities

* 1 changed line (reverted)

unit.thousands

* Update bundle_ru.properties

* 1 new line

mod.display

* 1 changed line

techtree

* 1 changed line (new approach)

techtree

* 1 changed line

editor.generate

* 1 new line

stat.playtime

* 3 new lines

servers.local
servers.remote
servers.global

* 3 changed lines

servers.local
servers.remote
servers.global

* 1 changed line

setting.pixelate.name

* 1 line removed

schematic.replace

* 1 new line

rules.solarpowermultiplier

* 2 changed lines

unit.thousands
unit.millions

Co-authored-by: Anuken <arnukren@gmail.com>
Co-authored-by: Prosta4okua <31485341+Prosta4okua@users.noreply.github.com>
2020-03-01 21:06:16 -05:00
Dexapnow
62c7b5f691
Update bundle_pl.properties (#1643) 2020-03-01 21:04:07 -05:00
AmateurPotion
a6ddb1d187
Update bundle_ko.properties (#1629) 2020-03-01 21:03:41 -05:00
StarMiner99
4c28c30228
[Lang] Changed some nl Translations (#1626)
* fixed translations till line 180

fixed nl translations

* Fixed most nl translations

* small fixes

suggested by Quezler
2020-03-01 21:03:00 -05:00
Anuken
c3a790bfd2 2 2020-03-01 16:29:04 -05:00
Anuken
7d84300c31 Updated arc 2020-03-01 16:22:38 -05:00