mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-25 22:58:47 +07:00
Code Issues Packages Projects Releases Wiki Activity
7,325 Commits 4 Branches 160 Tags 2.3 GiB
12d9479184
Commit Graph

782 Commits

Author SHA1 Message Date
Anuken
b6e97c4261 Added armored conveyors 2019-09-22 15:12:15 -04:00
Anuken
3f293190cf Merge branch 'master' of https://github.com/Anuken/Mindustry into messages 
# Conflicts:
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites2.png
#	core/assets/sprites/sprites5.png
 2019-09-21 18:59:49 -04:00
Anuken
dda1f18f67 Unit enemy spawnpoint camping 2019-09-20 23:09:11 -04:00
Anuken
e4cdf515c9 More workshop implementation 2019-09-10 20:53:31 -04:00
Anuken
c4c0f45228 cleaning up what remains 2019-09-08 22:55:36 -04:00
Anuken
d981bb95b9 it is gone 2019-09-08 22:32:47 -04:00
Anuken
c9f0a59339 time for a crusade against dialogs 2019-09-08 15:08:55 -04:00
Anuken
5651d1b023 Support for built-in servers 2019-09-05 19:23:17 -04:00
Anuken
209f0902c9 message blocks 2019-09-03 16:11:01 -04:00
Anuken
5cc32b9001 Fixed map loading bugs 2019-09-01 10:46:44 -04:00
Anuken
26d44ea030 Save slot previews 2019-08-30 15:01:38 -04:00
Anuken
5134aca723 Put zone previews into atlas 2019-08-27 19:33:41 -04:00
Anuken
e314d199f0 By popular demand, re-added command center 2019-08-24 15:39:01 -04:00
Anuken
89ee04c942 Machine ambient sounds 2019-08-15 13:32:36 -04:00
Anuken
c9178c3f2f Fixed power nodes in multiplayer 2019-08-13 22:47:31 -04:00
Anuken
f2f6dc89a2 fire 2019-08-13 12:04:09 -04:00
Anuken
c4aa0b2863 New discord app ID / New testing sounds 2019-08-12 12:32:13 -04:00
Anuken
2341da995e Random in-game music, untested 2019-08-10 18:56:20 -04:00
Anuken
16f6b51857 Various tweaks, new music tracks 2019-08-09 23:23:45 -04:00
Anuken
4811578c95 Incomplete tutorial basics 2019-08-08 17:03:45 -04:00
Anuken
8346d5fc13 Fixed connection not resetting on game load / Experimental click changes 2019-08-05 10:26:24 -04:00
Anuken
81909bd1a9 Moved launch controls to wave button 2019-08-04 08:58:51 -04:00
Anuken
77d4b0972d Balancing 2019-08-02 12:39:21 -04:00
Anuken
04c8ecf4af New team colors 2019-08-02 10:10:37 -04:00
Anuken
5acda423d8 UI polish 2019-08-01 22:40:15 -04:00
Anuken
8b3995686f Misc. in-game UI polish 2019-08-01 20:49:03 -04:00
Anuken
b1980a17ac Fixed editor not showing after second view 2019-08-01 11:26:28 -04:00
Anuken
69ee5257f2 Display current ammo type in turret info 2019-08-01 11:03:20 -04:00
Anuken
c4157d2ec8 New map / Better filters / Sand boulders 2019-07-26 18:59:33 -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
6f0bc2ecf8 Minor build fixes 2019-07-22 12:42:42 -04:00
Anuken
e52965d039 Bugfixes 2019-07-10 09:55:31 -04:00
Anuken
fc9543baa7 Updated sprites/UI colors 2019-07-07 14:11:57 -04:00
Anuken
3dfef06bba Bugfixes 2019-07-06 18:42:05 -04:00
Anuken
5ae1e59b5c UI 2019-07-06 12:22:10 -04:00
Anuken
121e0a433b Final tweaks before merge 2019-07-06 10:12:22 -04:00
Anuken
174caef7ca Added turret damage / Removed changelog dialog 2019-07-05 14:01:54 -04:00
Anuken
d2bb3800e3 Added version display, info dialog back 2019-07-05 13:41:22 -04:00
Anuken
f0959ab356 More UI and layout changes 2019-07-05 12:02:02 -04:00
Anuken
a7a565b93e Hacky pad fix 2019-07-04 17:29:31 -04:00
Anuken
ed074bd08b UI stuff 2019-07-04 17:11:30 -04:00
Anuken
0371126ccf Various menu fixes 2019-07-04 00:51:42 -04:00
Anuken
d43d4a1773 Cleanup, main menu progress 2019-07-03 23:36:51 -04:00
Anuken
0d39400f8b Fixed performance regression / Removed useless fallback sprites 2019-07-03 17:07:22 -04:00
Anuken
d3c8678f80 Splitting UI atlas 2019-07-03 15:59:50 -04:00
Anuken
217237b57e New menu background, unfinished 2019-07-02 14:42:24 -04:00
Anuken
cb7b6eb3f8 More menu 2019-07-02 10:01:34 -04:00
Anuken
5e15c5574a menu stuff 2019-06-30 16:52:34 -04:00
Anuken
1c530a6c7a Merge + update 2019-06-30 14:13:13 -04:00
Anuken
3021cc29da Fixed tops of some generator blocks 2019-06-30 11:25:39 -04:00
Anuken
12bff75586 Various fixes 2019-06-30 00:07:04 -04:00
Anuken
ab716e96e2 Bugfixes 2019-06-24 16:54:50 -04:00
Anuken
b2a4cb42cf Sprite updates 2019-06-23 12:36:13 -04:00
Anuken
8c91aca838 New maps / New generation filter(s) and tweaks 2019-06-22 20:40:53 -04:00
Anuken
43b5cb62bb Fixed #530 / Better icons / Server list ordering 2019-06-20 22:12:17 -04:00
Anuken
478d86677d Fixed boulder sprites 2019-06-20 00:16:22 -04:00
Anuken
1fe30bc466 Branch created 2019-06-19 22:20:17 -04:00
Anuken
185a7bb7d8 Bugfixes / Sprite update / Multiplayer in-game editor / Drone tweaks 2019-06-17 21:35:19 -04:00
Anuken
bc3405d11d Bugfixes 2019-06-17 15:45:10 -04:00
Anuken
4f40f3c4b2 More sprite updates 2019-06-17 10:08:24 -04:00
Anuken
910dab1896 More drone changes 2019-06-14 21:06:58 -04:00
Anuken
8ac497354a Miner drone / Editor bugfixes 2019-06-12 22:09:24 -04:00
Anuken
df78412896 Desktop/mobile descriptive tool modes 2019-06-11 23:31:57 -04:00
Anuken
af1746932f Fixed incorrect scaling 2019-06-11 08:47:16 -04:00
Anuken
ea0788f56c Better wave timer / Sprite tweaks / Core wave spawns 2019-06-09 21:09:29 -04:00
Anuken
4199702b9b Updated turret sprites 2019-06-09 14:46:48 -04:00
Anuken
444b5dbd97 Turret balance / Bugfixes 2019-06-09 12:04:45 -04:00
Anuken
aee800ab7a Changed turret outlines / Wall block tweaks 2019-06-06 21:18:54 -04:00
Anuken
895b46307a Sprite tweaks 2019-06-06 18:47:53 -04:00
Anuken
d300d45f22 Fixed unit factory sprites 2019-06-06 15:38:19 -04:00
Anuken
1897008c72 Pump sprites 2019-06-06 10:27:11 -04:00
Anuken
3942c6cd55 Even more sprites cleaned up 2019-06-06 00:28:09 -04:00
Anuken
f0f7b5aaf7 Updated sprites 2019-06-05 21:29:34 -04:00
Anuken
80bdaa1edc Cleanup 2019-06-04 23:30:07 -04:00
Anuken
39acb224d1 Merged replacement sprites. Scaling is now disabled by default. 2019-06-04 22:54:01 -04:00
Anuken
a3454e50d7 Merge 2019-05-30 00:27:05 -04:00
Anuken
75b8f5e543 Properly rounded sprites for 'source/sorter' blocks 2019-05-29 23:42:03 -04:00
Anuken
752267c521 Fixed many various map bugs 2019-05-26 16:46:44 -04:00
Anuken
ba0b4513f1 New tile transitions 2019-05-25 23:56:21 -04:00
Anuken
bdb7f522fb Balancing / Item tweaks 2019-05-19 17:50:11 -04:00
Anuken
52674b4668 Mobile diagonal toggle / Cancel button moved 2019-05-12 11:19:31 -04:00
Anuken
0c396f76b2 Fixed impact reactor warming up without satisfied power 2019-05-03 00:13:37 -04:00
Anuken
b2408b1a7c New block stats / Junction bugfixes 2019-05-02 23:10:41 -04:00
Anuken
6fd5f1563a Fixed incorrect power source sprite 2019-04-30 00:07:38 -04:00
Anuken
3c643c917a Map bugfixes / Sprite tweak / Zone loadout moved to dialog 2019-04-29 23:58:16 -04:00
Anuken
4c17b56e28 Less messy respawning / Standard starter mech / Bugfixes 2019-04-28 10:34:53 -04:00
Anuken
0382c35ac0 Settings menu layout improved / Rule dialog improvements 2019-04-21 22:39:56 -04:00
Anuken
75dcceff43 Zone requirement changes / Bugfixes 2019-04-20 19:57:20 -04:00
Anuken
5f89a1b9ca Sprite updates 2019-04-16 20:30:47 -04:00
Anuken
b9db5ad662 Added block cracks 2019-04-16 12:15:06 -04:00
Anuken
5b8084e1fa Solid bush block 2019-04-16 00:49:14 -04:00
Anuken
ab67b67e4c Updated environmental sprites 2019-04-15 22:52:44 -04:00
Anuken
8413443c26 Tech tree usability improvements / Bugfixes 2019-04-15 18:32:32 -04:00
Anuken
89b9501f35 Fixed tree color 2019-04-13 11:04:36 -04:00
Anuken
816ae84005 Overlay testing 2019-04-12 23:03:34 -04:00
Anuken
ef2b8be726 Cleaned up some sprites 2019-04-11 22:52:29 -04:00
Anuken
df51078858 New generation 2019-04-11 16:41:46 -04:00
Anuken
b4fb687c4f Coal centrifuge / In-game chat / Player health rule / Bugfixes 2019-04-09 12:44:07 -04:00
Anuken
b40beb0d1d Source reformat 2019-04-08 09:03:18 -04:00
Anuken
61f6368591 Bundle update 2019-03-28 17:31:22 -04:00
Anuken
e6a24b8ba1 Balancing / Bugfixes / Decreased build duration slightly 2019-03-28 14:38:00 -04:00
Anuken
d56869aefa Unit shadows 2019-03-28 12:42:04 -04:00
Anuken
7ce571e59c New tentative edge style / Zone tweaks 2019-03-26 20:10:01 -04:00
Anuken
10c999a4a2 Bugfixes / Mender block / Extra stats / Balancing 2019-03-26 11:05:47 -04:00
Anuken
f7aa58e385 Many small tweaks / Custom rules / Server run files / Balance 2019-03-24 16:29:25 -04:00
Anuken
ed4d0eb5d0 Shadows setting / Server map text limit / Fallback spritesheet 2019-03-23 11:02:59 -04:00
Anuken
a4f558c77a Code cleanup / Tainted water 2019-03-22 19:16:15 -04:00
Anuken
2c8620a75c Added missing sprites 2019-03-20 22:42:33 -04:00
Anuken
886b62bbad Too many things to list in a single line commit log 2019-03-20 22:40:47 -04:00
Anuken
e2126a2693 Mandatory line placement tutorial 2019-03-20 19:12:14 -04:00
Anuken
fbf4c411c1 Map editor fixes / Zone environment changes 2019-03-19 23:51:52 -04:00
Anuken
783f453da3 Generate tool bugfixes / Map edits / New blocks 2019-03-17 18:30:33 -04:00
Anuken
7d1a8f5404 Unfinished generation tool 2019-03-15 00:13:54 -04:00
Anuken
43bcf0cf3b Fixed unit icons / New scatter AA turret 2019-03-14 16:37:07 -04:00
Anuken
ed105b102d Custom wave patterns / Fixed checkbox sprite / Bugfixes 2019-03-14 14:01:22 -04:00
Anuken
f2662045ed New item bars / Map bugfixes / Stub wave editing 2019-03-13 21:26:53 -04:00
Anuken
ecb77b0283 Fortress builtin map / Attributes / Efficiency stat / Bugfixes 2019-03-12 23:39:39 -04:00
Anuken
4d4869842e Bugfixes 2019-03-12 16:37:32 -04:00
Anuken
0f4d574115 New unfinished environment blocks / Bugfixes / Tech tree tweak 2019-03-10 22:38:53 -04:00
Anuken
1feb4a5e6d Tar shader / Spritesheet split / Font cleanup 2019-03-10 11:11:16 -04:00
키에르
f861b75c7d Fix fonts (#424) 
* Fix fonts

* Add more fonts & bundle update

* Increase font size
 2019-03-10 08:03:54 -06:00
Anuken
a0905d5695 Faster, smaller server / Bundle check cleanup 2019-03-09 19:12:54 -05:00
Anuken
f86a07daee Removed awt use / Sand recolor / Bugfixes / Link fix 2019-03-09 16:47:08 -05:00
Anuken
563e015c92 Fixed power bug 2019-03-09 09:51:12 -05:00
Anuken
64533de597 Bugfixes / Font changed / Zone tweaks 2019-03-08 19:07:23 -05:00
Anuken
966efa0669 Bugfixes / Sprite tweak 2019-03-05 09:53:37 -05:00
Anuken
d82d0ae923 Waveskip / Stat fixes / 3x3 thermalpump / Removed liquid tiers 2019-03-01 23:01:12 -05:00
Anuken
110def97d9 Sprite fixes 2019-02-28 22:59:48 -05:00
Anuken
2aff73a958 Added drill output rate bar 2019-02-28 09:45:03 -05:00
Anuken
4eba89603e Shader tests 2019-02-26 15:13:05 -05:00
Anuken
964d1a0d87 Shader cleanup 2019-02-26 13:11:49 -05:00
Anuken
0cb14461ba Improved antialiasing / Improved outlines 2019-02-26 10:42:20 -05:00
Anuken
0a9b78f013 Bugfixes / Renamed biomatter / Cleaned up conveyor sprites 2019-02-25 22:26:51 -05:00
Anuken
b0126206e1 Bridge sprite cleanup 2019-02-21 17:16:42 -05:00
Anuken
9c240850b8 Fixed pad shader/disconnect bugs 2019-02-21 14:08:42 -05:00
Anuken
5b7b50f555 Boss waves, health bars / Better lasers / Bugfixes 2019-02-21 13:11:28 -05:00
Anuken
4b028b3435 Re-added core database in game menus 2019-02-20 09:14:51 -05:00
Anuken
18fcc6e596 Bugfixes / Requirement display 2019-02-14 15:20:08 -05:00
Anuken
59e909ae3a Better 'unknown' map names / Recipe fixes 2019-02-14 12:11:20 -05:00
Anuken
66766b43c7 Bugfixes 2019-02-14 10:00:17 -05:00
Anuken
718f56172e Enlarged laser/blast drills / Removed ground zero copper cost 2019-02-10 17:32:22 -05:00
Anuken
34b7961814 Improved placement visuals 2019-02-10 12:32:33 -05:00
Anuken
897b90f044 Possible save fix / Place arrow de-mushroomified / Fixed descriptions 2019-02-10 11:46:18 -05:00
Anuken
29821003fe Tweaked sector dialog / Item icons fixed / Bugfixes 2019-02-09 23:20:20 -05:00
Anuken
66c27fab13 Bugfixes 2019-02-08 08:44:20 -05:00
Anuken
56bcabedf7 Balancing / Bugfixes / Badly antialiased turret outlines 2019-02-07 23:06:43 -05:00
Anuken
79a9541394 Turret, power generator and bullet balancing sweep 2019-02-07 15:55:31 -05:00
Anuken
7e35de3c33 Balancing / Renamed palettes file 2019-02-07 15:33:56 -05:00
Anuken
cee9d86835 Bugfixes 2019-02-07 09:36:39 -05:00
Anuken
1bdea1b8d8 Arc balancing / Bundle update / Changed turret colors 2019-02-05 22:36:20 -05:00
Anuken
6217ae78e3 Unit gun tweaks 2019-02-05 19:05:41 -05:00
Anuken
2904bc69d9 Bugfixes 2019-02-05 00:34:05 -05:00
Anuken
6e7514491c Balancing 2019-02-04 21:24:12 -05:00
Anuken
82b908f0ab Unit balancing 2019-02-04 09:09:47 -05:00
Anuken
336256fc71 Bundle/tech tree fixes 2019-02-03 23:08:48 -05:00
Anuken
49a7da6393 Finalized unit type definitions 2019-02-03 22:48:27 -05:00
Anuken
a8c645f00d Weapon refactor / New units with edgy names / Spritesheet cleanup 2019-02-03 21:11:26 -05:00
Anuken
62d8cb0b25 Impact reactor 2019-02-03 11:22:53 -05:00
Anuken
f5028a4937 Multipress sprite / Shields re-added 2019-02-02 22:33:12 -05:00
Anuken
8e8e95cd2d Merged alpha and dart mech pads / Differential gen / Fixed optional display 2019-02-02 17:39:46 -05:00
Anuken
c0d6618808 Final map 2019-02-02 12:35:36 -05:00
Anuken
59a68ee981 Spritesheet cleanup / Heat blocks / Editor bugfix 2019-02-01 21:47:44 -05:00
Anuken
7a072746d9 Fixed map colors / Cultivator tweak / Color gen 2019-02-01 19:01:08 -05:00
Anuken
a6799dd29b Kiln texture fix / New map resize dialog 2019-02-01 18:08:09 -05:00
Anuken
163ecb160a Added new unit type / Made reactor use cryo only / Balancing 2019-02-01 15:55:11 -05:00
Anuken
87b489a541 Tile cleanup 2019-02-01 09:22:08 -05:00
Anuken
f670ade2ee Work on new maps continues 2019-02-01 00:04:21 -05:00
Anuken
b5508c1152 New power node type / Bugfixes / Random item caches 2019-01-31 15:57:21 -05:00
Anuken
564c258c86 Core tiers 2019-01-31 15:33:07 -05:00
Anuken
745ff1a270 Map implemented / Editor pick key / Crash fix 2019-01-31 12:45:11 -05:00
Anuken
e727ee6d4a Even more blocks / Map generator config / Editor fixes 2019-01-31 10:58:26 -05:00
Anuken
e6a39a8255 Shader crash fix / More blocks / Kiln / Removed (unused) flux 2019-01-30 22:51:24 -05:00
Anuken
c046a1b474 New blocks / Floor edge fixes 2019-01-30 18:39:10 -05:00
Anuken
209e3f03c1 Implemented shore map / New blocks / Bugfixes 2019-01-30 13:34:38 -05:00
Anuken
dbf05a1419 New basic water sprite 2019-01-29 22:26:02 -05:00
Anuken
76af3e3077 Customizable edge stencil / Reduced redundant sprites 2019-01-28 23:30:11 -05:00
Anuken
54bade668e New tile edge algorithms / Struct value type generation 2019-01-28 22:11:23 -05:00
Anuken
e9a82652a0 New blocks 2019-01-27 23:26:07 -05:00
Anuken
db2e6b6973 Better launch / Better spawns / Tweaks 2019-01-27 18:09:59 -05:00
Anuken
da9278ad8d Added recorder module 2019-01-27 12:31:14 -05:00
Anuken
5a9307e9a7 Smooth block shadows / Large procedural blocks 2019-01-27 12:09:01 -05:00
Anuken
7924051c0d Graphite press balancing 2019-01-26 11:32:39 -05:00
Anuken
0f26d62a0a Bundle update / Custom game button / Join button 2019-01-26 10:37:04 -05:00
Anuken
a9f11256cd Unfinished graphite press block 2019-01-25 23:15:30 -05:00
Anuken
058db5d5d0 Sprite cleanup 2019-01-24 20:00:35 -05:00
Anuken
923d0497e6 Added sprites 2019-01-24 13:11:41 -05:00
Anuken
dd4f4b83fc Editor variant display / Visual changes 2019-01-24 13:11:22 -05:00
Anuken
9a444da343 Unfinished block / Bugfixes 2019-01-23 23:43:31 -05:00
Anuken
9dd6a77c76 Various blocks added / Crater map updated / Fixed status effect bugs 2019-01-23 20:08:28 -05:00
Anuken
e9e2cd614d Basic crater map / Spray tool / Crater floor / canProduce() 2019-01-22 23:02:04 -05:00
Anuken
5459a646b3 In-game block team display / Editor bugfix 2019-01-22 15:46:22 -05:00
Anuken
0e5b95e3aa Added health bars to block info / Fixed block info refresh bug 2019-01-22 13:46:10 -05:00
Anuken
ee9a2ee03d Deploy dialog requirements done 2019-01-21 19:37:02 -05:00
Anuken
a9d7ed50b7 Re-added all recipes to blocks 2019-01-20 21:11:58 -05:00
Anuken
750388a425 Defined first 12 zones 2019-01-20 11:49:17 -05:00
Anuken
ea9155b903 Further UI cleanup 2019-01-19 23:13:46 -05:00
Anuken
d34f228d2f Functional tech tree 2019-01-19 22:16:28 -05:00
Anuken
093043750b UI cleanup 2019-01-19 17:45:33 -05:00
Anuken
4fb0c246db Tech tree filled out 2019-01-19 14:58:29 -05:00