Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,404 Commits 4 Branches 180 Tags
3858cdd4c58e81f58d2a9ffdb4e82feaea9191bf
Commit Graph

4304 Commits

Author SHA1 Message Date
iczero
2e315e5516 Fix builderID remaining -1 for Call.onDeconstructFinish (#1162) 
BuildEntity.deconstruct is missing code to set builderID,
so the builderID parameter is always set to -1 in
Call.onDeconstructFinish. The same code exists in
BuildEntity.construct.
 2019-12-04 21:54:50 -05:00
Anuken
a087df0771 Added experimental server block syncing 2019-12-04 17:03:49 -05:00
Anuken
1e3bfba31a this engine is also broken 2019-12-03 17:16:23 -05:00
Anuken
5788c27aaa hmmm 2019-12-03 01:01:18 -05:00
Anuken
8445c8e974 speed 2019-12-03 00:21:11 -05:00
Anuken
9e3870acbe Merge branches 'master' and 'mech-rework' of https://github.com/Anuken/Mindustry into mech-rework 
# 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/io/anuke/mindustry/world/blocks/defense/MendProjector.java
#	gradle.properties
 2019-12-02 22:45:05 -05:00
Anuken
5c30f4bc9c Fixed nothing 2019-12-02 17:52:49 -05:00
Anuken
78f146fbcf Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0 
# 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/io/anuke/mindustry/graphics/Shaders.java
#	gradle.properties
 2019-12-01 17:42:56 -05:00
Anuken
42687fb47e Fixed crash caused by missing sounds 2019-12-01 17:35:47 -05:00
Anuken
9cb55b9745 a mess 2019-12-01 14:21:47 -05:00
Anuken
0e7c403bd8 Tweaks 2019-12-01 12:32:35 -05:00
Anuken
b6915a0483 Fixed script load crash 2019-12-01 01:30:40 -05:00
Anuken
ceae04aa5b Desktop-specific scripting 2019-11-30 18:30:39 -05:00
Anuken
3abcdf2063 Better access 2019-11-30 17:45:02 -05:00
Anuken
7e993c15dc Moved documentation 2019-11-29 21:56:53 -05:00
Anuken
57f9aeee86 Public block fields / Better scripting 2019-11-27 13:51:07 -05:00
Anuken
eabbd2fa32 """security""" 2019-11-27 00:07:37 -05:00
Anuken
d9aa9b6278 Desktop scripting support 2019-11-26 23:32:30 -05:00
Anuken
1e1b84a201 Merge branches 'master' and 'mod-spritepack-refactor' of https://github.com/Anuken/Mindustry 2019-11-25 23:55:18 -05:00
Anuken
e6753ace87 Cleanup 2019-11-25 23:43:58 -05:00
Anuken
a5fbc07561 Texture overrides / Potential mod texture binding optimizations 2019-11-25 20:50:32 -05:00
Felix Corvus
2631c4f7af adding millions & thousands localisation (#1132) 
* "mil" / "k" localisation adding

* "mil" / "k" localisation adding

* Update bundle.properties

* Update bundle_ru.properties
 2019-11-25 20:48:53 -05:00
Anuken
01304bf734 Fixed bizzare crash 2019-11-25 18:41:09 -05:00
matheod
dabdd094f9 Add storable indication in core database (#1124) 
* Add storable in core indication in core database

* Add corestorable text

* French translation of corestorable
 2019-11-24 01:35:16 -05:00
Anuken
78fefdacca Merge remote-tracking branch 'origin/master' 2019-11-22 23:12:44 -05:00
Anuken
a1fb3e27ab Fixed launched items not saving 2019-11-22 23:10:50 -05:00
blackassasin1234
80c46bb5a2 Added some Events (#1096) 
* Added PlayerBanEvent, PlayerUnbanEvent, PlayerIpBanEvent, and PlayerIpUnbanEvent.

* Removed Unecessary import (oops)

* Formatted code

* Fixed a little oopsie

* Prevent NPE

* add another line..
 2019-11-22 20:56:00 -05:00
Anuken
cb29bee8f5 Remove js mod ext support 2019-11-22 18:42:10 -05:00
Anuken
2d42704062 Switched to hjson extension 2019-11-22 18:19:18 -05:00
Anuken
5f81a0c7f3 Bugfixes 2019-11-22 17:51:29 -05:00
Anuken
f28eb4027c Log # of fetched servers; cleanup 2019-11-22 16:13:09 -05:00
Anuken
c324dce034 Added potential global server list 2019-11-22 16:00:53 -05:00
Anuken
6d6fac00d7 Less hacky support for atrocious json 2019-11-22 15:33:01 -05:00
Anuken
2c61fcdfa6 Added optional mod minimum game version 2019-11-21 21:12:05 -05:00
Anuken
18b6c37a89 Item bridge fixes 2019-11-21 20:50:15 -05:00
Anuken
b8e3b70fcc Made 'custom' the default shuffle mode for backwards compat 2019-11-21 20:42:57 -05:00
Anuken
f162d815fe Better error messages 2019-11-20 18:10:34 -05:00
Anuken
968f3ace33 Better mod parsing 2019-11-20 18:09:43 -05:00
Anuken
f2c9c2e5fb Bugfixes 2019-11-20 14:50:57 -05:00
Anuken
fac217a836 Fixed infinite place distance, impact meltdown 2019-11-20 00:05:00 -05:00
Anuken
c4c19a204f Bugfixes 2019-11-19 23:09:35 -05:00
Anuken
879f90ebf4 Added changelogs / Updated link registry 2019-11-19 22:04:10 -05:00
Anuken
8daaea3536 Minor power tweaks 2019-11-19 19:52:15 -05:00
Anuken
cc7aaae52c Fixed inverted sorter chains 2019-11-19 19:16:35 -05:00
Anuken
4ce494cc22 Merge remote-tracking branch 'origin/master' 2019-11-19 19:08:52 -05:00
Anuken
9461d7a360 Hjson unit tests 2019-11-19 19:08:41 -05:00
Patrick 'Quezler' Mounier
dd13c305e7 Make offline force projector use no boost (#1092) 
Mimiced check in the mending & overdrive projector.
 2019-11-19 09:03:42 -05:00
Patrick 'Quezler' Mounier
48911005aa Fix placing a diode on the world border (#1094) 
* Fix placing a diode on the world border

* 〃
 2019-11-19 08:40:44 -05:00
Patrick 'Quezler' Mounier
7955b82b1e Add weave layer to phase 〃 icon (#1091) 
Makes the block more recognizable in the build menu.
 2019-11-19 08:13:43 -05:00
Arkanic
9bfaecf760 slightly reduced cooldown between votekick (#1056) 2019-11-18 20:08:56 -05:00