Anuken/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2024-09-11 08:15:35 +03:00
Code Issues Projects Releases Wiki Activity
18,008 Commits 4 Branches 160 Tags 2.1 GiB
master
Commit Graph

370 Commits

Author SHA1 Message Date
Anuken
53a6297b59 Better naval check 2020-03-22 11:30:15 -04:00
Anuken
ea3e16ee16 Added water check 2020-03-22 09:44:38 -04:00
Anuken
d91ff744f2 Fixed color methods 2020-03-19 20:14:37 -04:00
Anuken
c7bc05f560 Unlock tweaks 2020-03-19 12:45:21 -04:00
Anuken
e9994794aa Sector lock state 2020-03-19 11:29:18 -04:00
Anuken
32ffacf8f6 Added sector deployment UI 2020-03-16 23:09:07 -04:00
Anuken
60d28fb01b Bugfixes 2020-03-06 16:07:07 -05:00
Anuken
2e19504b65 it begins 2020-03-05 20:27:42 -05:00
Anuken
f1aadd97a8 Merge branch 'master' of https://github.com/Anuken/Mindustry into 6.0 
# Conflicts:
#	core/src/mindustry/core/Logic.java
#	gradle.properties
 2020-03-03 12:12:25 -05:00
Anuken
e8823fab36 More concise stream class 2020-03-03 12:11:35 -05:00
Anuken
8b7f439ef5 Unfinished sector selection 2020-02-24 23:03:33 -05:00
Anuken
966fff70ed 2 2020-02-22 17:28:48 -05:00
Anuken
1f65ba185a Fixed unit drowning effects 2020-02-15 12:39:13 -05:00
Anuken
024f2d62e2 Planet sector metadata 2020-02-14 20:08:07 -05:00
Anuken
6fd0205495 Merge 2020-02-11 19:55:02 -05:00
Anuken
3102931cb4 Removed script wrapper 2020-02-11 17:50:16 -05:00
Anuken
fb302d49c7 Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
Anuken
a2706a80b1 Merged with master 2020-02-09 12:27:44 -05:00
Anuken
d45d7f21b6 Procedural scorch marks / Bugfixes 2020-02-09 12:07:36 -05:00
Anuken
8814dbe29a Sprite cleanup / Bullets 2020-02-08 14:48:04 -05:00
Anuken
33e818a757 Entity name mapping 2020-02-07 09:36:51 -05:00
Anuken
a11f6efe0a Rudimentary rendering 2020-02-05 23:04:48 -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
ca69aafd11 Fixed #1440 2020-01-25 10:44:46 -05:00
Anuken
eb8479f7f7 Switched from gdx-packer to arc-packer 2020-01-22 19:16:56 -05:00
Anuken
8d61ddbbd4 Added chat icons for in-game items and blocks 2020-01-17 18:08:23 -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
5ad09d6d80 Updated bundles with proper spacing 2020-01-08 10:59:29 -05:00
Patrick 'Quezler' Mounier
eb70283355 Use current directory explicitly for bundle updator (#1316) 2020-01-04 12:40:12 -05:00
Anuken
5f3c10e397 arc 2020-01-02 14:33:21 -05:00
Anuken
cb76e80836 Bugfixes 2020-01-02 14:08:41 -05:00
Anuken
566052cabf Fixed #1272 2019-12-29 12:24:51 -05:00
Anuken
de5979f4ee Many various internal changes 2019-12-26 17:46:01 -05:00
Anuken
c0f14185a8 More fixes 2019-12-25 12:35:23 -05:00
Anuken
475794640d More cleanup 2019-12-25 11:16:54 -05:00
Anuken
514d4817c8 it is done 2019-12-25 01:39:38 -05:00
Anuken
9906821912
Update BundleLauncher.java 2019-12-20 20:31:07 -08:00
Anuken
f504dd2b5a Minor tweaks 2019-12-17 17:10:29 -05:00
Anuken
e9ed0512f7 Removed Path API usage 2019-12-15 21:12:41 -05:00
Anuken
0cf39bf5c3 Eliminated 8 characters 2019-12-15 20:01:06 -05:00
Anuken
e043f4bb66 API cleanup 2019-12-14 18:19:02 -05:00
Anuken
1aca302518 Many changes to improve scripting 2019-12-08 18:34:23 -05:00
Anuken
a7d37b7e6c Fixed tests 2019-12-08 15:59:48 -05:00
Anuken
803719b216 Added mod displayName property [for color tags, etc] 2019-12-08 13:44:27 -05:00
Anuken
fd6abaff62 More class support 2019-12-07 21:46:35 -05:00
Anuken
dd5e3b2aba JS console / Scripting tweaks 2019-12-07 14:10:39 -05:00
Anuken
06abc43aea Fixed slow imports 2019-12-07 11:37:13 -05:00
Anuken
93fd6c5bd6 Removed massive import wall 2019-12-07 01:51:09 -05:00
Anuken
96aa3ccee0 Various improvements 2019-12-07 00:34:27 -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
1e3bfba31a this engine is also broken 2019-12-03 17:16:23 -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
3abcdf2063 Better access 2019-11-30 17:45:02 -05:00
Anuken
57f9aeee86 Public block fields / Better scripting 2019-11-27 13:51:07 -05:00
Anuken
0722ad2f4c Refactoring of functional package 2019-10-29 15:57:25 -04:00
Anuken
d7ebbbf2b6 Better organization 2019-10-21 21:22:35 -04:00
Anuken
ff4c7e4302 Multithreaded packing 2019-10-16 14:36:46 -04:00
Anuken
edb0ece03b More mod content support 2019-10-04 19:14:45 -04:00
Anuken
76dbc1cca3 Fixed ore/editor icon generation 2019-10-02 20:25:33 -04:00
Anuken
2db3060a03 Made content icon system more sane 2019-10-01 23:46:40 -04:00
Anuken
33416aadef Parsing fixes / Moved annotations to Arc 2019-09-29 16:09:43 -04:00
Anuken
d59f5ddc59 Achievement work, cleanup 2019-09-14 19:01:27 -04:00
Anuken
5a3fbf33df Made all color names lowercase for consistent style 2019-09-09 16:22:29 -04:00
Anuken
d981bb95b9 it is gone 2019-09-08 22:32:47 -04:00
Anuken
5134aca723 Put zone previews into atlas 2019-08-27 19:33:41 -04:00
Anuken
bd15287420 Better loading screen / Fixed unit tests 2019-08-27 17:44:25 -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
a818da5eb7 some bad sounds 2019-08-12 23:29:24 -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
ecd30094b1 Cursor antialiasing 2019-08-04 09:41:25 -04:00
Anuken
e90a4eb71d SDL tools 2019-07-26 21:24:07 -04:00
Anuken
d8d04f2ac3 Moved block icons to UI atlas 2019-07-08 15:49:47 -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
3021cc29da Fixed tops of some generator blocks 2019-06-30 11:25:39 -04:00
Anuken
c77f51b7ae Bugfixes 2019-06-30 10:09:20 -04:00
Anuken
12bff75586 Various fixes 2019-06-30 00:07:04 -04:00
Anuken
43b5cb62bb Fixed #530 / Better icons / Server list ordering 2019-06-20 22:12:17 -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
185a7bb7d8 Bugfixes / Sprite update / Multiplayer in-game editor / Drone tweaks 2019-06-17 21:35:19 -04:00
Anuken
273c74b275 Many things 2019-06-15 23:26:43 -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
aee800ab7a Changed turret outlines / Wall block tweaks 2019-06-06 21:18:54 -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
bdb7f522fb Balancing / Item tweaks 2019-05-19 17:50:11 -04:00
Anuken
35b158dba7 everything is borked 2019-05-05 14:16:34 -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
816ae84005 Overlay testing 2019-04-12 23:03:34 -04:00
Anuken
46c3b35028 Generic overlay tiles 2019-04-12 15:10:10 -04:00
Anuken
b40beb0d1d Source reformat 2019-04-08 09:03:18 -04:00
Anuken
66dc1e94f5 Slight entity optimizations / Turret sprite fixes 2019-04-02 13:58:44 -04:00
Anuken
71c2c7ad05 More code cleanup 2019-03-24 21:10:59 -04:00
Anuken
97f5bf3cc4 Code cleanup 2019-03-24 19:58:51 -04:00
Anuken
ed4d0eb5d0 Shadows setting / Server map text limit / Fallback spritesheet 2019-03-23 11:02:59 -04:00
Anuken
43bcf0cf3b Fixed unit icons / New scatter AA turret 2019-03-14 16:37:07 -04:00
Anuken
8ad6f3abcc New ore system / Multiblock fixes 2019-03-12 13:28:00 -04:00
Anuken
20427fdffa Implemented correct map loading, legacy format support 2019-03-12 10:36:04 -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
Anuken
64533de597 Bugfixes / Font changed / Zone tweaks 2019-03-08 19:07:23 -05:00
Anuken
89b439c3c8 Bugfixes 2019-03-02 23:06:14 -05:00
Anuken
0cb14461ba Improved antialiasing / Improved outlines 2019-02-26 10:42:20 -05:00
Anuken
5b7b50f555 Boss waves, health bars / Better lasers / Bugfixes 2019-02-21 13:11:28 -05:00
Anuken
29821003fe Tweaked sector dialog / Item icons fixed / Bugfixes 2019-02-09 23:20:20 -05:00
Anuken
17b24c3389 Bugfixes (again) 2019-02-08 21:29:32 -05:00
Anuken
22dad88ff7 Fixed shore world borders / Core size tweaks 2019-02-08 17:25:17 -05:00
Anuken
56bcabedf7 Balancing / Bugfixes / Badly antialiased turret outlines 2019-02-07 23:06:43 -05:00
Anuken
cee9d86835 Bugfixes 2019-02-07 09:36:39 -05:00
Anuken
6217ae78e3 Unit gun tweaks 2019-02-05 19:05:41 -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
0dd9d2b460 Moved entity package from Arc / Entity code cleanup 2019-02-02 15:53:35 -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
209e3f03c1 Implemented shore map / New blocks / Bugfixes 2019-01-30 13:34:38 -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
f31fd622dd Fixed #396 2019-01-27 09:19:23 -05:00
Anuken
6723157ca5 Power tweaks 2019-01-26 17:33:20 -05:00
Anuken
093043750b UI cleanup 2019-01-19 17:45:33 -05:00
Anuken
5e951f27c9 Block icon rework / Dynamic icon generation / Tech tree tweaks 2019-01-19 12:42:02 -05:00
Anuken
bd6cfa6461 Removed UnitCommand / Disabled mechs flying over env. blocks 2019-01-17 19:00:18 -05:00
Anuken
c6af151bf3 Sprite cleanup / Stats / More balancing / New events 2019-01-17 15:30:50 -05:00
Anuken
836a4eb892 Antialiasing 2019-01-16 22:45:51 -05:00
Anuken
33afab7294 Launchpad block 2019-01-09 11:44:33 -05:00
Anuken
048b7bd32f Global inventory / 'Deploying' / Removed command center 2019-01-09 09:07:48 -05:00
Anuken
5e49d2d8d6 Cleanup 2019-01-08 18:02:25 -05:00
Anuken
1d8efe5f9d Packer reorganization 2019-01-08 17:41:51 -05:00
Anuken
8b791b68d3 Removed exe scaling 2019-01-08 17:24:01 -05:00
Anuken
521174f911 Removed autogenerated liquid sprites 2019-01-08 09:56:42 -05:00
Anuken
7c35b6e95a Minor build file fixes 2018-12-29 15:58:11 -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
3b42b604e1 Successful desktop compilation 2018-12-26 17:38:40 -05:00
Anuken
44e4ffbe62 Fixed most things besides drawing 2018-12-22 22:17:28 -05:00
Anuken
94908bc599 🔥🔥🔥🔥🔥🔥maximum breakage 2018-12-20 12:38:27 -05:00
Anuken
0b837925a2 Build script reformatting / 'Fixed' all unchecked warnings 2018-12-13 18:01:51 -05:00
Anuken
99fb1a4c5f Implemented null-items for sorters and item sources 2018-11-30 10:28:27 -05:00
Anuken
f8d55ba837 Better scaling algorithm 2018-11-17 12:51:06 -05:00
Anuken
919dc248e3 Less terrible shadows 2018-11-16 21:20:03 -05:00
Anuken
21f3f52c7b Fixed minimap / Improved ore shadows 2018-11-14 18:15:47 -05:00
Anuken
568e43cf3d Script fixes, padding improvements 2018-11-14 17:14:22 -05:00
Anuken
e004e540d7 Correct tile edges 2018-11-14 17:05:51 -05:00
Anuken
d824b41bbb Added replacement sprites 2018-11-13 22:11:29 -05:00
Anuken
7baf42b138 New scaling pipelines 2018-11-12 19:03:24 -05:00
Anuken
ab9835b896 New scaling system 2018-11-12 17:37:26 -05:00
Anuken
09db6dc424 4x 2018-11-11 23:31:59 -05:00
Anuken
d4f5e854c5 Misc. cleanup of UI / Removed 'font scale' var / Removed [orange] 2018-11-06 23:47:23 -05:00
Anuken
da47d97cd0 Removed unused descriptions / Re-ordered all files 2018-11-03 09:28:47 -04:00
Anuken
f59441005e New sorted update script 2018-11-03 09:17:03 -04:00
Anuken
e30347a11f Fixed world data not loading on mobile servers 2018-11-03 09:00:21 -04:00
Anuken
5993a596e8 Made bundle generator add spaces between = 2018-10-23 22:45:36 -04:00
LQ
ebc4031922 set charset (#238) 
default file charset is not utf8 when run from win10
 2018-10-13 08:57:31 -04:00
Anuken
fd107ab5b8 Code cleanup 2018-10-06 11:56:39 -04:00
Anuken
35bc2c9803 Sector preset class / New missions 2018-10-05 16:36:50 -04:00
Anuken
f0870b3236 Created test module 2018-10-03 15:53:33 -04:00