Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,427 Commits 4 Branches 180 Tags
b3ff616af22ceddd1b8a171d37dd6b2a1e817d15
Commit Graph

4973 Commits

Author SHA1 Message Date
Anuken
b3e1436074 Fixed #1176 2019-12-08 10:09:29 -05:00
Anuken
fd202421b1 Changed console keybind to prevent confusion 2019-12-08 00:25:13 -05:00
Anuken
268f3cc3c2 Merge branches 'master' and 'rhino-js-suffering' of https://github.com/Anuken/Mindustry 
# Conflicts:
#	core/src/io/anuke/mindustry/content/Blocks.java
#	gradle.properties
 2019-12-08 00:15:42 -05:00
Anuken
477ebc91bf Fixed reloading 2019-12-07 21:53:50 -05:00
Anuken
fd6abaff62 More class support 2019-12-07 21:46:35 -05:00
Anuken
5ca01bf234 Effect parsing 2019-12-07 15:55:51 -05:00
Anuken
d3747f0d4c Content loading improvements 2019-12-07 15:41:52 -05:00
Patrick 'Quezler' Mounier
d81b36d897 Add 1 plastanium to armored conduits recipe (#1181) 2019-12-07 15:25:37 -05:00
Anuken
07598e3f2f Minor tweaks 2019-12-07 14:26:14 -05:00
Anuken
dd5e3b2aba JS console / Scripting tweaks 2019-12-07 14:10:39 -05:00
Anuken
06abc43aea Fixed slow imports 2019-12-07 11:37:13 -05:00
Patrick 'Quezler' Mounier
8b80a42886 Respect insulated blocks when toggeling a powernode (#1163) 2019-12-07 11:10:59 -05:00
Anuken
93fd6c5bd6 Removed massive import wall 2019-12-07 01:51:09 -05:00
Anuken
96aa3ccee0 Various improvements 2019-12-07 00:34:27 -05:00
Anuken
f3a5798a7f Various fixes 2019-12-06 22:24:32 -05:00
Anuken
2b49c300f8 Security / Android compat / Functional extension 2019-12-06 21:57:47 -05:00
Anuken
50a6071cfc Fixed maps not reloading on mod reload 2019-12-06 14:07:18 -05:00
Anuken
ef24e5ecad Merge remote-tracking branch 'origin/master' 2019-12-05 22:06:57 -05:00
Anuken
6f146c6cad Added support for mod map/schematic packs 2019-12-05 21:15:28 -05:00
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