mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-03 12:53:48 +07:00
Code Issues Packages Projects Releases Wiki Activity
15,876 Commits 4 Branches 160 Tags 2.3 GiB
f400ccc66a
Commit Graph

13444 Commits

Author SHA1 Message Date
Anuken
d9729612e2 Cheaper research for Erekir 2022-10-29 09:40:06 -04:00
Anuken
959e0ad8a8 More difficult 'waves' for Origin 2022-10-28 18:24:17 -04:00
Anuken
f6ee087044 More difficult 'waves' for Origin 2022-10-28 18:22:54 -04:00
The Serjio
7d6fff1e37
Tiny romanian translation fix (#7781) 
Changed (0) to {0}
 2022-10-28 17:38:18 -04:00
Epowerj
4eb2314fae Added origin to campaign 2022-10-28 16:30:46 -04:00
Anuken
42d929f32d Origin testing 2022-10-28 16:15:09 -04:00
Epowerj
0b9da88ebf Merge remote-tracking branch 'origin/master' 2022-10-28 15:24:54 -04:00
Epowerj
47eb34e842 Work on origin 2022-10-28 15:24:48 -04:00
Anuken
52578b2275 Merge remote-tracking branch 'origin/master' 2022-10-28 15:13:56 -04:00
Anuken
b9892335d4 Misc balance, tweaks, configuration... 2022-10-28 15:13:52 -04:00
Epowerj
9cec0227ab Work on origin 2022-10-27 15:55:56 -04:00
Anuken
cc79568cbd Merge remote-tracking branch 'origin/master' 2022-10-27 10:30:32 -04:00
Anuken
c8ebe0cd87 Packet rate limit 2022-10-27 10:30:28 -04:00
MEEPofFaith
b25820eed7
fragOnAbsorb (#7771) 2022-10-26 20:14:34 -04:00
Anuken
be437d63d5 Merge remote-tracking branch 'origin/master' 2022-10-26 18:06:45 -04:00
Anuken
d3c2832406 Tech tree tweaks 2022-10-26 18:06:40 -04:00
Github Actions
e9460c383e Automatic bundle update 2022-10-26 20:27:49 +00:00
Anuken
ba10fc252c Moved Payload Propulsion Tower to Erekir 2022-10-26 16:26:12 -04:00
Anuken
6566bf9dd5 How 2022-10-26 15:52:51 -04:00
Anuken
4a7231fb5a Merge remote-tracking branch 'origin/master' 2022-10-26 14:26:20 -04:00
Anuken
661b2124cd Increased Karst wave spacing 2022-10-26 14:26:14 -04:00
Epowerj
2f31b20931 Work on origin 2022-10-26 13:54:39 -04:00
Anuken
5f8cdb3bff Merge remote-tracking branch 'origin/master' 2022-10-26 09:53:57 -04:00
Anuken
4e856bee90 Misc balance / Fixed cross-planet sector 'lock' 2022-10-26 09:53:51 -04:00
Epowerj
7c35fccc14 Renamed the last to origin 2022-10-26 01:52:49 -04:00
Anuken
cc4ea7af5e Merge remote-tracking branch 'origin/master' 2022-10-25 21:54:33 -04:00
Anuken
ac44ef5b96 Misc balance / Fixed unobtainable achievement 2022-10-25 21:54:28 -04:00
Mechanical fish
86d4950912
Map for campaign (#7762) 
* Add files via upload

* Delete Karst[8]v2.msav

* Map for campaign
 2022-10-25 08:11:06 -04:00
Cryofluid
19d038facb
Update UnitTypes.java (#7763) 2022-10-25 08:10:53 -04:00
Anuken
ac32b0a1e0 Fixed #7760 2022-10-24 12:50:34 -04:00
Anuken
8c78f37566 More tweaks to Karst / Default player limit of 30 2022-10-24 10:59:10 -04:00
Anuken
1796f25482 More difficult waves for Karst 2022-10-24 09:45:32 -04:00
Epowerj
ea6f666a80 Work on karst 2022-10-23 19:15:56 -04:00
Anuken
0804146b94 Karst wave tweaks 2022-10-23 18:36:52 -04:00
Epowerj
d31489041f Work on karst 2022-10-23 18:14:36 -04:00
Epowerj
9af0137f1d Tweaks to stronghold 2022-10-23 17:57:52 -04:00
Epowerj
f214da0479 Work on karst 2022-10-23 17:48:13 -04:00
Anuken
d352a96f55 Untested modifications to karst map 2022-10-23 14:29:35 -04:00
Anuken
e624993ab1 Hide blocks outside map border from attack/hovering 2022-10-23 13:06:53 -04:00
Anuken
c3324cd04c Merge remote-tracking branch 'origin/master' 2022-10-23 11:30:46 -04:00
Anuken
d06eea2466 Fixed beam drill lasers not pulsing sometimes 2022-10-23 11:30:42 -04:00
Github Actions
1bae0ea96a Automatic bundle update 2022-10-23 15:25:52 +00:00
Anuken
a33c482ead Fixed #7755 2022-10-23 11:25:00 -04:00
Anuken
c8fb0659d4 Misc requirement tweaks 2022-10-23 10:30:34 -04:00
Anuken
2ba4a3991b Merge remote-tracking branch 'origin/master' 2022-10-23 08:43:17 -04:00
Anuken
514f50a411 Fixed #7752 2022-10-23 08:43:12 -04:00
MEEPofFaith
860fc888c4
Draw armor region under armor shader (#7751) 2022-10-22 17:45:10 -04:00
Anuken
43b4dc321c Building target discovered check 2022-10-22 11:06:08 -04:00
Anuken
0fd6de8cb0 Fixed #7747 2022-10-21 23:18:06 -04:00
Anuken
989848ead5 Crossroads higher attack weight 2022-10-21 18:35:56 -04:00
Anuken
6984912680 Merge remote-tracking branch 'origin/master' 2022-10-21 18:29:33 -04:00
Anuken
7331704a13 Misc RTS AI intelligence fixes 2022-10-21 18:29:29 -04:00
Epowerj
682187946e Merge remote-tracking branch 'origin/master' 2022-10-21 17:30:19 -04:00
Anuken
46e5f55e9c aaaa 2022-10-21 17:30:10 -04:00
Epowerj
5132b17a83 Tweaks to crossroads 2022-10-21 17:29:51 -04:00
Anuken
4dd4396445 Made RTS AI target drills too 2022-10-21 17:27:28 -04:00
Anuken
52b1372324 Misc minor fixes & cost balance 2022-10-21 17:24:10 -04:00
Anuken
a137a9a1da Cheaper carbide research 2022-10-21 16:07:15 -04:00
Anuken
0d2ab11965 Added chat :emoji: support on desktop 2022-10-21 10:06:57 -04:00
Anuken
465bf40aa7 Merge remote-tracking branch 'origin/master' 2022-10-21 08:49:09 -04:00
Anuken
127ee1a87e Prevent achievements from completing with dev console open 2022-10-21 08:49:04 -04:00
Github Actions
2e42d19913 Automatic bundle update 2022-10-21 00:35:46 +00:00
Anuken
f8174eac53 Merge remote-tracking branch 'origin/master' 2022-10-20 20:01:48 -04:00
Anuken
55bc0846ae Better mod state errors 2022-10-20 20:01:43 -04:00
Github Actions
1c951422dc Automatic bundle update 2022-10-20 23:14:31 +00:00
Anuken
f3a5c149a6 Merge remote-tracking branch 'origin/master' 2022-10-20 19:13:46 -04:00
Anuken
7409ff7fd8 Blacklisted ui-lib (startup crash) 2022-10-20 19:13:39 -04:00
Epowerj
1d19581cef Tweaks to crossroads 2022-10-20 18:29:28 -04:00
Epowerj
fbe15347c0 Tweaks to crossroads 2022-10-20 18:23:03 -04:00
Даркнесс#3729
abdc3ee33c
isBanned() check on canCreate() (#7745) 2022-10-20 15:31:06 -04:00
Anuken
b10a146cd9 Achievement finalizations 2022-10-20 13:53:07 -04:00
Anuken
3ffea4061e Merge remote-tracking branch 'origin/master' 2022-10-20 09:33:19 -04:00
Anuken
52ac26b56c Do not display missile units on hover 2022-10-20 09:33:15 -04:00
Epowerj
46d6c4e40a Fixed siege starting base 2022-10-20 01:13:39 -04:00
Anuken
db09fa5932 Merge remote-tracking branch 'origin/master' 2022-10-20 00:56:15 -04:00
Anuken
cc7fefc9e2 Cheaper Erekir cores 2022-10-20 00:56:11 -04:00
Epowerj
837b66b839 Merge remote-tracking branch 'origin/master' 2022-10-19 22:35:57 -04:00
Anuken
c38a8c3ef4 Pyrolysis generator arkycite use tweak 2022-10-19 22:35:35 -04:00
Epowerj
b284ed54e8 Tweaked siege 2022-10-19 22:35:31 -04:00
Epowerj
7ddcdaec66 Tweaked siege 2022-10-19 21:42:21 -04:00
Anuken
e8c74319af Decreased acropolis cost 2022-10-19 21:10:51 -04:00
Epowerj
fc53d23706 Added capture wave to karst 2022-10-19 21:09:35 -04:00
Epowerj
c7ef42cad4 Changed acropolis core on tech tree 2022-10-19 17:54:21 -04:00
Anuken
3dd5c128cd Merge remote-tracking branch 'origin/master' 2022-10-19 17:42:31 -04:00
Anuken
010b1eadf0 Misc bugfixes 2022-10-19 17:42:26 -04:00
Epowerj
7ab538fac9 Tweaked pyrolysis research cost 2022-10-19 17:40:04 -04:00
Anuken
5dfecd3ea2 Merge remote-tracking branch 'origin/master' 2022-10-19 15:13:30 -04:00
Anuken
d7547d2e68 Minor unit balance / Cleanup 2022-10-19 15:13:26 -04:00
Epowerj
e2bfd43de8 Increased timers on siege 2022-10-19 14:56:31 -04:00
Epowerj
66524fb615 Fixed crossroads scripting typo 2022-10-19 14:25:16 -04:00
Anuken
5337e3e171 Merge remote-tracking branch 'origin/master' 2022-10-18 23:44:13 -04:00
Anuken
d2b12a1f31 Hint tweaks / Neoplasm in tech tree 2022-10-18 23:44:08 -04:00
Epowerj
37833eccd4 Fixed crossroads sector 2022-10-18 23:31:25 -04:00
Github Actions
1489095267 Automatic bundle update 2022-10-19 02:49:08 +00:00
Epowerj
634ece405f Added karst and crossroads to campaign 2022-10-18 22:48:15 -04:00
Epowerj
95abcddbc6 Progress on crossroads 2022-10-18 21:56:28 -04:00
Anuken
1ea89190d4 Merge remote-tracking branch 'origin/master' 2022-10-18 12:56:12 -04:00
Anuken
769c0782f4 Bundle planet description fix 2022-10-18 12:56:07 -04:00
Angel-24
908842f556
Update bundle_es.properties (#7686) 
* Update bundle_es.properties

* Update bundle_es.properties

Naii-the-Baf and Uriel's reviews.
 2022-10-18 10:28:27 -04:00
Anuken
64d5805bc2 Crossroads starting water fix 2022-10-18 09:38:14 -04:00
Anuken
1dd001e137 Merge remote-tracking branch 'origin/master' 2022-10-18 09:26:49 -04:00
Anuken
e6de58fbdc Fixed #7738 2022-10-18 09:26:44 -04:00
Epowerj
ca2973936d Progress on crossroads 2022-10-17 19:42:48 -04:00
Epowerj
0d86cc3f97 Progress on crossroads 2022-10-17 18:32:00 -04:00
Anuken
326002c338 Tank assembler cyanogen requirement 2022-10-17 16:33:10 -04:00
Anuken
b5c730b18d Fixed #7735 2022-10-16 21:51:39 -04:00
Anuken
d644cbd93e Fixed #7733 2022-10-16 21:47:22 -04:00
Anuken
215633587d Fixed #7728 2022-10-16 08:44:08 -04:00
Anuken
1ef1aeaaf3 Merge remote-tracking branch 'origin/master' 2022-10-15 18:02:20 -04:00
Anuken
431dc4fe75 Fixed #7725 2022-10-15 18:02:14 -04:00
Github Actions
dee897c6a8 Automatic bundle update 2022-10-15 21:14:11 +00:00
Anuken
b0713721c0 Merge remote-tracking branch 'origin/master' 2022-10-15 17:13:25 -04:00
Anuken
4fa0c55b75 Ground Zero turret supply objective 2022-10-15 17:13:20 -04:00
Epowerj
8fdb3ab540 Tweaks to crossroads 2022-10-15 17:04:34 -04:00
Anuken
e19af8cc98 Fixed map shift field limiting to 3 characters 2022-10-15 16:30:47 -04:00
Anuken
17d527ab05 Merge remote-tracking branch 'origin/master' 2022-10-15 09:41:48 -04:00
Anuken
83ed26a271 Fixed #7719 2022-10-15 09:41:43 -04:00
Epowerj
8a2e7af49e Progress on crossroads 2022-10-14 19:54:27 -04:00
Epowerj
42aafdaf17 Tweaks to karst 2022-10-14 15:09:04 -04:00
Epowerj
6849557300 Renamed karst map file 2022-10-14 14:50:27 -04:00
Anuken
bf6f933686 Merge remote-tracking branch 'origin/master' 2022-10-14 11:54:34 -04:00
Anuken
5a4a6ff003 Fixed #7713 2022-10-14 11:54:30 -04:00
Catchears
7b9e188186
hide world processors in ground zero (#7711) 2022-10-14 07:06:52 -04:00
Anuken
96c996d955 Merge remote-tracking branch 'origin/master' 2022-10-14 07:00:30 -04:00
Anuken
2e684863d5 Fixed #7710 2022-10-14 07:00:26 -04:00
Mechanical fish
bfb92fd859
Add files via upload (#7709) 2022-10-14 06:50:28 -04:00
Anuken
ad76a90683 Fixed #7707 2022-10-13 21:49:41 -04:00
Anuken
291648c8a8 Merge remote-tracking branch 'origin/master' 2022-10-13 16:53:30 -04:00
Anuken
d87c381021 Fixed #7705 2022-10-13 16:53:25 -04:00
Epowerj
fa06b6bda8 Work on crossroads 2022-10-13 16:14:46 -04:00
Epowerj
e804efdf52 Work on crossroads 2022-10-13 14:21:09 -04:00
BalaM314
d6fc4bfdb1
Add Drill.drillEffectChance (for very fast drills) (#7704) 2022-10-13 13:12:03 -04:00
FlippingPotatoes
0ca33477d8
Expand getBlock functionality (#7702) 
* Update LExecutor.java

* Update LUnitControl.java

* Update LExecutor.java

* Update LExecutor.java

* Update LExecutor.java

* Update LExecutor.java

* Update bundle.properties

* Update bundle.properties

* Update bundle.properties

* Update LExecutor.java
 2022-10-13 10:13:17 -04:00
Github Actions
2be787f810 Automatic bundle update 2022-10-13 11:47:26 +00:00
Catchears
e3d1a04626
remove unused entry (#7703) 2022-10-13 07:46:33 -04:00
Epowerj
31212e6e46 Begin work on crossroads 2022-10-12 21:22:27 -04:00
Даркнесс#3729
61e9ffb7e8
Fix WorldReloader (#7701) 
* Fix WorldReloader

* horrible if

* Update WorldReloader.java

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-10-12 09:50:07 -04:00
MEEPofFaith
201ce276cd
Diodes can work on the wrong tream (#7698) 
* Diodes can work on the wrong tream

* Don't need that check anymore
 2022-10-12 07:57:08 -04:00
Anuken
6def8f5281 Merge remote-tracking branch 'origin/master' 2022-10-11 17:03:58 -04:00
Anuken
1f2ae18b23 Unlock defaults for older campaign saves 2022-10-11 17:03:54 -04:00
Epowerj
363b3f276d Tweaked siege 2022-10-11 16:17:50 -04:00
Epowerj
1b603af6bd Tweaked siege 2022-10-11 16:13:23 -04:00
Epowerj
79615000e0 Tweaked siege 2022-10-11 14:45:25 -04:00
Anuken
8bd8fc5d80 Misc UI tweaks + fixed tests 2022-10-10 21:27:11 -04:00
Epowerj
a21d908834 Tweaked siege rules 2022-10-10 21:22:50 -04:00
Anuken
8b56646809 Merge remote-tracking branch 'origin/master' 2022-10-10 19:23:18 -04:00
Anuken
2b62ab6b2f Fixed #7690 2022-10-10 19:23:13 -04:00
Github Actions
a21319dcf4 Automatic bundle update 2022-10-10 23:20:35 +00:00
Anuken
dea70e9d71 Merge remote-tracking branch 'origin/master' 2022-10-10 19:19:44 -04:00
Anuken
44aa9d0bda Moved Onset tutorial into bundle 2022-10-10 19:19:40 -04:00
Github Actions
b0dfc0664c Automatic bundle update 2022-10-10 23:06:22 +00:00
Anuken
a85bbaa5b3 Merge remote-tracking branch 'origin/master' 2022-10-10 19:05:29 -04:00
Anuken
8104173b31 Ground zero tutorial from #7532 2022-10-10 19:05:23 -04:00
Epowerj
61a2fd3439 Tweaked siege rules 2022-10-10 17:48:18 -04:00
Anuken
026ffdc36f Merge remote-tracking branch 'origin/master' 2022-10-10 17:34:05 -04:00
Anuken
35af2f4b9a Fixed items clipping into each other on conveyors 2022-10-10 17:34:00 -04:00
Github Actions
b67f4e04a2 Automatic bundle update 2022-10-10 21:33:10 +00:00
Epowerj
2eb3e5e034 Added siege to campaign 2022-10-10 17:31:58 -04:00
Epowerj
101ba6de0f Work on siege 2022-10-10 16:43:18 -04:00
Epowerj
3f0877d022 Work on siege 2022-10-10 14:44:56 -04:00
Anuken
8edc7b3255 No menu dialog tint 2022-10-10 10:47:57 -04:00
Anuken
7f51ddf425 Merge remote-tracking branch 'origin/master' 2022-10-10 08:58:53 -04:00
Anuken
357d46a425 Map objective canvas bounds reworked 2022-10-10 08:58:49 -04:00
Github Actions
8ca31aa973 Automatic bundle update 2022-10-10 12:00:44 +00:00
Anuken
755498394d Merge remote-tracking branch 'origin/master' 2022-10-10 07:59:52 -04:00
Anuken
fd849494cc Fixed #7685 2022-10-10 07:59:47 -04:00
Epowerj
bfebe890b6 Work on siege 2022-10-09 19:47:57 -04:00
Anuken
4201106843 New WIP achievement definitions 2022-10-09 17:47:12 -04:00
Anuken
dfdb4c1c1f Moved siege map to correct folder 2022-10-09 16:31:47 -04:00
OSP
6ec2537de1
Update NetServer.java (#7683) 2022-10-09 12:13:05 -04:00
Anuken
84ff0649a2 Fixed #7680 2022-10-09 10:18:14 -04:00
Anuken
2bccb1bad7 Merge remote-tracking branch 'origin/master' 2022-10-08 16:29:33 -04:00
Anuken
308219b68b Fixed #7677 2022-10-08 16:29:29 -04:00
Joan Josep
f1bf6e5e43
Update bundle_ca.properties (#7676) 2022-10-08 07:53:31 -04:00
Anuken
719a2f1419 Merge remote-tracking branch 'origin/master' 2022-10-08 07:50:26 -04:00
Anuken
09f5439c33 Fixed #7675 2022-10-08 07:50:21 -04:00
Github Actions
72b408158d Automatic bundle update 2022-10-08 00:25:32 +00:00
Epowerj
4446be612f Added crevice to campaign 2022-10-07 20:24:38 -04:00
Epowerj
09a081f44d progress on crevice 2022-10-07 19:46:49 -04:00
Epowerj
9a6ee50925 Merge remote-tracking branch 'origin/master' 2022-10-07 19:17:43 -04:00
Epowerj
13916acfce progress on crevice 2022-10-07 19:17:19 -04:00
ThatOneBepis
e9cdbf39a1
Update bundle_sr.properties (#7673) 2022-10-07 17:56:20 -04:00
Anuken
5317a81a92 Merge remote-tracking branch 'origin/master' 2022-10-07 13:41:18 -04:00
Anuken
6f1685c34d Onset extra hints 2022-10-07 13:41:13 -04:00
Nunting
2ac689aacc
Update bundle_ko.properties (#7672) 2022-10-07 11:57:49 -04:00
MEEPofFaith
e38013862b
Do not display duration for reactive statuses (#7669) 2022-10-07 07:54:01 -04:00
Mythril382
0b128e5bca
add some useful math stuff to GlobalVars (#7670) 
* VlobalGars

* E
 2022-10-07 07:49:00 -04:00
Epowerj
fb1e56a944 progress on crevice 2022-10-06 22:22:22 -04:00
Epowerj
1eb2298e3a Added wip crevice 2022-10-06 19:33:26 -04:00
Github Actions
35f4219e17 Automatic bundle update 2022-10-06 18:19:14 +00:00
Anuken
ae8f1fa5b1 Merge remote-tracking branch 'origin/master' 2022-10-06 14:18:00 -04:00
Anuken
b69cf34494 Rule cleanup/clarification 2022-10-06 14:17:55 -04:00
Github Actions
e724f025af Automatic bundle update 2022-10-06 18:15:40 +00:00
MEEPofFaith
a7c7238cc8
Whitelist Option + Hiding Banned Blocks Rules (#7553) 
* Whitelist Option

* Hide banned blocks rule
 2022-10-06 14:14:48 -04:00
Anuken
4ac3eb1c9a Fixed RTS AI targeting unreachable things 2022-10-06 14:03:57 -04:00
Anuken
718cf72912 Fixed 'core under attack' not showing up on servers 2022-10-05 13:17:39 -04:00
Anuken
5ea9c0c8dc Merge remote-tracking branch 'origin/master' 2022-10-05 06:06:40 -04:00
Anuken
f1b1009728 Made canvas block require beryllium 2022-10-05 06:06:35 -04:00
MEEPofFaith
dc060d2ce9
Deja Vu (#7662) 
I feel like this has been a problem before.
Deeper in the code.
 2022-10-05 05:47:28 -04:00
MEEPofFaith
44b73d4c13
Load bullet part regions (#7663) 
* Load bullet part regions

* Unnecessary, just use name in the part
 2022-10-05 05:47:09 -04:00
Anuken
5e6d40d6cc Heat router requirement tweak 2022-10-04 17:36:02 -04:00
Anuken
2149580aaa actually I'll just remove it and see who complains 2022-10-04 16:43:12 -04:00
Anuken
4e9c0df519 Merge remote-tracking branch 'origin/master' 2022-10-04 16:42:29 -04:00
Anuken
39e59103a5 Disable ammo rule on Erekir 2022-10-04 16:42:22 -04:00
Github Actions
e71c76956c Automatic bundle update 2022-10-04 20:19:13 +00:00
Angel-24
3c5f05d5df
Update bundle_es.properties (#7491) 
Co-authored-by: Anuken <arnukren@gmail.com>
 2022-10-04 16:18:28 -04:00
Github Actions
a2c73a748e Automatic bundle update 2022-10-04 20:13:38 +00:00
JniTrRny
ceba055406
Update bundle_th.properties (#7200) 
Co-authored-by: Anuken <arnukren@gmail.com>
 2022-10-04 16:12:40 -04:00
Anuken
b81378922d Merge remote-tracking branch 'origin/master' 2022-10-04 16:11:01 -04:00
Anuken
e13fcc5a5f Better #7650 2022-10-04 16:10:57 -04:00
xStaBUx
a6951dc6fb
Better AboutDialog (#7658) 2022-10-04 16:08:39 -04:00
Anuken
ca4f710ec2 Bullet parts / Improved clipping in #7282 2022-10-04 15:58:40 -04:00
hortiSquash
f2894ff38d
smaller MirrorFilter in map editor (#7282) 
made the slider increment go from 45° to 15°
fixed the line preview clipping so it doesnt go outside the box
 2022-10-04 15:52:23 -04:00
MEEPofFaith
cac946b0e1
protected trail values (#7656) 2022-10-04 15:28:17 -04:00
Github Actions
8f404869b2 Automatic bundle update 2022-10-04 17:08:35 +00:00
Anuken
c8e59ecfeb Merge remote-tracking branch 'origin/master' 2022-10-04 13:07:28 -04:00
Anuken
88d6c4c8f9 Full implementation of #7014 2022-10-04 13:07:23 -04:00
Github Actions
0dcec3366b Automatic bundle update 2022-10-04 16:07:07 +00:00
Anuken
e661abaf24 Merge remote-tracking branch 'origin/master' 2022-10-04 12:06:05 -04:00
Anuken
be5eac5335 Implementation of #7325 2022-10-04 12:06:00 -04:00
Mythril382
9ffbba204f
unplayable (#7657) 2022-10-04 07:55:16 -04:00
Anuken
12e5dbf287 Merge remote-tracking branch 'origin/master' 2022-10-03 22:23:52 -04:00
Anuken
49b789fc39 Allow mixtech in sandbox / Beta release tag 2022-10-03 22:23:46 -04:00
BF 109 F-4
4a018a7b88
Add files via upload (#7636) 2022-10-03 18:30:32 -04:00
Anuken
3684dfcf0a Merge remote-tracking branch 'origin/master' 2022-10-03 18:01:27 -04:00
Anuken
bd7a8ff02a Misc bugfixes & balancing 2022-10-03 18:01:23 -04:00
WayZer
d709000a5b
remove select when other player command (#7522) 2022-10-03 17:50:25 -04:00
Anuken
eb1192cdbe Fixed map rule loadouts not applying on Erekir 2022-10-03 16:05:17 -04:00
Dexapnow
975384d3b1
Add files via upload (#7652) 2022-10-03 09:15:46 -04:00
Anuken
48ce73b517 Fixed #7651 2022-10-03 07:24:03 -04:00
Anuken
5c2237c745 Merge remote-tracking branch 'origin/master' 2022-10-02 22:08:58 -04:00
Anuken
cc3c358cc2 Misc cleanup 2022-10-02 22:08:54 -04:00
Github Actions
645b5ecdd8 Automatic bundle update 2022-10-02 13:34:02 +00:00
TheMC2005
8a382a1715
Update bundle_hu.properties (#4908) 2022-10-02 09:33:15 -04:00
Semetrix
5af6751646
Update bundle_hu.properties (#5637) 
Co-authored-by: Anuken <arnukren@gmail.com>
 2022-10-02 09:32:43 -04:00
Anuken
27848bbc9f Merge remote-tracking branch 'origin/master' 2022-10-01 23:22:50 -04:00
Anuken
141828f36d Merged in buthed's power node tweaks 2022-10-01 23:22:46 -04:00
ManuWar73
d5c7ab74e3
10 minutes of translating... (#7474) 2022-10-01 23:06:46 -04:00
Anuken
73f698f4c5 Merge remote-tracking branch 'origin/master' 2022-10-01 20:55:35 -04:00
Anuken
2822764698 Test fixes 2022-10-01 20:55:30 -04:00
Epowerj
b8b534cffd Tweaked stronghold 2022-10-01 20:40:39 -04:00
Anuken
9d4ca4e8ae More campaign-related tweaks 2022-10-01 20:34:42 -04:00
Anuken
31f3dc5514 Misc tweaks & balancing 2022-10-01 20:31:54 -04:00
Anuken
e66ac1a6f7 Fixed wrong landing core 2022-10-01 19:19:13 -04:00
Anuken
3d456672b5 Merge remote-tracking branch 'origin/master' 2022-10-01 18:03:51 -04:00
Anuken
48f143a530 Implemented #6493 2022-10-01 18:03:47 -04:00
Zelaux
5863f2f353
Added scroll pane for server menu (#6451) 
* Added scroll pane for server menu

* Fixed title problems in menus

* Removed useless import
 2022-10-01 17:48:33 -04:00
MEEPofFaith
2e98abc86e
Player-only weapons (#6010) 
Co-authored-by: Anuken <arnukren@gmail.com>
 2022-10-01 17:42:57 -04:00
Anuken
f89e69b2f6 #7151 2022-10-01 17:39:21 -04:00
Anuken
c4a92aba38 Merge remote-tracking branch 'origin/master' 2022-10-01 16:07:00 -04:00