mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-13 00:05:23 +07:00
Code Issues Packages Projects Releases Wiki Activity
18,148 Commits 4 Branches 160 Tags 2.1 GiB
1f62892e10
Commit Graph

366 Commits

Author SHA1 Message Date
Anuken
a6801af128 Use zip files when exporting 2020-02-07 20:11:43 -05:00
Anuken
30ea039246 Fixed #1521 2020-02-07 20:11:05 -05:00
Patrick 'Quezler' Mounier
e06d8eabec
[formatting] add newline to file(s) (#1508) 
* Trail appropriate files with a new line

* For some ironic reason it ignored itself

Probably because it wasn’t tracked/commited yet.

* Rename newlines to server executable naming pattern
 2020-02-05 18:36:56 -05:00
Anuken
be50997f94 Merge branches '6.0' and 'splinterface-impl' of https://github.com/Anuken/Mindustry into splinterface-impl 
# 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/mindustry/Vars.java
#	core/src/mindustry/entities/traits/SaveTrait.java
#	core/src/mindustry/maps/generators/MapGenerator.java
#	core/src/mindustry/ui/dialogs/DeployDialog.java
#	core/src/mindustry/world/blocks/Floor.java
#	desktop/src/mindustry/desktop/DesktopLauncher.java
#	gradle.properties
 2020-02-04 12:25:18 -05:00
Anuken
63d84bead3 Cleanup 2020-01-31 20:10:21 -05:00
Anuken
1ab81fa4ab Bugfixes 2020-01-24 19:14:49 -05:00
Anuken
69711151a5 Bugfixes 2020-01-24 18:48:26 -05:00
Anuken
f044f30829 Merge 2020-01-18 11:16:03 -05:00
Anuken
eb79f3288c Added Android crash logging 2020-01-16 10:59:27 -05:00
Anuken
bbf87df373 a revelation 2020-01-11 23:41:12 -05:00
Anuken
7e7d2019af Made Android files external 2020-01-11 19:21:16 -05:00
Anuken
c611ce9d58 Removed old Matrix4 class 2020-01-07 11:16:04 -05:00
Anuken
03342dc2f5 Android fixes 2019-12-25 12:06:19 -05:00
Anuken
514d4817c8 it is done 2019-12-25 01:39:38 -05:00
Anuken
0cf39bf5c3 Eliminated 8 characters 2019-12-15 20:01:06 -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
9d3dda035c Compile fixes 2019-12-14 12:53:37 -05:00
Anuken
c1cf3183ac Fixed some Android-related script issues 2019-12-14 11:04:22 -05:00
Anuken
252d0f6aa1 aaaaa 2019-12-14 10:51:36 -05:00
Anuken
f4ee67c08b Fixed gradle complaining about absolutely nothing 2019-12-10 10:45:07 -05:00
Anuken
da849085ec Status effect cleanup 2019-12-09 22:08:22 -05:00
Anuken
2a03ef0c43 More cleanup 2019-12-09 16:59:43 -05:00
Anuken
0078a8cb8e Fixed scripts not working on older Android phones 2019-12-09 12:48:15 -05:00
Anuken
2b49c300f8 Security / Android compat / Functional extension 2019-12-06 21:57:47 -05:00
Anuken
9461d7a360 Hjson unit tests 2019-11-19 19:08:41 -05:00
Anuken
0722ad2f4c Refactoring of functional package 2019-10-29 15:57:25 -04:00
Anuken
34db321577 Disabled 'import github' button on Android because Android is garbage and can't even do something as simple as an HTTP request without 5 workaround for different versions 2019-10-27 10:51:35 -04:00
Anuken
b7e788d529 Fixed #877 / Fixed #871 / Other fixes 2019-10-25 12:58:07 -04:00
Anuken
eb1d3c27c5 Mods + crash message for iOS/Android 2019-10-21 00:02:36 -04:00
Anuken
4fa173f0f5 Don't auto-increment build version 2019-09-21 11:04:35 -04:00
Anuken
5a0669d437 SAF is terrible 2019-09-18 19:24:49 -04:00
Anuken
1e667946b3 Bugfixes 2019-09-18 12:46:11 -04:00
Anuken
d49b15b2a0 Fixed some things 2019-09-16 08:24:10 -04:00
Anuken
82493c596d Merge remote-tracking branch 'origin/master' 2019-09-09 16:22:40 -04:00
Anuken
5a3fbf33df Made all color names lowercase for consistent style 2019-09-09 16:22:29 -04:00
Anuken
fa56996e10
Update AndroidLauncher.java 2019-09-09 00:01:07 -04:00
Anuken
b867cdb8b9 Map fix 2019-09-08 23:33:21 -04:00
Anuken
d981bb95b9 it is gone 2019-09-08 22:32:47 -04:00
Anuken
2cc627e7d0 Merged net module 2019-09-07 16:55:09 -04:00
Anuken
e90c8c4d3e Extensive network refactor 2019-09-07 14:11:50 -04:00
Anuken
06e6deae42 More cleanup 2019-09-07 12:10:26 -04:00
Anuken
38fe99f10e Android cleanup 2019-09-07 12:04:28 -04:00
Anuken
168011586b More file chooser fixes 2019-09-06 22:09:54 -04:00
Anuken
b5f1e566b2 New Android file chooser implementation 2019-09-06 21:21:30 -04:00
Anuken
3b9d3fd233 Platform cleanup 2019-08-30 17:32:49 -04:00
Anuken
d5916f3bc3 hmmm 2019-08-28 16:18:53 -04:00
Anuken
3ce870fb19 Building fix 2019-08-28 16:17:04 -04:00
Anuken
1e80bdf19f Functional loading 2019-08-27 09:27:09 -04:00
Anuken
76cd7ba8d1 non-functional loading screen 2019-08-26 22:53:11 -04:00
Anuken
a3d8586199 Improvements to version scripts 2019-08-25 22:02:00 -04:00
Anuken
fd973038bb mnet was a mistake 2019-08-24 18:29:21 -04:00
Anuken
1880c32f90 Experimental MNet-2 backend 2019-08-22 22:49:22 -04:00
Anuken
a33fd45136 bugfixes 2019-08-22 21:51:56 -04:00
Anuken
4bb6a25055 Added deployment scripts 2019-08-21 14:46:36 -04:00
Anuken
17b17979ab Release preparations 2019-08-16 11:00:15 -04:00
Anuken
974ab59fd2 Classic data backup dialog 2019-08-13 15:14:03 -04:00
Anuken
d0ff0307f5 New icon 2019-08-12 13:29:02 -04:00
Anuken
c4aa0b2863 New discord app ID / New testing sounds 2019-08-12 12:32:13 -04:00
Anuken
5c6bcbf9cd Renamed layout/Unit to UnitScl to prevent name conflicts 2019-08-06 11:04:58 -04:00
Anuken
697894274f Fixed editor restoring incorrect orientation 2019-07-30 01:02:08 -04:00
Anuken
bb398a2f1e Crash fixes 2019-07-02 18:52:04 -04:00
Anuken
0aee75c1c1 Splitting of building+mining into separate traits 2019-06-12 14:03:50 -04:00
Anuken
940965f03d .mmap file importing / Better exception parsing 2019-05-31 10:24:51 -04:00
Anuken
bd134bf9c9 Cleanup 2019-05-28 09:24:13 -04:00
Anuken
3c643c917a Map bugfixes / Sprite tweak / Zone loadout moved to dialog 2019-04-29 23:58:16 -04:00
Anuken
db60f4bb1c Updated to Gradle 5.4 2019-04-20 23:09:28 -04:00
Anuken
01e1438382 Switched to ArcNet networking extension 2019-04-17 21:59:26 -04:00
Anuken
b40beb0d1d Source reformat 2019-04-08 09:03:18 -04:00
Anuken
2dee221861 Crash fix 2019-04-04 20:39:04 -04:00
Anuken
0b175cb25d Fixed release script using wrong folder 2019-04-04 19:36:15 -04:00
Anuken
fa22b0ec12 Removed dead donations code 2019-04-01 18:51:49 -04:00
Anuken
be60a367e8 Removed donations library and Android support libraries 2019-04-01 18:46:11 -04:00
Anuken
8f853c8f18 Back button cleanup 2019-03-31 18:26:52 -04:00
Anuken
c278c632b3 Back button quitting 2019-03-31 13:16:43 -04:00
Anuken
97f5bf3cc4 Code cleanup 2019-03-24 19:58:51 -04:00
Anuken
4bc9143306 New icon / Windows deployment fixes / Map fixes / Menu fix 2019-03-22 22:30:26 -04:00
Anuken
d038bdb6ce Better filter layout 2019-03-15 20:32:08 -04:00
Anuken
e8204fc983 Fixed misc compile errors 2019-03-12 13:46:40 -04:00
Anuken
671823b4fa Tentative travis build fix 2019-03-09 23:55:01 -05:00
Anuken
5e2a455045 a 2019-02-17 01:36:46 -05:00
Anuken
7024273a02 Better team interaction 2019-02-15 12:32:01 -05:00
Anuken
e21a3347ac Misc bugfixes / New zone 2019-02-02 10:14:16 -05:00
Anuken
6229f99a2e Fixed tests / Various build tools updated 2019-01-22 15:01:30 -05:00
Prosta4okua
f0064e35bc
Create strings.xml 2019-01-02 01:29:06 +02:00
Anuken
3c9322ee08
Update strings.xml (#383) 2019-01-01 21:09:55 -02:00
Anuken
86b35fc43d Various graphical fixes 2018-12-29 13:06:17 -05:00
Anuken
4386d3169a JITPack-based dependencies 2018-12-29 11:59:43 -05:00
Anuken
36b27458b6 Merged 4x graphics 2018-12-28 23:46:09 -05:00
Anuken
db546412f1 Arc compatibility update 2018-12-27 15:47:17 -05:00
Anuken
3b42b604e1 Successful desktop compilation 2018-12-26 17:38:40 -05:00
Prosta4okua
f119afe436
Update strings.xml 2018-12-21 20:17:35 +02:00
Anuken
94908bc599 🔥🔥🔥🔥🔥🔥maximum breakage 2018-12-20 12:38:27 -05:00
Anuken
cabcfc7136 Initial creation of Arc port 2018-12-20 11:49:32 -05:00
Anuken
9ac8a4211e Merge 2018-11-28 22:37:49 -05:00
Anuken
23750bab55 Layout fixes 2018-11-28 22:05:34 -05:00
Anuken
b721d7a10f Merge branch 'master' of https://github.com/Anuken/Mindustry into rendering-optimizations 
# Conflicts:
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/src/io/anuke/mindustry/core/Renderer.java
#	core/src/io/anuke/mindustry/entities/units/types/Drone.java
#	core/src/io/anuke/mindustry/graphics/CacheLayer.java
#	core/src/io/anuke/mindustry/world/blocks/Floor.java
 2018-11-26 13:23:38 -05:00
Anuken
ec80fc9f3f Android build update 2018-11-24 19:39:35 -05:00
Anuken
6bfd57097f Cleanup of TODOs 2018-11-24 08:21:22 -05:00
Anuken
745592f507 Merge branch 'master' of https://github.com/Anuken/Mindustry into rendering-optimizations 2018-11-17 11:24:37 -05:00
Anuken
afec65eb56 New mobile text dialog / Cleanup / Minimap fix / Collision optimization 2018-11-17 11:13:59 -05:00
Anuken
ab9835b896 New scaling system 2018-11-12 17:37:26 -05:00
Anuken
cf50d558ba Fixed many various things 2018-11-07 22:37:34 -05:00
Anuken
a73a75a7f8 Cyrillic, chinese, korean fonts 2018-11-06 20:55:18 -05:00
Anuken
04b4321ea1 New font 2018-11-06 12:55:13 -05:00
Anuken
8ecea9792b Slightly more fleshed out sector selection 2018-10-30 23:05:35 -04:00
Anuken
fbf614a8df Removed html module 2018-10-30 19:15:12 -04:00
Anuken
c02329e4b1 Integrated thread implementation / Crash fix 2018-10-30 12:58:25 -04:00
Anuken
6e65096bb4 Improved power grid sprites / Bugfixes 2018-10-29 20:43:30 -04:00
Anuken
b39f25ed51 Fixed build error 2018-10-29 16:02:09 -04:00
Anuken
7e4e58fb78 Updated android build tools version 2018-10-15 16:31:01 -04:00
Anuken
9994ddb31b Implemented public submodules 2018-10-08 09:41:01 -04:00
Anuken
69a7104286 Updated Android tool versions 2018-10-07 11:14:54 -04:00
Anuken
fd107ab5b8 Code cleanup 2018-10-06 11:56:39 -04:00
Anuken
3bc605894e Fixed android text input truncating text 2018-09-27 17:44:47 -04:00
Anuken
4af0fbf553 Removed debug mode / Added source blocks to sandbox 2018-09-10 17:46:32 -04:00
Prosta4okua
e06970eebb Create strings.xml (#217) 2018-09-09 11:30:26 -04:00
Gureumi
30c6280ed1 smail translate (#216) 2018-09-06 19:51:12 -04:00
Anuken
a2960f5c50 Pathfind updates / Less reflection / Platform cleanup 2018-08-31 23:19:36 -04:00
Anuken
aa5348f37e Auto-play server sectors / Difficulty decrease / Improved d/c messages 2018-08-08 20:52:51 -04:00
Anuken
f3b976bdd1 All web version bugs fixed 2018-07-31 12:57:34 -04:00
Anuken
1daf8d2743 cleanup of cleanup 2018-07-28 12:52:02 -04:00
Anuken
295824f440 Minor cleanup 2018-07-28 12:50:11 -04:00
Ameb
ecabdb82e6 Introduce workaround for libgdx issue by @codegist 
libgdx/libgdx#3861 libgdx/libgdx#4626 libgdx/libgdx#5312
 2018-07-28 17:24:20 +02:00
Anuken
cfecdae970 Class package refactoring 2018-07-14 12:11:48 -04:00
Anuken
baaeb229cf Formatting 2018-07-12 20:37:15 -04:00
Anuken
d988bb1821 Massive amount of bugfixes / Multi-liquid support / Broken build 2018-07-06 23:24:14 -04:00
Anuken
e3bee43163 Portrait mode support / Mobile fixes 2018-07-02 15:49:01 -04:00
Anuken
fb2bb5a4bc Start of work on portrait mode / Made fragments abstract classes 2018-07-02 13:54:22 -04:00
Anuken
e9436426b7 Gradle update / Block inventory improved / Crash fixes 2018-07-02 11:04:24 -04:00
Anuken
d0302cdbf3 Many fixes to admin/trace/UUID system 2018-06-13 17:52:31 -04:00
Anuken
01f4a9b23b Changed too many things to fit in commit log 2018-06-04 12:47:08 -04:00
Anuken
863c159fbb Fixed build errors 2018-06-01 13:24:11 -04:00
Anuken
a04e432aea Fixed multithreading 2018-06-01 13:11:40 -04:00
Anuken
5c120e532f Added support for Mac file association; minor optimizations 2018-06-01 13:01:05 -04:00
Anuken
cfa95eef39 Fixed a few mime-type problems 2018-06-01 12:22:39 -04:00
Anuken
c4ae6121b4 Implemented loading map/save files on launch (Android) 2018-06-01 12:20:16 -04:00
Anuken
418467e467 Fixed bad app-data directory being provided 2018-05-31 21:24:04 -04:00
Anuken
e60b3880ce MapEditor tweaks, fixed file browser on Android w/ permissions 2018-05-31 20:27:13 -04:00
Anuken
fd77dfd66d Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 
# Conflicts:
#	build.gradle
#	core/src/io/anuke/mindustry/Vars.java
#	core/src/io/anuke/mindustry/core/Control.java
#	core/src/io/anuke/mindustry/core/Logic.java
#	core/src/io/anuke/mindustry/core/NetClient.java
#	core/src/io/anuke/mindustry/core/NetServer.java
#	core/src/io/anuke/mindustry/core/UI.java
#	core/src/io/anuke/mindustry/editor/MapSaveDialog.java
#	core/src/io/anuke/mindustry/input/GestureHandler.java
#	core/src/io/anuke/mindustry/mapeditor/MapEditorDialog.java
#	core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java
#	core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java
#	gradle/wrapper/gradle-wrapper.properties
#	server/src/io/anuke/mindustry/server/ServerControl.java
 2018-05-23 10:36:59 -04:00
Anuken
0e35bb4852 Fixed scrolling player menu causing panning on mobile 2018-05-20 11:47:20 -04:00
Anuken
496498b913 Implemented auto-updating pathfinder 2018-05-02 17:14:10 -04:00
Anuken
3fcdfbd01a Optimized floor rendering 2018-05-02 11:38:44 -04:00
Anuken
036f233946 Improved rubble and VTOL accuracy 2018-05-01 19:07:13 -04:00
Anuken
e5f6b7f66c Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 2018-04-28 16:28:58 -04:00
Anuken
7a22ca2841 Fixed being unable to get log in low android versions 2018-04-28 10:41:33 -04:00
Anuken
4fc8e321af Added iOS text field dialog listener 2018-04-28 10:14:57 -04:00
Anuken
8cc3a865e2 iOS fixes 2018-04-27 23:42:59 -04:00
Anuken
d960703a5c Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 2018-04-25 20:53:49 -04:00
Anuken
6244551d69 Fixed android build errors 2018-04-25 20:53:32 -04:00
Anuken
1a9d701d32 Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 
# Conflicts:
#	core/assets-raw/sprites/blocks/chainturret-icon.png
#	core/assets-raw/sprites/blocks/chainturret.png
#	core/assets-raw/sprites/blocks/titancannon-icon.png
#	core/assets-raw/sprites/blocks/titancannon.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/version.properties
#	core/src/io/anuke/mindustry/entities/effect/TeslaOrb.java
#	core/src/io/anuke/mindustry/graphics/BlockRenderer.java
#	core/src/io/anuke/mindustry/input/InputHandler.java
#	core/src/io/anuke/mindustry/input/PlaceMode.java
 2018-04-21 18:47:43 -04:00