Anuken
5a0d079a78
oh no
2020-03-05 18:05:59 -05:00
Anuken
2dfbbdfd5b
Beginning work on respawning
2020-03-05 12:12:03 -05:00
Anuken
39ee31d748
Fixed #1673
2020-03-05 08:45:14 -05:00
Anuken
882076030d
Added back tapping
2020-03-04 19:58:48 -05:00
Anuken
c02c00cdfb
Schematic tweaks and improvements
2020-03-04 19:21:40 -05:00
Anuken
3eea0ea065
Bugfixes, tweaks
2020-03-04 13:48:00 -05:00
Anuken
fbbec816e8
Merged in object configuration
2020-03-04 13:33:14 -05:00
Anuken
cf31293d7b
Many internal changes
2020-03-04 13:32:31 -05:00
Anuken
aeae286273
Merge branch '6.0' of https://github.com/Anuken/Mindustry into object-config
...
# Conflicts:
# core/src/mindustry/entities/traits/BuilderTrait.java
# core/src/mindustry/entities/type/TileEntity.java
# core/src/mindustry/game/EventType.java
# core/src/mindustry/game/Schematics.java
# core/src/mindustry/input/InputHandler.java
# core/src/mindustry/io/TypeIO.java
# core/src/mindustry/world/Block.java
# core/src/mindustry/world/blocks/distribution/Sorter.java
2020-03-04 08:38:36 -05:00
Anuken
2581353c5e
Merge branch '6.0' of https://github.com/Anuken/Mindustry into object-config
...
# Conflicts:
# core/src/mindustry/entities/traits/BuilderTrait.java
# core/src/mindustry/entities/type/TileEntity.java
# core/src/mindustry/game/EventType.java
# core/src/mindustry/game/Schematics.java
# core/src/mindustry/input/InputHandler.java
# core/src/mindustry/io/TypeIO.java
# core/src/mindustry/world/Block.java
# core/src/mindustry/world/blocks/distribution/Sorter.java
2020-03-03 21:33:03 -05:00
Anuken
087f8129b9
Tile code cleanup
2020-03-03 19:29:41 -05:00
Anuken
bac1648d4b
Added support for changing cached floor/terrain
2020-03-03 17:01:09 -05:00
Anuken
f1aadd97a8
Merge branch 'master' of https://github.com/Anuken/Mindustry into 6.0
...
# Conflicts:
# core/src/mindustry/core/Logic.java
# gradle.properties
2020-03-03 12:12:25 -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
Anuken
3858cdd4c5
Added map region class
2020-03-03 12:08:31 -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
182a8837be
Save satellite presence
2020-03-01 20:58:33 -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
Anuken
ab7e840eee
Cleanup
2020-03-01 16:20:42 -05:00
Anuken
a31de609ce
BufferUtils -> Buffers
2020-03-01 16:19:04 -05:00
Anuken
9ddd76d6cb
Cleanup
2020-03-01 15:41:10 -05:00
Anuken
c6fc103bff
Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0
2020-03-01 12:55:51 -05:00
Anuken
6f5815abc8
Merge remote-tracking branch 'origin/master'
2020-03-01 12:34:07 -05:00
Anuken
c59a3116ad
Better JNI error checking (**needs recompilation**)
2020-03-01 12:34:01 -05:00
Anuken
3ed5282e14
Better sector null checks
2020-03-01 12:15:38 -05:00
Anuken
51cec64118
Merge remote-tracking branch 'origin/6.0' into 6.0
2020-03-01 00:09:07 -05:00
Anuken
a2a9cffdee
Moved some methods around
2020-03-01 00:09:03 -05:00
Prosta4okua
057f3aead7
Update bundle_uk_UA.properties ( #1644 )
2020-02-29 21:46:38 -05:00
Anuken
4b36a6d5bd
Bugfixes
2020-02-29 19:37:14 -05:00
Anuken
26c328ae34
Bugfixes and cleanup
2020-02-29 12:43:37 -05:00
Anuken
7a01719816
Real-time lighting + solar system rendering
2020-02-29 11:58:10 -05:00
Aldas
bcc901b3ef
Add bundle_lt.properties for lithuanian translation ( #1650 )
...
* Create bundle_lt.properties file
Translated first 480 lines. Soon other half will be translated
* Update bundle_lt.properties
* Update bundle_lt.properties
* Update bundle_lt.properties
* Update bundle_lt.properties
* Update bundle_lt.properties
2020-02-29 09:02:45 -05:00
Anuken
f0857fa22d
Universe time + Progress on solar system framework
2020-02-28 20:21:00 -05:00
b1tt
56b2b8ed79
gp ru full_description.txt grammar fix ( #1645 )
...
unnecessary comma ig
2020-02-28 15:47:28 -05:00
Anuken
38ab1473f2
Backport of fixed lighting + overflow crash fix
2020-02-28 13:46:16 -05:00
Anuken
04f8282821
Better lighting
2020-02-28 13:44:03 -05:00
Anuken
120d96c775
Sun + dynamic lighting
2020-02-28 13:18:06 -05:00
