mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-02 20:33:50 +07:00
Code Issues Packages Projects Releases Wiki Activity
9,965 Commits 4 Branches 160 Tags 2.3 GiB
27e22a84d3
Commit Graph

548 Commits

Author SHA1 Message Date
Anuken
024f2d62e2 Planet sector metadata 2020-02-14 20:08:07 -05:00
Anuken
b9841f9cfa a mess 2020-02-07 10:47:58 -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
d7ea0bc21e why 2020-01-26 13:16:42 -05:00
Anuken
aefc4ed83c Better annotation processing 2020-01-24 18:31:54 -05:00
Anuken
63c277f78e Implemented mod name display in content desc 2020-01-24 10:26:10 -05:00
Anuken
eb8479f7f7 Switched from gdx-packer to arc-packer 2020-01-22 19:16:56 -05:00
Anuken
5e977312a7 Annotation processor cleanup 2020-01-22 12:24:00 -05:00
Anuken
f044f30829 Merge 2020-01-18 11:16:03 -05:00
Anuken
c3d2351b2d Various icon changes 2020-01-17 13:57:04 -05:00
Anuken
4f29c80814 Single-texture font+UI packing 2020-01-16 22:25:57 -05:00
Anuken
ce18e32826 Added font icon generate+merge pipeline 2020-01-16 17:05:20 -05:00
Anuken
1e7c83f0c9 Partial merge 2019-12-25 13:22:36 -05:00
Anuken
fad94cb56e Updated Arc 2019-12-25 12:57:00 -05:00
Anuken
03342dc2f5 Android fixes 2019-12-25 12:06:19 -05:00
Anuken
475794640d More cleanup 2019-12-25 11:16:54 -05:00
Anuken
48daf12810 three dee 2019-12-24 21:45:53 -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
5788c27aaa hmmm 2019-12-03 01:01:18 -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
b21c25bccf Added features that don't work 2019-11-30 22:15:30 -05:00
Anuken
ceae04aa5b Desktop-specific scripting 2019-11-30 18:30:39 -05:00
Anuken
57f9aeee86 Public block fields / Better scripting 2019-11-27 13:51:07 -05:00
Anuken
d9aa9b6278 Desktop scripting support 2019-11-26 23:32:30 -05:00
Anuken
496677725e Use the sane maven plugin 2019-11-19 22:32:59 -05:00
Anuken
9461d7a360 Hjson unit tests 2019-11-19 19:08:41 -05:00
Anuken
ec7379cc86 Updated to gradle 6.0 2019-11-15 19:48:26 -05:00
Anuken
1e7c21c1ae Bugfixes 2019-11-06 13:59:35 -05:00
Anuken
cf6d2c7593 Added schematics dialog to desktop menu 2019-11-03 08:59:51 -05:00
Anuken
6746732e49 Steamworks4J updates 2019-10-30 19:31:06 -04:00
Anuken
08eb683e8a Fixed #958 2019-10-30 18:29:36 -04:00
Anuken
06e7b94b60 Steam fixes 2019-10-30 16:29:01 -04:00
Anuken
f971061ef4 Bugfixes 2019-10-24 18:52:42 -04:00
Anuken
17e219f142 Fixed #859 2019-10-22 18:45:05 -04:00
Anuken
d2fda57f2c Revert merge 2019-10-21 19:32:46 -04:00
Anuken
ec59396035 Fixed sharing crash 2019-10-20 21:31:34 -04:00
Anuken
a2ff516112 Merge branch 'master' of https://github.com/Anuken/Mindustry 2019-10-20 17:09:02 -04:00
Anuken
513e5b4019 iOS fix 2019-10-20 17:08:54 -04:00
Anuken
982483f178 Merged #812 2019-10-20 17:05:23 -04:00
Lionel Bergen
bd03e666da fixed issue (#816) 2019-10-11 23:54:48 -05:00
Anuken
d062d8081a Bugfixes 2019-09-21 16:44:47 -04:00
Anuken
0d25d83651 Better Android keyboard support 2019-09-21 15:35:59 -04:00
Anuken
0e9296913c Fixed iOS build issues 2019-09-19 22:59:44 -04:00
Anuken
b1edaa1408 Testing arc hash script 4 2019-09-13 13:12:34 -04:00
Anuken
d8d9762998 Testing arc hash script 3 2019-09-13 13:08:21 -04:00
Anuken
19c76fc741 Testing arc hash script 2019-09-13 13:03:02 -04:00
Anuken
2cc627e7d0 Merged net module 2019-09-07 16:55:09 -04:00
Anuken
8653e7bbb1 Cleanup 2019-09-07 16:03:20 -04:00
Anuken
ff54629550 Merge 2019-09-06 13:58:32 -04:00
Anuken
9bfb5216f9 Merge remote-tracking branch 'origin/master' 2019-09-02 20:59:44 -04:00
Anuken
b10656294e Merge 2019-09-02 20:59:35 -04:00
Anuken
e640042e5d
Update build.gradle 2019-09-02 12:40:52 -04:00
Anuken
7aafa8b150 Merge 2019-08-30 16:39:40 -04:00
Anuken
efcf802682 JITPack fixes 2019-08-28 22:07:08 -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
8b9be6eafe Removed arcnet as dependency 2019-08-23 18:18:14 -04:00
Anuken
1880c32f90 Experimental MNet-2 backend 2019-08-22 22:49:22 -04:00
Anuken
a7a49a823b Merge 2019-08-21 20:10:54 -04:00
Anuken
9bf010e222 Removed lwjgl3 desktop module, sdl promoted to main module 2019-08-21 15:41:38 -04:00
Anuken
0553fb6b79 Finalized build scripts 2019-08-21 15:34:01 -04:00
Anuken
4bb6a25055 Added deployment scripts 2019-08-21 14:46:36 -04:00
Anuken
a873560d4e Multiplayer: Smooth building + rotation / Disabled UDP / Cleanup 2019-08-19 22:16:43 -04:00
Anuken
33c1579e9c Progress 2019-08-19 08:39:38 -04:00
Anuken
e482c2c318 Steam client init 2019-08-18 15:26:06 -04:00
Anuken
83f9f5d34a zipzip 2019-08-16 11:14:18 -04:00
Anuken
17b17979ab Release preparations 2019-08-16 11:00:15 -04:00
Anuken
f8adbda9c5 updated roboVM to 2.3.7 2019-08-13 23:26:25 -04:00
Anuken
e90a4eb71d SDL tools 2019-07-26 21:24:07 -04:00
Anuken
518bffe644 SDL backend / Valid mode sprites / Better layout 2019-07-25 11:45:49 -04:00
Anuken
6f0bc2ecf8 Minor build fixes 2019-07-22 12:42:42 -04:00
Anuken
741360022b Typo 2019-06-23 11:03:05 -04:00
Anuken
86e2f62aed Fixed locales not generating 2019-06-23 10:52:03 -04:00
Anuken
580923a646 Render tests 2019-06-20 16:27:57 -04:00
Anuken
06444f497b Internal tool changes 2019-06-20 15:34:48 -04:00
Anuken
0aee75c1c1 Splitting of building+mining into separate traits 2019-06-12 14:03:50 -04:00
Anuken
bd134bf9c9 Cleanup 2019-05-28 09:24:13 -04:00
Anuken
54ad52edc2 Merging of map saves 2019-05-14 11:54:22 -04:00
Anuken
ffb6d398d7 Layout fixes 2019-05-12 12:00:19 -04:00
Anuken
af67690e75 WIP save refactoring 2019-05-05 11:36:38 -04:00
Anuken
b9f1dea914 Removed gen tweaks 2019-04-30 23:57:56 -04:00
Anuken
ad13c83f93 Fixed gen copying for earlier versions of IntelliJ 2019-04-27 09:58:14 -04:00
Anuken
01e1438382 Switched to ArcNet networking extension 2019-04-17 21:59:26 -04:00
Anuken
8a983c784d Added missing jcenter repository 2019-04-13 14:57:26 -04:00
Anuken
a443263439 Updated Discord RPC 2019-04-13 14:41:56 -04:00
Anuken
b40beb0d1d Source reformat 2019-04-08 09:03:18 -04:00
Anuken
503fc980f4 Bugfixes 2019-04-05 14:10:01 -04:00
Anuken
a84e9f2aaa Updated RoboVM plugin 2019-03-26 20:35:29 -04:00
Anuken
d0e026d597 Bugfixes 2019-03-25 13:12:55 -04:00
Anuken
97f5bf3cc4 Code cleanup 2019-03-24 19:58:51 -04:00
Anuken
30e5f2b17d iOS building fix 2019-03-23 18:33:33 -04:00
Anuken
fdecd55278 Updated build files 2019-03-23 13:40:13 -04:00
Anuken
f86a07daee Removed awt use / Sand recolor / Bugfixes / Link fix 2019-03-09 16:47:08 -05:00
Anuken
a5d1350815 Removed map screenshot key / Basic zone guide 2019-03-05 16:07:48 -05:00
Anuken
56bcabedf7 Balancing / Bugfixes / Badly antialiased turret outlines 2019-02-07 23:06:43 -05:00
Anuken
5a3ec8f407 Fixed server crash / Struct annotation begins 2019-01-28 15:43:33 -05:00
Anuken
da9278ad8d Added recorder module 2019-01-27 12:31:14 -05:00
Anuken
48a7254aa3 Code generation fix 2019-01-09 11:52:45 -05:00