Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,934 Commits 4 Branches 180 Tags
1d24dd6d4d04ff3d9cecb83703536f3b1a1c19cc
Commit Graph

6804 Commits

Author SHA1 Message Date
Anuken
2e42526e90 Fixed up Discord RPC 2020-06-16 14:13:43 -04:00
Anuken
918c9492df Changing discord RPC system 2020-06-16 13:43:00 -04:00
Anuken
6e162d91e5 Fixed #2169 2020-06-16 10:08:33 -04:00
Anuken
1eaa1a05ac Switched to rhino fork 2020-06-15 23:22:14 -04:00
Anuken
caea5c7df2 Cleanup 2020-06-15 21:52:51 -04:00
Anuken
b789394efc TextField fixes 2020-06-15 19:26:03 -04:00
Anuken
89aec3ac51 Cleanup 2020-06-15 18:35:21 -04:00
Anuken
405d6cf33f Per-team infinite building resources 2020-06-15 15:33:14 -04:00
Math2128
cecfe77e95 Update bundle_fr.properties 
Translated new stuffs + fixed two mistakes.
 2020-06-15 15:06:42 -04:00
Anuken
7001ad09cb Support for team-only lighting 2020-06-15 13:54:02 -04:00
Anuken
b5660a50ca Certain team-specific rules 2020-06-15 12:00:32 -04:00
Anuken
90b0650af9 Merge remote-tracking branch 'origin/master' 2020-06-15 09:58:54 -04:00
Anuken
d04ce2a750 Block damage multiplier rule 2020-06-15 09:58:46 -04:00
Cyberman
3dfad51e93 Update bundle_nl.properties 
Just a few things I had time for.
 2020-06-15 15:49:10 +02:00
ILiekMelons
dbe482d494 Fixed disassembler and overdrive projector (#2163) 
I misspelt disassembler and forgot to put a .name somewhere 😅
 2020-06-15 09:44:38 -04:00
Math2128
db77cfa3b5 Update bundle_fr.properties 
added the new stuff from the main bundle + fixed a typo
 2020-06-15 02:02:04 -04:00
Math2128
ac14f43107 Update bundle_fr.properties 
1125
 2020-06-14 20:45:10 -04:00
ILiekMelons
2a7da8c80e Add names for new drones and machines (#2162) 
* Add in names for drone-related things

* Various machines added

* extra newline that i removed
 2020-06-14 20:43:25 -04:00
Math2128
baa0d5a951 Update bundle_fr.properties 
1030
 2020-06-14 18:46:32 -04:00
Anuken
5f79040faa Testing doc script 2020-06-14 18:41:42 -04:00
Anuken
126b54b981 Better built-in shuffle 2020-06-14 14:50:04 -04:00
Math2128
9e105dbce5 Update bundle_fr.properties 
971
 2020-06-14 14:13:15 -04:00
Anuken
5370874686 Client debug info 2020-06-14 11:21:50 -04:00
Anuken
1823bc8f15 Support for compiling on Java 14 2020-06-14 11:10:54 -04:00
Math2128
a7a31f6c35 Update bundle_fr.properties 
837
 2020-06-14 00:33:57 -04:00
Anuken
b4573861a8 h i g h precision shaders 
(I shouldn't need to do this)
 2020-06-13 20:58:41 -04:00
Anuken
1f48daa4ed arc 2020-06-13 18:20:37 -04:00
Anuken
f365d8519b Reconstructor fixes 2020-06-13 18:20:10 -04:00
Anuken
c74d2f8cf2 Merge remote-tracking branch 'origin/master' 2020-06-13 16:27:22 -04:00
Anuken
b48736e771 Reconstructor sprites / Bugfixes 2020-06-13 16:27:15 -04:00
Summet
26f0a627d5 Unnecessary Draw.z (#2160) 2020-06-13 15:19:27 -04:00
Anuken
f55fb48ea7 Slightly higher contrast black palette 2020-06-13 12:24:50 -04:00
Anuken
186ae4e2a2 why 2020-06-13 12:13:57 -04:00
Anuken
fef4882c15 Turbine generator tweaks 2020-06-13 12:08:03 -04:00
Anuken
8769b9bf0e CI test 2020-06-13 10:41:59 -04:00
Anuken
bb7da46301 Merge remote-tracking branch 'origin/master' 2020-06-13 10:33:26 -04:00
Anuken
3b3a1dd496 Editor map fix / Crafter renderer system 2020-06-13 10:33:19 -04:00
DeltaNedas
e025f94200 make FPS/Ping and position untouchable (#2159) 2020-06-12 21:32:19 -04:00
Anuken
27522ae494 Icon generation improvements 2020-06-12 19:41:06 -04:00
Anuken
2bd3bc0e13 Reconstructor fixes 2020-06-12 18:41:35 -04:00
Anuken
d85a7338ea Batch cleanup 2020-06-12 17:20:50 -04:00
Anuken
a47e300297 Cleanup 2020-06-12 14:57:57 -04:00
Anuken
a76cb3cb1a Scrapped reaper segments 2020-06-12 13:32:00 -04:00
Anuken
ce9f515543 Fallback atlas / Bugfixes / Cleanup 2020-06-11 15:25:46 -04:00
Anuken
1e954dc2be Cleanup 2020-06-11 14:09:06 -04:00
Anuken
e247b092dc cleaning up mistakes 2020-06-11 13:42:22 -04:00
Anuken
732769524c 🔥🔥🔥 2020-06-11 12:03:27 -04:00
Math2128
917db20e76 Update bundle_fr.properties 2020-06-10 23:10:00 -04:00
Anuken
2a9008f042 Transition to Framebuffer#blit 2020-06-10 21:07:21 -04:00
Math2128
c5df9aa814 Update bundle_fr.properties 
Ligne 644: Le jeu ne se met pas en pause pendant que l'on construit, même avec cette option de cocher. En fait, cela met la construction sur pause et attend que l'on appuie sur la touche E (par défaut) pour confirmer la construction. Je trouvais l'ancien nom assez trompeur, et je l'ai donc changer comme cela. 

I'm at line 762
 2020-06-10 19:20:31 -04:00