1
0
mirror of https://github.com/Anuken/Mindustry.git synced 2024-10-05 20:37:25 +03:00
Commit Graph

69 Commits

Author SHA1 Message Date
Anuken
ee01e36560 Stained mountains remake submission / WIP wave graph improvements 2024-09-02 14:16:39 -04:00
Anuken
a8da0bfcbf Re-added android module in IntelliJ 2024-04-28 09:26:02 -04:00
Anuken
695dad201f includeBuild for Arc 2023-10-30 14:56:40 -04:00
Anuken
e30d090a2e arkycite recolor 2021-11-30 22:52:33 -05:00
Anuken
00e3a59463 Land animation progress / IntelliJ android plugin hack 2021-07-27 16:26:13 -04:00
Anuken
1a03151966 Enforce JDK 16 as a minimum 2021-06-14 10:55:28 -04:00
Anuken
28b235ef07 Partial 7.0 merge - API preview 2021-06-02 11:08:08 -04:00
Anuken
2b435c2600 UnitType serializer set 2020-10-14 09:13:29 -04:00
Anuken
d630110396 JITPack version check 2020-10-14 09:08:03 -04:00
Anuken
0963de4022 Cleanup 2020-09-30 11:19:38 -04:00
Anuken
0dccbf8598 Better physics system 2020-09-24 15:39:34 -04:00
Anuken
d1094492bd
Update settings.gradle 2020-08-28 21:05:07 -05:00
Anuken
d38abe95f9 Editor bugfixes / Arbitrary map resizing 2020-06-18 14:24:22 -04:00
Anuken
918c9492df Changing discord RPC system 2020-06-16 13:43:00 -04:00
Anuken
1823bc8f15 Support for compiling on Java 14 2020-06-14 11:10:54 -04:00
Anuken
fef4882c15 Turbine generator tweaks 2020-06-13 12:08:03 -04:00
Anuken
0869db6eb6 testing to see if Java 14 CI fixes anything 2020-06-13 10:54:47 -04:00
Anuken
d7fcb65b4e CI test 2020-06-13 10:42:14 -04:00
Anuken
52a3e17ec5 Natives 2020-04-30 22:56:43 -04:00
Anuken
8de0ca7d6e Async logic framework, box2D dependencies 2020-04-30 20:03:11 -04:00
Anuken
b66c1c2649 Many buildscript changes 2020-04-29 18:29:19 -04:00
Anuken
d611dd107a Bugfixes 2020-04-02 22:45:13 -04:00
Anuken
65bf97bc03 Removed need for local.properties file 2020-03-28 17:03:52 -04:00
Anuken
4fb74d1e39 Cleanup 2020-03-25 00:18:40 -04:00
Anuken
0ff3c1ee78 Cleanup 2020-03-08 21:53:19 -04: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
19b8d91724 Removed dead lwjgl3 module 2020-01-19 13:22:03 -05:00
Anuken
48daf12810 three dee 2019-12-24 21:45:53 -05:00
Anuken
d062d8081a Bugfixes 2019-09-21 16:44:47 -04:00
Anuken
2cc627e7d0 Merged net module 2019-09-07 16:55:09 -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
9bf010e222 Removed lwjgl3 desktop module, sdl promoted to main module 2019-08-21 15:41:38 -04:00
Anuken
703f034054 Bugfixes 2019-08-07 18:16:51 -04:00
Anuken
518bffe644 SDL backend / Valid mode sprites / Better layout 2019-07-25 11:45:49 -04:00
Anuken
c80be4940f Fixed unit tests / Fixed some major tile loading flaws 2019-07-23 23:29:48 -04:00
Anuken
3035d569cc Editor<->world data merging 2019-05-06 17:03:53 -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
503fc980f4 Bugfixes 2019-04-05 14:10:01 -04:00
Anuken
fdecd55278 Updated build files 2019-03-23 13:40:13 -04:00
Anuken
da9278ad8d Added recorder module 2019-01-27 12:31:14 -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
Anuken
8879593381 hhhhhhh 2018-12-26 13:22:31 -05:00
Anuken
3abfaf1bca ctrl-shift-f 2018-12-21 21:33:05 -05:00
Anuken
cabcfc7136 Initial creation of Arc port 2018-12-20 11:49:32 -05:00