Patrick 'Quezler' Mounier
9df875354a
Revert "Repurpose branch to be played"
...
This reverts commit ff578c8540
2020-03-05 10:10:00 +01:00
Patrick 'Quezler' Mounier
e5e4884448
Merge branch 'master' into crater
...
# 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/world/modules/ItemModule.java
2020-03-05 10:00:02 +01:00
Anuken
e8823fab36
More concise stream class
2020-03-03 12:11:35 -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
Patrick 'Quezler' Mounier
99d1a2829f
Merge branch 'master' into crater
2020-02-06 19:33:57 +01:00
Patrick 'Quezler' Mounier and GitHub
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
Patrick 'Quezler' Mounier
babe00245a
Comment on crater-deploy.sh
2020-01-28 14:52:09 +01:00
Patrick 'Quezler' Mounier
ff578c8540
Repurpose branch to be played
...
When anuke shows more interest in this branch the changes that stem from this can be reversed and squashed, but people want to play it, and keeping 2 crater related branches in sync is frankly a pain 😗
2020-01-28 14:31:32 +01: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 and Anuken
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 and GitHub
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
Patrick 'Quezler' Mounier
Anuken
