Patrick 'Quezler' Mounier
20a511d940
Merge branch 'master' into crater
2019-12-29 20:50:55 +01:00
Anuken
6edcbb9120
Bugfixes
2019-12-29 14:38:03 -05:00
Patrick 'Quezler' Mounier
326f75cbda
Merge branch 'master' into crater
2019-12-29 19:09:27 +01:00
Anuken
730d30ef98
Added core schematic selection setting
2019-12-29 11:40:52 -05:00
Anuken
8c941c7165
Added update trigger / Server moddability tweaks
2019-12-28 21:34:20 -05:00
Anuken
e1bf8bdab1
Added BE auto-updater / Server config / Fixed #1266
2019-12-28 16:30:40 -05:00
Patrick 'Quezler' Mounier
e0cfbc7609
All hail the cuteness of this crater roomba critter
2019-12-27 20:45:27 +01:00
Anuken
ede002878e
problem solved
2019-12-21 21:11:30 -08:00
ado1928
5e568eac0d
Added Feathub to the "About" tab ( #1234 )
...
* Add files via upload
* Add files via upload
* Add files via upload
* Add files via upload
* Update Links.java
2019-12-19 19:33:24 -05:00
Anuken
976d0f54b3
Merge branches 'master' and 'safe-mod-loading' of https://github.com/Anuken/Mindustry
...
# Conflicts:
# core/src/io/anuke/mindustry/mod/Mods.java
2019-12-15 13:55:30 -05:00
Anuken
1c1db3990f
Fully implemented safe content loading
2019-12-15 13:54:51 -05:00
Anuken
58e3143e2a
Content cleaning
2019-12-14 09:33:07 -05:00
joshuaptfan
736737f151
Make scroll zoom by default, remove zoom hold keybind
2019-12-12 12:23:32 -08:00
Anuken
0078a8cb8e
Fixed scripts not working on older Android phones
2019-12-09 12:48:15 -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
2b49c300f8
Security / Android compat / Functional extension
2019-12-06 21:57:47 -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
Ali-C-Ila
db5bd7eea8
Update bundle.properties ( #1164 )
2019-12-05 10:01:47 -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
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
DeltaNedas
38804462a9
add reset keybind to english locale ( #1116 )
...
* updated english locale for "reset key".
* Update bundle.properties
* Update bundle.properties
2019-11-22 16:17:11 -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
3ddb9d166f
Update bundle.properties
2019-11-20 10:00:36 -05:00
Patrick 'Quezler' Mounier
d03ec3122c
Add toggle_power_lines entry to the bundle ( #1099 )
2019-11-19 12:45:27 -05:00
Anuken
39939f8a51
Merge https://github.com/joshuaptfan/Mindustry
...
# Conflicts:
# core/assets/bundles/bundle.properties
# core/src/io/anuke/mindustry/content/Blocks.java
# core/src/io/anuke/mindustry/input/Binding.java
2019-11-18 19:40:45 -05:00
Anuken
ad25cd8074
Illuminator description
2019-11-18 17:00:52 -05:00
Patrick 'Quezler' Mounier
7830372477
Beep boop add f-droid ( #1087 )
...
Full credit to @ZacBytes for the initial implementation.
2019-11-18 15:52:44 -05:00
Anuken
fad6fe9a2a
Added armored conduit / Lighting improvements / Moved liquid package
2019-11-17 13:51:36 -05:00
Anuken
84968c9f73
Added color picker / Customizable lighting rules
2019-11-16 23:27:42 -05:00
Anuken
faf64f11f2
More lights
2019-11-16 19:57:33 -05:00
Anuken
f9ffb78b33
Added configurable global server rules
2019-11-16 15:51:35 -05:00
Joshua Fan
cafd95859f
Clean up text capitalization, misc UI ( #1072 )
2019-11-15 20:01:59 -05:00
Patrick 'Quezler' Mounier
8a089ba3c9
Resolve conflicts
...
# 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
2019-11-12 08:44:26 +01:00
Patrick 'Quezler' Mounier
f5c1eb74af
🔩 Add (plastanium) diode ( #964 )
...
* Add plastanium diode
* Only rotate the arrow part
* Use the sum of graph batteries from both sides
* Make diode send power overflow
Diode keeps one-way equalizing while the sending graph has batteries that are ¬ yet fully filled.
* Remove redundant block != null check
* Remove free power
* Stash
* Revert "Stash"
This reverts commit 0c14854519
2019-11-11 23:29:03 -05:00
Joshua Fan
dcdec7f55f
Add mouse-based movement ( #1037 )
...
* Add mouse-based movement
* Rename keybind to 'Follow Mouse'
2019-11-11 14:00:35 -05:00
itskatt
8d19c8b7af
Update overflow gate description ( #1040 )
2019-11-11 14:00:06 -05:00
Joshua Fan
4a987677ac
Add 'Show Block Select Keys' graphics option, implement requested changes
2019-11-09 07:59:00 -05:00
iczero
ebee4fa5da
Implement build autopausing ( #1017 )
...
Automatically pause building after current build queue is empty
2019-11-08 16:56:06 -05:00
joshuaptfan
dbb64f1d87
Add hotkey tutorial to tutorial mission
2019-11-05 17:25:21 -08:00
Patrick 'Quezler' Mounier
b2d417f207
Display pump output during placement ( #1003 )
2019-11-05 17:58:19 -05:00
Anuken
21b7016fb5
Bugfixes
2019-11-05 15:32:13 -05:00
Patrick 'Quezler' Mounier
c6a75891d3
Add bundle entry
2019-11-05 14:41:08 +01:00
Anuken
3e43f5577e
Bugfixes
2019-11-04 23:47:51 -05:00
Anuken
6153764c0d
Bugfixes for Steam
2019-11-04 22:18:34 -05:00
Joshua Fan
988c424e45
Add max connections stat to power nodes ( #988 )
2019-11-03 13:00:32 -05:00
joshuaptfan
71d67b9d8f
Implement number and directional category/block selection hotkeys
2019-11-02 22:14:18 -07:00
matheod
9122fbe141
Remove useless space in tutorial ( #981 )
2019-11-02 15:23:05 -04:00
Anuken
a72d95e6d7
Display steam load error message
2019-11-02 14:16:26 -04:00
