 Anuken
|
d035a3925b
|
arc
|
2020-11-02 16:49:46 -05:00 |
|
|
Anuken
|
304f5b62b3
|
Sprites repacked
|
2020-11-02 16:49:24 -05:00 |
|
|
Anuken
|
e853ed6419
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# core/src/mindustry/logic/LCanvas.java
|
2020-11-02 16:47:33 -05:00 |
|
|
Anuken
|
8f53d44278
|
Various fixes
|
2020-11-02 16:46:11 -05:00 |
|
 AnukenandGitHub
|
075b7d7dc6
|
Merge pull request #3225 from Voz-Duh/new-texture-for-blast-mixer
New Texture For Blast Mixer
|
2020-11-02 15:31:43 -05:00 |
|
|
AnukenandGitHub
|
f44cad4c08
|
Merge pull request #3230 from Quentinchampenois/translation/fr_keys
Translates few keys in french
|
2020-11-01 20:11:41 -05:00 |
|
|
AnukenandGitHub
|
9adb3af430
|
Merge pull request #3239 from DeltaNedas/logicerr
properly log logic build errors
|
2020-11-01 19:16:41 -05:00 |
|
|
AnukenandGitHub
|
082d157c86
|
Merge pull request #3236 from DeltaNedas/publiclogic
make logic stuff public and clean up
|
2020-11-01 15:18:36 -05:00 |
|
|
Anuken
|
a13f7f633e
|
Fixed serverside error
|
2020-11-01 10:42:16 -05:00 |
|
|
Anuken
|
d786c8668e
|
Fixed logic config() called in clients / JSON-compatible effects
|
2020-11-01 10:30:30 -05:00 |
|
|
Anuken
|
187cb79265
|
Fixed #3222 / Fixed #3218 / Fixed #3228 / Fixed #3217
|
2020-11-01 09:28:03 -05:00 |
|
|
Anuken
|
54ba4b31a1
|
Fixed casing eject effects
|
2020-10-31 20:19:24 -04:00 |
|
|
Anuken
|
b5e2812d0b
|
Bugfixes
|
2020-10-31 16:25:50 -04:00 |
|
|
Anuken
|
95c444a004
|
Merge remote-tracking branch 'origin/master'
|
2020-10-31 16:11:54 -04:00 |
|
|
Anuken
|
b1b03a7503
|
Extra legacy block substitution / iOS fixes
|
2020-10-31 16:11:51 -04:00 |
|
|
AnukenandGitHub
|
440c035367
|
Merge pull request #3215 from summetdev/groups/unit-factory
[QoL] Add Unit Factories to the Common Block Group.
|
2020-10-31 16:11:28 -04:00 |
|
|
Anuken
|
05dcd7622b
|
Campaign tweaks
|
2020-10-31 14:52:03 -04:00 |
|
|
Anuken
|
9c54fcee2e
|
Sector damage calculation fix
|
2020-10-31 13:42:43 -04:00 |
|
|
Anuken
|
4d34f16fcd
|
Merge remote-tracking branch 'origin/master'
|
2020-10-31 13:03:22 -04:00 |
|
|
Anuken
|
2079cfaece
|
Fixed #3208
|
2020-10-31 13:03:19 -04:00 |
|
|
AnukenandGitHub
|
df54fb0534
|
Merge pull request #3209 from summetdev/database-button
Show Core Database Button in Custom Game.
|
2020-10-31 12:57:45 -04:00 |
|
|
Anuken
|
04fcf06ad5
|
Merge remote-tracking branch 'origin/master'
|
2020-10-31 12:03:38 -04:00 |
|
|
Anuken
|
9af8b64046
|
#3191
|
2020-10-31 12:03:35 -04:00 |
|
|
AnukenandGitHub
|
dc1c132e03
|
Merge pull request #3207 from DeltaNedas/bullet
fix modded bullets
|
2020-10-31 11:56:35 -04:00 |
|
|
Anuken
|
13334451bf
|
arc
|
2020-10-31 11:01:49 -04:00 |
|
|
Anuken
|
d68ef73407
|
Fixed bloom resizing improperly
|
2020-10-31 11:01:39 -04:00 |
|
|
Anuken
|
8d6ea6b197
|
Correct team display on maps
|
2020-10-31 10:35:21 -04:00 |
|
|
Anuken
|
2c29a06eb5
|
Fixed #3206
|
2020-10-31 10:07:01 -04:00 |
|
|
Anuken
|
b75a03aed8
|
Fixed #3204
|
2020-10-31 09:56:35 -04:00 |
|
|
Anuken
|
583e286ada
|
Merge remote-tracking branch 'origin/master'
|
2020-10-31 09:01:10 -04:00 |
|
|
Anuken
|
42b8ece85a
|
Fixed #3200 / Fixed #3196 / Fixed #3198
|
2020-10-31 09:01:06 -04:00 |
|
|
AnukenandGitHub
|
82ee71013e
|
Merge pull request #3202 from TheEvilSkeleton/master
Make the Downloads section a bit more pretty
|
2020-10-31 08:55:03 -04:00 |
|
|
Anuken
|
4ec8e24bd8
|
Cleanup of merged PR
|
2020-10-30 19:03:05 -04:00 |
|
|
AnukenandGitHub
|
e02458122b
|
Merge pull request #2970 from genNAowl/ground-support-heal
Allow Ground Support Units to Heal Blocks
|
2020-10-30 18:52:04 -04:00 |
|
|
Anuken
|
181ad1016c
|
Reduced tech costs / Added missing blocks to fungal pass
|
2020-10-30 16:05:40 -04:00 |
|
|
Anuken
|
466183ffd0
|
Possibly more accurate wave linear regressions
|
2020-10-30 15:39:49 -04:00 |
|
|
Anuken
|
28240f730f
|
Don't show guardian warning when above win wave
|
2020-10-30 14:57:34 -04:00 |
|
|
Anuken
|
ed93fa45d3
|
Preset tweaks
|
2020-10-30 13:16:59 -04:00 |
|
|
Anuken
|
a12583eb4d
|
Campaign survival wave display tweaks
|
2020-10-30 12:54:24 -04:00 |
|
|
Anuken
|
76ff55d7f1
|
Campaign tweaks
|
2020-10-30 11:50:38 -04:00 |
|
|
Anuken
|
784a280bef
|
Merge remote-tracking branch 'origin/master'
|
2020-10-30 10:36:11 -04:00 |
|
|
Anuken
|
14869041b8
|
Cleanup
|
2020-10-30 10:36:07 -04:00 |
|
|
AnukenandGitHub
|
17fd3d0bc1
|
Merge pull request #3099 from skykatik/patch-2
Removing spaces at start and end of a message (trim)
|
2020-10-30 10:29:42 -04:00 |
|
|
AnukenandGitHub
|
968d94904a
|
Merge pull request #3058 from MEEPofFaith/speed-lightning
v5 Javelin Movement Lightning Ability
|
2020-10-30 09:40:21 -04:00 |
|
|
AnukenandGitHub
|
c8e5994b2f
|
Merge pull request #3174 from genNAowl/alternate-recalculation
Change "Alternate" calculation in Turret.java
|
2020-10-30 09:30:59 -04:00 |
|
|
AnukenandGitHub
|
d48f02ff4a
|
Merge pull request #3156 from summetdev/formatting
Lots Of Cleanup
|
2020-10-30 09:26:56 -04:00 |
|
|
AnukenandGitHub
|
73035b9211
|
Merge branch 'master' into formatting
|
2020-10-30 09:26:51 -04:00 |
|
|
Anuken
|
513ccfe581
|
Merge remote-tracking branch 'origin/master'
|
2020-10-30 09:24:09 -04:00 |
|
|
Anuken
|
782307374f
|
Fixed #3189 / Fixed #3187
|
2020-10-30 09:24:05 -04:00 |
|
|
AnukenandGitHub
|
c0d1ff0f08
|
Merge pull request #3192 from Voz-Duh/full-unit-in-menu
Full Unit In Menu
|
2020-10-30 09:21:58 -04:00 |
|
|
AnukenandGitHub
|
7cac70010e
|
Merge pull request #3188 from sk7725/patch-26
Field for LiquidTurrets that do not care about the fires around it
|
2020-10-30 09:17:40 -04:00 |
|
|
Anuken
|
a9f5aa9220
|
suffering
|
2020-10-29 19:58:10 -04:00 |
|
|
Anuken
|
150343b5f9
|
suffering
|
2020-10-29 19:33:07 -04:00 |
|
|
Anuken
|
ae35b2ff7e
|
arc
|
2020-10-29 19:04:37 -04:00 |
|
|
Anuken
|
1663497e6c
|
Better save validation
|
2020-10-29 19:03:58 -04:00 |
|
|
Anuken
|
cd6516786b
|
suffering
|
2020-10-29 16:07:01 -04:00 |
|
|
Anuken
|
c899cb6a93
|
suffering
|
2020-10-29 15:44:06 -04:00 |
|
|
Anuken
|
acc9a5aa9e
|
Merge remote-tracking branch 'origin/master'
|
2020-10-29 15:10:17 -04:00 |
|
|
Anuken
|
d7cdfbb02d
|
suffering
|
2020-10-29 15:10:09 -04:00 |
|
|
AnukenandGitHub
|
afed4c4239
|
Merge pull request #3184 from MEEPofFaith/any-layer-effects
Any Layer Effects
|
2020-10-29 13:58:55 -04:00 |
|
|
AnukenandGitHub
|
3eb655402f
|
Merge pull request #2978 from Volas171/patch-1
Update bundle_es.properties
|
2020-10-29 13:39:11 -04:00 |
|
|
Anuken
|
fc7887399f
|
suffering
|
2020-10-29 13:29:54 -04:00 |
|
|
Anuken
|
0c1c41efc0
|
Libs
|
2020-10-29 13:03:48 -04:00 |
|
|
Anuken
|
43937037db
|
Libs
|
2020-10-29 12:30:39 -04:00 |
|
|
Anuken
|
0c418d1a09
|
Libs
|
2020-10-29 11:51:17 -04:00 |
|
|
Anuken
|
2ad14cc884
|
Merge remote-tracking branch 'origin/master'
|
2020-10-29 10:26:35 -04:00 |
|
|
Anuken
|
77e6030c59
|
Fixed #3173
|
2020-10-29 10:26:32 -04:00 |
|
|
AnukenandGitHub
|
79624ff7cd
|
Merge pull request #3181 from sk7725/patch-23
Make LiquidTurret not need to have water as an ammo(bugfix)
|
2020-10-29 10:22:26 -04:00 |
|
|
Anuken
|
3dae157a5e
|
Extra validation
|
2020-10-28 19:35:15 -04:00 |
|
|
Anuken
|
55a7089a3d
|
Merge remote-tracking branch 'origin/master'
|
2020-10-28 18:51:49 -04:00 |
|
|
Anuken
|
44286cee59
|
Wave versions
|
2020-10-28 18:51:42 -04:00 |
|
|
AnukenandGitHub
|
89c35db811
|
Merge pull request #3168 from Yakuzet/patch-3
Update bundle_tr.properties
|
2020-10-28 16:40:10 -04:00 |
|
|
Anuken
|
68ab48a1d3
|
Fixed #3170
|
2020-10-28 14:05:09 -04:00 |
|
|
Anuken
|
e92d26b9e8
|
arc
|
2020-10-28 10:29:45 -04:00 |
|
|
Anuken
|
d77f1b4fc0
|
Merge remote-tracking branch 'origin/master'
|
2020-10-28 10:29:40 -04:00 |
|
|
Anuken
|
e1fefd1664
|
Updated RoboVM version
|
2020-10-28 10:29:32 -04:00 |
|
|
AnukenandGitHub
|
9e15434904
|
Merge pull request #3165 from summetdev/payload-group
Add transportation group to payload conveyors.
|
2020-10-28 09:53:02 -04:00 |
|
|
AnukenandGitHub
|
d539bc0b43
|
Merge pull request #3118 from summetdev/patch-7
Make run_server.sh executable.
|
2020-10-28 09:51:10 -04:00 |
|
|
Anuken
|
4940c277f6
|
Fixed #3166
|
2020-10-28 09:42:41 -04:00 |
|
|
Anuken
|
63e4bca098
|
Partial fix of editor multiblock undo/redo
|
2020-10-28 09:22:27 -04:00 |
|
|
Anuken
|
024f64678c
|
Merge remote-tracking branch 'origin/master'
|
2020-10-27 14:29:19 -04:00 |
|
|
Anuken
|
a31e182905
|
Fixed nodes not connecting to batteries when placed
|
2020-10-27 14:29:15 -04:00 |
|
|
AnukenandGitHub
|
c122aa85bf
|
Merge pull request #3155 from summetdev/processor-units
Hovering over a processor will show the unit it's controlling.
|
2020-10-27 13:42:37 -04:00 |
|
|
Anuken
|
5582a8bf1b
|
Fixed #3153 / Fixed #3152
|
2020-10-27 13:13:54 -04:00 |
|
|
Anuken
|
6eab4ebd1c
|
Fixed #3145 / Fixed #3144
|
2020-10-27 10:27:57 -04:00 |
|
|
Anuken
|
c0d0edfc89
|
Bugfixes & cleanup
|
2020-10-26 23:09:51 -04:00 |
|
|
Anuken
|
8d7f96bf00
|
Fixed #3140
|
2020-10-26 16:54:47 -04:00 |
|
|
Anuken
|
909da9de3c
|
Bugfixes
|
2020-10-26 16:06:50 -04:00 |
|
|
Anuken
|
73ca6eeb74
|
Fixed #3136
|
2020-10-26 13:38:27 -04:00 |
|
|
Anuken
|
8770bb2422
|
Fixed #3133 (probably) / Logic icon draw command
|
2020-10-26 13:31:32 -04:00 |
|
|
Anuken
|
a2181fec48
|
Merge remote-tracking branch 'origin/master'
|
2020-10-26 11:52:37 -04:00 |
|
|
Anuken
|
db5298e40c
|
Headless cleanup
|
2020-10-26 11:52:33 -04:00 |
|
|
AnukenandGitHub
|
0b7c8bdcd8
|
Merge pull request #3129 from DeltaNedas/patch-12
minor serverside optimisation in roomba
|
2020-10-26 11:19:22 -04:00 |
|
|
Anuken
|
f814fa861c
|
Merge remote-tracking branch 'origin/master'
|
2020-10-26 10:07:38 -04:00 |
|
|
Anuken
|
7370e398cc
|
#3125
|
2020-10-26 10:07:33 -04:00 |
|
|
AnukenandGitHub
|
ca572163d4
|
Merge pull request #3115 from YellOw139/patch-5
Add Vietnamese characters to font.woff
|
2020-10-26 10:00:41 -04:00 |
|
|
Anuken
|
78afbb3e95
|
Merge remote-tracking branch 'origin/master'
|
2020-10-26 09:57:04 -04:00 |
|
|
Anuken
|
23b9556105
|
#3121
|
2020-10-26 09:56:56 -04:00 |
|
|
AnukenandGitHub
|
ad080036c2
|
Merge pull request #3120 from genNAowl/source/void-replacements
Give Sources/Voids BlockGroups
|
2020-10-26 09:51:09 -04:00 |
|
|
Anuken
|
526b1add26
|
Unused bullet cleanup
|
2020-10-25 20:04:14 -04:00 |
|