Anuken
|
ae2a4ea2d6
|
Merge remote-tracking branch 'origin/master'
|
2020-10-02 20:23:46 -04:00 |
|
Anuken
|
43936b536e
|
Cleanup
|
2020-10-02 20:23:37 -04:00 |
|
 AnukenandGitHub
|
b73660eb4f
|
Merge pull request #2803 from SkinH/patch-2
Update servers.json
|
2020-10-02 20:03:16 -04:00 |
|
Anuken
|
5861fe61b2
|
Cleanup
|
2020-10-02 19:51:30 -04:00 |
|
Anuken
|
10dd2b4b33
|
Fixed javadoc errors
|
2020-10-02 12:06:16 -04:00 |
|
Anuken
|
a3224b7082
|
Improved replacement system
|
2020-10-02 11:14:18 -04:00 |
|
Anuken
|
138434d029
|
Fixed #2799 / Fixed #2797
|
2020-10-02 09:54:08 -04:00 |
|
Anuken
|
215cfaa42f
|
Fixed #2793
|
2020-10-01 16:03:13 -04:00 |
|
Anuken
|
68c41774e4
|
More contrast for specific colors
|
2020-10-01 14:22:48 -04:00 |
|
Anuken
|
4074a241d2
|
Cleanup
|
2020-10-01 14:07:33 -04:00 |
|
Anuken
|
c1970b4da5
|
Merge branch 'campaign'
# Conflicts:
# core/src/mindustry/world/consumers/ConsumeItemFilter.java
|
2020-10-01 13:37:25 -04:00 |
|
Anuken
|
1170880127
|
Merge remote-tracking branch 'origin/master'
|
2020-10-01 13:33:55 -04:00 |
|
Anuken
|
199be4d13d
|
Implicit non-nullability for fields
|
2020-10-01 13:33:43 -04:00 |
|
Anuken
|
085bc2ee9c
|
campaign progress
|
2020-10-01 11:19:42 -04:00 |
|
 AnukenandGitHub
|
2604a2d649
|
Merge pull request #2783 from Quezler/patch-45
Move cryofluid mixer emoji back to the old number
|
2020-10-01 08:56:28 -04:00 |
|
 AnukenandGitHub
|
6f4f0eef57
|
Merge pull request #2786 from Quezler/patch-46
Clarify stack conveyor recharge property
|
2020-10-01 08:42:11 -04:00 |
|
Anuken
|
4264b960cd
|
Merge branch 'master' of https://github.com/Anuken/Mindustry into campaign
|
2020-09-30 22:46:33 -04:00 |
|
Anuken
|
b15cdfef46
|
sprites repacked
|
2020-09-30 22:37:32 -04:00 |
|
 AnukenandGitHub
|
d3441f4ac9
|
Merge pull request #2781 from genNAowl/cryofluidmixer-cryofluid-mixer
change "cryofluidmixer" to "cryofluid-mixer"
|
2020-09-30 22:35:10 -04:00 |
|
Anuken
|
54c991e611
|
Removed outOfTime pause
|
2020-09-30 22:25:28 -04:00 |
|
Anuken
|
f3c642d0d7
|
Fixed #2779
|
2020-09-30 19:55:22 -04:00 |
|
Anuken
|
a0394e4382
|
Balance
|
2020-09-30 18:56:37 -04:00 |
|
Anuken
|
7eb0da82de
|
Added enemy lights setting
|
2020-09-30 17:44:13 -04:00 |
|
Anuken
|
326640d32a
|
Cleanup
|
2020-09-30 17:21:05 -04:00 |
|
Anuken
|
781d9b3c38
|
Merge branch 'master' of https://github.com/Anuken/Mindustry
|
2020-09-30 16:42:10 -04:00 |
|
Anuken
|
1697fec311
|
Tsunami balancing
|
2020-09-30 16:40:45 -04:00 |
|
 AnukenandGitHub
|
0b2c2c49b0
|
Anuken/Mindustry-Suggestions/issues/653
|
2020-09-30 15:12:38 -04:00 |
|
Anuken
|
27089f1057
|
Merge remote-tracking branch 'origin/master'
|
2020-09-30 15:01:50 -04:00 |
|
Anuken
|
d07c74b60f
|
Re-added tap event for servers
|
2020-09-30 15:01:46 -04:00 |
|
 AnukenandGitHub
|
8dc610a091
|
Update CONTRIBUTING.md
|
2020-09-30 14:53:56 -04:00 |
|
Anuken
|
059c729a2c
|
Merge branch 'master' of https://github.com/Anuken/Mindustry
|
2020-09-30 14:50:09 -04:00 |
|
Anuken
|
03d676403f
|
Cleanup
|
2020-09-30 14:50:05 -04:00 |
|
 AnukenandGitHub
|
6645e3a473
|
Merge pull request #2772 from LeoDog896/pathfinder
Remove nearGround in favor of !nearLiquid
|
2020-09-30 12:59:55 -04:00 |
|
Anuken
|
d2728c2bf0
|
Fixed #2774
|
2020-09-30 12:45:01 -04:00 |
|
Anuken
|
f5e5f82d47
|
Merge remote-tracking branch 'origin/master'
|
2020-09-30 11:19:46 -04:00 |
|
Anuken
|
0963de4022
|
Cleanup
|
2020-09-30 11:19:38 -04:00 |
|
 AnukenandGitHub
|
b35fa21c79
|
Update gradle.yml
|
2020-09-30 11:13:17 -04:00 |
|
 AnukenandGitHub
|
b38e7f66ad
|
Merge pull request #2770 from LeoDog896/autotiler
Autotiler docs and cleanup
|
2020-09-30 10:49:42 -04:00 |
|
 AnukenandGitHub
|
ba53d76d8d
|
Merge pull request #2769 from Voz-Duh/packed-liquid-drawer
Packed Liquid Drawer
|
2020-09-30 10:46:45 -04:00 |
|
 AnukenandGitHub
|
957e06470d
|
Merge pull request #2768 from LeoDog896/master
Remove unused package
|
2020-09-30 09:43:12 -04:00 |
|
Anuken
|
3c3c15dcf4
|
Merge branch 'master' of https://github.com/Anuken/Mindustry
|
2020-09-29 23:55:59 -04:00 |
|
Anuken
|
2b2a12267a
|
Long-range 4x4 turret (wip) / Java 14 language upgrade
|
2020-09-29 23:55:55 -04:00 |
|
 AnukenandGitHub
|
0e2f62f8b4
|
Merge pull request #2765 from summetdev/file-chooser-default
Save last FileChooser's directory to settings.
|
2020-09-29 17:29:34 -04:00 |
|
Anuken
|
c3274622b2
|
Fixed #2763
|
2020-09-29 11:53:45 -04:00 |
|
Anuken
|
521ca1aea4
|
Fixed mechs not having animations on multiplayer
|
2020-09-29 10:57:06 -04:00 |
|
Anuken
|
5523ea4752
|
Slag light
|
2020-09-28 19:37:18 -04:00 |
|
Anuken
|
c89d6f6b74
|
Re-packed sprites from PR
|
2020-09-28 18:42:09 -04:00 |
|
Anuken
|
d3863a7550
|
Merge remote-tracking branch 'origin/master'
|
2020-09-28 18:32:48 -04:00 |
|
Anuken
|
a5b1239c2b
|
Method renaming for consistency
|
2020-09-28 18:32:39 -04:00 |
|
 AnukenandGitHub
|
95146e032f
|
Merge pull request #2757 from Voz-Duh/cleaner-sprites
Cleaner Sprites
|
2020-09-28 17:34:40 -04:00 |
|
Anuken
|
6a45a965c0
|
Allow unloading non-visible blocks
|
2020-09-28 12:42:20 -04:00 |
|
Anuken
|
d55de18d09
|
Merge remote-tracking branch 'origin/master'
|
2020-09-28 11:02:57 -04:00 |
|
Anuken
|
231902aec5
|
Fixed #2756
|
2020-09-28 11:02:53 -04:00 |
|
 AnukenandGitHub
|
586d3adb0e
|
Update bug_report.md
|
2020-09-28 10:30:51 -04:00 |
|
Anuken
|
f1d09053f3
|
Fixed #2755 / Fixed #2753
|
2020-09-28 10:26:08 -04:00 |
|
Anuken
|
078a68a07d
|
Fixed cores being placeable on nothing
|
2020-09-27 23:00:38 -04:00 |
|
Anuken
|
482ec4b43c
|
Fixed #2752
|
2020-09-27 18:01:17 -04:00 |
|
Anuken
|
3bf01334c9
|
Many things
|
2020-09-27 17:15:31 -04:00 |
|
Anuken
|
ff84d72e20
|
Cleaner wall sprites
|
2020-09-27 00:43:00 -04:00 |
|
Anuken
|
f46180298f
|
Merge branch 'master' of https://github.com/Anuken/Mindustry
|
2020-09-26 22:32:17 -04:00 |
|
Anuken
|
ae46535365
|
Sprite cleanup
|
2020-09-26 22:31:49 -04:00 |
|
Anuken
|
0c7ce94b13
|
Sprite cleanup
|
2020-09-26 22:29:15 -04:00 |
|
 AnukenandGitHub
|
fea8a3c12b
|
Merge pull request #2718 from MEEPofFaith/patch-2
Make lightning have frag angle properties
|
2020-09-26 22:27:26 -04:00 |
|
 AnukenandGitHub
|
285f733b61
|
Merge pull request #2725 from LeoDog896/master
More sort and target options
|
2020-09-26 22:27:05 -04:00 |
|
Anuken
|
7b98628084
|
Unbroke wave sprite
|
2020-09-26 22:20:02 -04:00 |
|
 AnukenandGitHub
|
0a11482b55
|
Merge pull request #2742 from TheEvilSkeleton/master
Add Flathub link
|
2020-09-26 20:17:35 -04:00 |
|
 AnukenandGitHub
|
f4b6600a6d
|
Merge pull request #2738 from Voz-Duh/top-for-liquid-turrets
Top For Liquid Turrets
|
2020-09-26 20:16:38 -04:00 |
|
Anuken
|
f785f97e87
|
Merge remote-tracking branch 'origin/master'
|
2020-09-26 14:38:20 -04:00 |
|
Anuken
|
9edd029764
|
Fixed #2740
|
2020-09-26 14:38:16 -04:00 |
|
 AnukenandGitHub
|
2817573594
|
Merge pull request #2739 from summetdev/patch-3
Add @echo off to run-server.bat
|
2020-09-26 13:14:18 -04:00 |
|
Anuken
|
0f420b625a
|
Fixed #2737
|
2020-09-26 11:59:14 -04:00 |
|
Anuken
|
d4d3b71d7d
|
Fixed #2735
|
2020-09-26 09:46:16 -04:00 |
|
Anuken
|
ccdd94a090
|
Build check cleanup
|
2020-09-25 20:15:00 -04:00 |
|
Anuken
|
c49b3124d5
|
Merge remote-tracking branch 'origin/master'
|
2020-09-25 18:49:36 -04:00 |
|
Anuken
|
dc30993898
|
Fixed #2729
|
2020-09-25 18:49:31 -04:00 |
|
 AnukenandGitHub
|
47d734873b
|
Merge pull request #2727 from LeoDog896/drown
Drown event
|
2020-09-25 16:27:21 -04:00 |
|
Anuken
|
059b72b3e2
|
Merge remote-tracking branch 'origin/master'
|
2020-09-25 14:21:34 -04:00 |
|
Anuken
|
2cc93924f1
|
Support for Android java mods
|
2020-09-25 14:21:30 -04:00 |
|
 AnukenandGitHub
|
23fe204322
|
Merge pull request #2728 from LeoDog896/globalizeVars
Use reportIssueUrl
|
2020-09-25 13:05:44 -04:00 |
|
 AnukenandGitHub
|
85d32cd510
|
Merge pull request #2726 from Voz-Duh/shadow-fix
Shadow Fix
|
2020-09-25 09:53:13 -04:00 |
|
Anuken
|
292793daf1
|
Fixed #2722
|
2020-09-25 09:50:38 -04:00 |
|
Anuken
|
7b90f5a97d
|
Merge remote-tracking branch 'origin/master'
|
2020-09-24 22:41:17 -04:00 |
|
Anuken
|
3a06cacf1d
|
Minor fixes
|
2020-09-24 22:41:13 -04:00 |
|
 AnukenandGitHub
|
56515db614
|
Update bug_report.md
|
2020-09-24 21:27:33 -04:00 |
|
Anuken
|
2141e2ebab
|
Cleaned up extra accessor method
|
2020-09-24 18:32:18 -04:00 |
|
Anuken
|
bc705aa7a0
|
Minor allocation optimization
|
2020-09-24 18:24:43 -04:00 |
|
Anuken
|
9e0b29b3dd
|
Cleanup
|
2020-09-24 18:11:10 -04:00 |
|
Anuken
|
504334999d
|
Campaign multiplayer note
|
2020-09-24 16:49:04 -04:00 |
|
Anuken
|
8d8cedaa44
|
Removed launch mechanic remnants
|
2020-09-24 16:44:11 -04:00 |
|
Anuken
|
659da0a837
|
formation tweaks
|
2020-09-24 15:49:39 -04:00 |
|
Anuken
|
0dccbf8598
|
Better physics system
|
2020-09-24 15:39:34 -04:00 |
|
Anuken
|
1682e3b996
|
Fixed #2714
|
2020-09-24 14:26:24 -04:00 |
|
Anuken
|
a914bd77f6
|
Fixed #2712
|
2020-09-24 14:00:43 -04:00 |
|
Anuken
|
da115e90bc
|
Merge remote-tracking branch 'origin/master'
|
2020-09-24 13:05:43 -04:00 |
|
Anuken
|
0a07458186
|
Power-based ammo / Refactoring / IP kicks / Fixes
|
2020-09-24 13:05:39 -04:00 |
|
 AnukenandGitHub
|
1d530f531d
|
Merge pull request #2707 from LeoDog896/master
Make renderer shader final
|
2020-09-24 12:43:51 -04:00 |
|
 AnukenandGitHub
|
d1980ef493
|
Merge pull request #2704 from summetdev/patch-2
remove .bat extension from README.md
|
2020-09-24 12:02:34 -04:00 |
|
 AnukenandGitHub
|
f3f33038e4
|
Merge pull request #2701 from Voz-Duh/team-indicator-for-command-center
Team Indicator For Command Center
|
2020-09-24 11:16:12 -04:00 |
|
 AnukenandGitHub
|
da66d93db9
|
Merge pull request #2702 from LeoDog896/master
Added boss as radar target
|
2020-09-24 11:15:15 -04:00 |
|
Anuken
|
db94acdb83
|
Merge remote-tracking branch 'origin/master'
|
2020-09-24 09:23:42 -04:00 |
|