Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,109 Commits 4 Branches 180 Tags
9def4eaba443c74fc0d064a484ecb9c5b733bf1c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken 35bd6a40c5 Better unit factory implementation 2020-05-01 18:07:37 -04:00
Anuken 676ee8beda Merge remote-tracking branch 'origin/master' 2020-05-01 16:49:10 -04:00
Anuken df63ce411d Cleanup / Removed collision process 2020-05-01 16:48:36 -04:00
Anuken 41754fc100 Minor optimization 2020-05-01 16:46:38 -04:00
Anuken 135b87fdb2 Cleanup, optimization 2020-05-01 16:35:18 -04:00
Anuken 3101fc8056 a performance disaster, part 2 2020-05-01 14:49:58 -04:00
Anuken 64bacea3c7 a performance disaster, part 1 2020-05-01 14:36:33 -04:00
Anuken cdc8d2bfe4 Removed experimental tag 2020-05-01 11:31:25 -04:00
Anuken c1e1e3c25b Merge remote-tracking branch 'origin/master' 2020-05-01 11:23:44 -04:00
Anuken e75d1a51a6 More accurate resource display / Server fix 2020-05-01 11:23:36 -04:00
Anuken d99946df77 Fixed daggers not shooting 2020-04-30 23:54:04 -04:00
Anuken 07835bb76d arc 2020-04-30 23:16:20 -04:00
Anuken 52a3e17ec5 Natives 2020-04-30 22:56:43 -04:00
Anuken ea1e137a00 Server physics 2020-04-30 22:10:59 -04:00
Anuken 3b340f7164 Better physics 2020-04-30 22:09:42 -04:00
Anuken 273f4590df Physics 2020-04-30 21:58:48 -04:00
Anuken 8de0ca7d6e Async logic framework, box2D dependencies 2020-04-30 20:03:11 -04:00
Anuken 626a06ca00 Bugfixes / Better titan sprite 2020-04-30 18:21:50 -04:00
Anuken c5859eb03a Fixed #1947 2020-04-30 17:34:29 -04:00
Anuken 3397557737 Sprites 2020-04-30 16:04:43 -04:00
Anuken d50092e9a2 Merge remote-tracking branch 'origin/master' 2020-04-30 14:46:30 -04:00
Anuken 2dbb099d79 AI tweaks / Control tweaks / Plastanium conveyor tweaks / Unit factories 2020-04-30 14:46:22 -04:00
Anuken 5887169f90 Cleanup 2020-04-29 19:54:20 -04:00
Anuken 289e8bb394 iOS backend refactoring 2020-04-29 18:44:09 -04:00
Anuken f4604f2207 Cleanup 2020-04-29 18:36:20 -04:00
Anuken 6b55b64775 arc 2020-04-29 18:32:33 -04:00
Anuken ec5c060574 Merge remote-tracking branch 'origin/master' 2020-04-29 18:29:27 -04:00
Anuken b66c1c2649 Many buildscript changes 2020-04-29 18:29:19 -04:00
Anuken 414b538e6b Merge remote-tracking branch 'origin/master' 2020-04-28 19:34:03 -04:00
Anuken 2ee99b3290 Cleanup 2020-04-28 19:33:59 -04:00
Anuken d4163f2d1c Merge remote-tracking branch 'origin/master' 2020-04-28 13:15:45 -04:00
Anuken 3ccf2ecc24 Projector visualization 2020-04-28 13:15:40 -04:00
Anuken 2504fd536b Autopack sprites when running 2020-04-27 17:35:10 -04:00
Anuken a4d49f5d17 Automatic assignment of entities 2020-04-27 01:31:41 -04:00
Anuken 2f3c098b50 Unit status cleanup 2020-04-26 23:24:05 -04:00
Anuken f6bf229b0a Cleanup 2020-04-26 21:59:49 -04:00
Anuken 1941b0fa8a Merge remote-tracking branch 'origin/master' 2020-04-26 11:24:56 -04:00
Anuken dfcf11fb07 Removed mech-related bundle entries 2020-04-26 11:24:52 -04:00
Anuken fa62336096 Cleanup 2020-04-25 23:14:12 -04:00
Anuken 08f8323465 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/assets-raw/sprites/units/phantom-cell.png
 2020-04-25 22:49:38 -04:00
Anuken 9b74b69950 Unit tweaks 2020-04-25 22:49:30 -04:00
Anuken 8b7d75c5ba Unit tweaks 2020-04-25 22:48:25 -04:00
Anuken c875bb3f55 Merge remote-tracking branch 'origin/master' 2020-04-25 17:34:39 -04:00
Anuken ceee1d36e6 Bugfixes 2020-04-25 17:34:35 -04:00
Anuken 30d8737f67 Bugfixes 2020-04-25 12:49:19 -04:00
Anuken 9e0af97cee Merge remote-tracking branch 'origin/master' 2020-04-25 12:30:22 -04:00
Anuken 838e12cc0a stop 2020-04-25 12:30:18 -04:00
Anuken 81af481d3a Removed sleep 2020-04-25 10:12:37 -04:00
Anuken 2e2c8ceab4 Bugfixes 2020-04-25 00:04:14 -04:00
Anuken 09e08a474b Plastanium conveyor + bugfixes 2020-04-24 20:17:24 -04:00
Anuken 21946cafd1 Merge branch 'crater' of https://github.com/Quezler/Mindustry into Quezler-crater 2020-04-24 15:46:32 -04:00
Anuken 32a182cd01 Unit parsing cleanup 2020-04-24 15:45:57 -04:00
Anuken 6041e238a6 Bugfixes 2020-04-24 12:01:08 -04:00
Anuken 5d4ca753a7 Light cleanup 2020-04-24 11:08:02 -04:00
Anuken 1b2e10d355 Cleanup, re-implementations 2020-04-24 11:01:17 -04:00
Anuken 018fe5dea2 Added lights for laser turret projectiles 2020-04-24 09:50:40 -04:00
Anuken eeb88df5f6 Bugfixes 2020-04-23 17:45:12 -04:00
Anuken cafd076f9c Fixed water animation conflict 2020-04-23 15:08:32 -04:00
Anuken 87ed405916 Bugfixes 2020-04-23 14:50:30 -04:00
Anuken 7091cad704 Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0 2020-04-23 14:05:09 -04:00
Anuken b68b3a1837 Layer tweaks 2020-04-23 14:04:31 -04:00
Anuken 2aa05f989b Merged in sprite sorting 2020-04-23 14:00:55 -04:00
Anuken cec5c24d69 progress 2020-04-23 13:58:06 -04:00
Anuken c738dcb42e progress 2020-04-23 12:52:16 -04:00
Anuken 1bf5b19889 progress 2020-04-23 12:35:49 -04:00
Anuken c6e4bf1fa4 progress 2020-04-23 11:06:58 -04:00
Anuken 71e8c088a6 progress 2020-04-23 11:01:14 -04:00
Anuken 989ee895e8 Functional sorting 2020-04-23 10:25:46 -04:00
Anuken 2538273402 progress 2020-04-23 00:41:18 -04:00
Anuken 18b68fefed how did this compile 2020-04-23 00:16:41 -04:00
Anuken 362846bd68 progress 2020-04-23 00:03:03 -04:00
Anuken 6cf422eebf progress 2020-04-22 17:23:30 -04:00
Anuken fc4f8619f8 progress (purge) 2020-04-22 16:17:43 -04:00
Anuken c5f93139bd progress 2020-04-22 16:06:26 -04:00
Anuken 9beb23b0e4 progress 2020-04-22 15:19:39 -04:00
Anuken d154361e75 Merge branch '6.0' of https://github.com/Anuken/Mindustry into sprite-sorting 2020-04-22 14:34:34 -04:00
Anuken 67d87f023b Cleanup 2020-04-22 14:22:33 -04:00
Anuken da7c393096 progress 2020-04-22 12:47:29 -04:00
Anuken b3f936acb8 Fixed tests not compiling 2020-04-22 11:18:19 -04:00
Anuken 2ca62831e3 Revert "Cleaned up tests" (wrong branch) 2020-04-22 11:17:47 -04:00
Anuken cb601b729e Merge remote-tracking branch 'origin/master' 2020-04-22 10:48:54 -04:00
Anuken cc4e9c5ba1 Cleaned up tests 2020-04-22 10:48:50 -04:00
Anuken a592144291 Catching of schematic preview errors / Fixes #1886 2020-04-22 09:49:04 -04:00
Anuken 58e9e0c0de Merged #1882 with some tweaks 2020-04-21 11:02:44 -04:00
Anuken eeb8d5ef9c Renamed key fields and table methods 2020-04-17 11:26:59 -04:00
AnukenandGitHub c5c63c24d5 Update bug_report.md 2020-04-16 17:00:07 -04:00
Anuken 280f3dd428 Added experimental package 2020-04-16 16:31:43 -04:00
Anuken 2f3a842f2e isValid() workaround 2020-04-16 14:26:09 -04:00
Anuken 2693f9c176 Implemented some PR features 2020-04-16 13:46:45 -04:00
Anuken c6bbdfdc9b Fixed compilation 2020-04-16 11:35:35 -04:00
Anuken 713dbccf74 Bugfixes 2020-04-16 11:30:42 -04:00
Anuken a8f4df8030 Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0 
# Conflicts:
#	core/src/mindustry/ui/fragments/PlayerListFragment.java
 2020-04-16 10:14:13 -04:00
Anuken 256f805754 Payload fixes 2020-04-16 09:55:57 -04:00
Anuken ea0358d570 Merge remote-tracking branch 'origin/6.0' into 6.0 2020-04-16 09:44:36 -04:00
Anuken 42f227195c Better payload framework 2020-04-16 09:44:31 -04:00
Anuken 8a01b87c99 Cleanup 2020-04-15 23:12:18 -04:00
Anuken 79c8548171 Better conveyor animations 2020-04-15 19:05:18 -04:00
Anuken a234949b8c Visual tweaks 2020-04-15 13:03:37 -04:00
Anuken 0eaf9bc9c6 Various prototypes 2020-04-15 12:44:53 -04:00
Anuken 51226d6c88 Arc compat 2020-04-14 20:29:59 -04:00