Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,635 Commits 4 Branches 180 Tags
424e58ff7df5a02dcaa061a4aa3fa7fd78fe26b5
Commit Graph

4347 Commits

Author SHA1 Message Date
Patrick 'Quezler' Mounier
424e58ff7d Merge branch 'master' into crater 2020-04-16 11:20:16 +02:00
Olexandr Nesterenko
95d603a035 Separate the use of map name and player name (#1863) 
* change use 'name'

* remove schematic.name
 2020-04-14 10:04:05 -04:00
Blockzilla101
501253d13a added name of player to ban/kick/vote-kick/un-admin/admin confirmation dialog (#1846) 
* added name of player to baning/kicking/vote-kicking/admining

* slight tweaks

* fixed redundant things
 2020-04-12 10:52:05 -04:00
Patrick 'Quezler' Mounier
9e811be477 Name which map name has a conflict when importing (#1844) 2020-04-12 09:56:36 -04:00
Patrick 'Quezler' Mounier
68c20ae728 Complete me senpai (#1810) 2020-04-03 10:48:51 -04:00
Patrick 'Quezler' Mounier
74e94e5344 Merge branch 'master' into crater 2020-04-02 12:05:04 +02:00
Anuken
b06d517084 Fixed #1793 2020-03-31 12:02:27 -04:00
Olexandr Nesterenko
81ffd3fd3c chenge size for ok button (#1786) 2020-03-30 11:11:38 -04:00
Anuken
767719d410 Power balance tweak 2020-03-27 18:23:02 -04:00
fuzzbuck
643d054294 Add search bar in playerlist (#1572) 
* add "search" bar in playerlist

* remove log.info

* clear keyboard focus & text on toggle

* refactor sField -> field (fixes build??)

* refactor field -> sField (revert) should build now 👍

* remove drawEach boolean, simplify everything (please ignore previous commits)

* escape color codes

* use Strings.stripcolors & check for & without color codes
 2020-03-26 19:01:24 -04:00
DeltaNedas
b077cd7fb0 let scripts require from the same mod (#1698) 
it seems fine to have
`require("mymod/script")`
e.g. if mods require a lot of scripts and want to organise it
 2020-03-26 18:30:34 -04:00
Patrick 'Quezler' Mounier
975221f4cc Revert "Revert "Revert "Revert "Revert "Repurpose branch to be played""""" 
This reverts commit 164dd0c405.
 2020-03-26 16:53:34 +01:00
whert-dev
1e1fbbc37b Bind plasma sprite's size to reactor's size (#1754) 
This will be useful for modded ImpactReactors that have different sizes. (Please correct my code if it is wrong).
 2020-03-25 19:55:33 -04:00
Anuken
6cc2719ed7 Updated FBO method names 2020-03-25 11:06:52 -04:00
Anuken
a1b64900ab 2 2020-03-24 00:33:59 -04:00
Anuken
2b4ce01fac Updated arc 2020-03-24 00:25:36 -04:00
Patrick 'Quezler' Mounier
104fd78966 Collapse while 2020-03-23 17:07:11 +01:00
Patrick 'Quezler' Mounier
6b27d19057 Alter comments 2020-03-23 17:05:03 +01:00
Patrick 'Quezler' Mounier
6228b5353f Pack dump into conveyor rotation 2020-03-23 17:01:47 +01:00
Anuken
966321baca Merge remote-tracking branch 'origin/master' 2020-03-19 20:02:48 -04:00
Anuken
f2f39573bb Color cleanup 2020-03-19 20:02:43 -04:00
Patrick 'Quezler' Mounier
164dd0c405 Revert "Revert "Revert "Revert "Repurpose branch to be played"""" 
This reverts commit 8caa9ed548.
 2020-03-16 09:15:44 +01:00
Anuken
2250f2f0bc Stack trace 2020-03-16 01:08:45 -04:00
Patrick 'Quezler' Mounier
8caa9ed548 Revert "Revert "Revert "Repurpose branch to be played""" 
This reverts commit 4b08cfd2b7.
 2020-03-15 22:04:10 +01:00
Patrick 'Quezler' Mounier
4f195b72d1 Merge branch 'master' into crater 2020-03-15 22:00:51 +01:00
Patrick 'Quezler' Mounier
4b08cfd2b7 Revert "Revert "Repurpose branch to be played"" 
This reverts commit 9df875354a.
 2020-03-15 22:00:45 +01:00
ma44
ec34e27102 map setting refund (#1709) 2020-03-15 14:02:47 -04:00
Anuken
6079980a50 Fixed content loading crash 2020-03-15 09:08:27 -04:00
Anuken
8550995c4e Fixed compilation 2020-03-10 19:51:31 -04:00
Anuken
f63d1874c2 Merge remote-tracking branch 'origin/master' 2020-03-09 09:41:51 -04:00
Anuken
d7f9090c0b Fixed #1672 2020-03-09 09:41:39 -04:00
DeltaNedas
9ef394a99e set current mod to required mod (#1684) 
or you will need to prefix mod name in requires of the required mod
instead you now need to prefix current mods name after youve required from another mod
 2020-03-07 22:47:12 -05:00
Patrick 'Quezler' Mounier
f931469132 This does ¬ seem nececary anymore somehow 2020-03-06 18:08:18 +01:00
Patrick 'Quezler' Mounier
afdb0aa8c2 Fix sleep visualizer 2020-03-06 17:21:17 +01:00
Patrick 'Quezler' Mounier
73414d7c2a Collapse if 2020-03-06 14:59:12 +01:00
Patrick 'Quezler' Mounier
c1f025db52 Rename reload to cooldown 2020-03-06 14:57:11 +01:00
Patrick 'Quezler' Mounier
087aef6b85 Move capacity into crater 2020-03-06 11:06:35 +01:00
Patrick 'Quezler' Mounier
7ddcd93a57 Use extended position 2020-03-06 10:28:49 +01:00
Patrick 'Quezler' Mounier
caa25b811b Condense single use rotation 2020-03-06 10:22:37 +01:00
Patrick 'Quezler' Mounier
5a60ab1d2a Privatize drawer 2020-03-06 10:20:47 +01:00
Patrick 'Quezler' Mounier
8a25d57c83 This looks good to 2020-03-06 10:17:02 +01:00
Patrick 'Quezler' Mounier
c5de6706e0 Eyecandyfi 2020-03-06 10:14:52 +01:00
Patrick 'Quezler' Mounier
f50ee2ecf2 Try to clean up the end of tile logic 2020-03-06 09:52:28 +01:00
Patrick 'Quezler' Mounier
11fc494284 Clean up transfer code 2020-03-06 09:34:09 +01:00
Anuken
89a5c957fd add mod name to js print() (#1677) 
* add mod name to js print()

* add mod name to errors
 2020-03-05 15:58:10 -05:00
Patrick 'Quezler' Mounier
e05f755a4e Remove unused import 2020-03-05 21:30:18 +01:00
Patrick 'Quezler' Mounier
44bff5b7cf Remove conveyor integration remnants 2020-03-05 21:29:19 +01:00
Patrick 'Quezler' Mounier
e2b9977ebc Remove omnidirectional due to issues 2020-03-05 21:27:28 +01:00
Patrick 'Quezler' Mounier
3e51abf6eb Try to fix blending with omnidirectional 2020-03-05 21:24:51 +01:00
Patrick 'Quezler' Mounier
c1f765a467 Bodge in a rotational blend bypass 2020-03-05 20:26:34 +01:00