Commit Graph

322 Commits

Author SHA1 Message Date
a8c51cc571 RHS Compat - Update hearing configs values for helmets (#6891)
Close #6884
2019-03-25 10:07:31 +01:00
129cc26438 Add magazines with different tracer colors for some vanilla weapons (#6658)
* Add magazines for some vanilla weapons with different tracer colors

* Removed obsolete comment

* unified naming of tracer magazines

* Add CfgMagazineWells

* Add 5.8mm mags

* Add Minimi boxes

* Added 5.56 Drum mags

* Add Katiba and 7.62x51 mags

* Remove magazine macro to make config easier to read and edit.

* Add pictures available in arma files

* Add magazines to vanilla magazinWells

* Fix wrong base class for Katiba tracer mags

* Removed duplicate strings

* delete blank lines in stringtable
2019-03-12 13:32:47 -05:00
187b2f38ce Add rksl pm II 5-25x56 compat (#6845)
* Add rksl pm II 5-25x56 compat

* Combine into existing compat

* Update ace_ScopeAdjus values
2019-03-12 11:26:56 -05:00
11f511d660 Update No Uniform Restrictions for Arma 3 v1.88 (#6829)
**When merged this pull request will:**
- Title
2019-02-22 23:24:59 +01:00
afd957f1e7 HuntIR - Move magwell compat to huntIR config (#6813) 2019-02-13 12:39:10 -06:00
d379c3f1b7 MissileGuidance - Allow using vanilla fire mode key (#6732)
* MissileGuidance - Allow using vanilla fire mode key

Fix #6595

* Javelin - Backwards compatiblity with CUP

* Add support to RHS compat

* comment
2019-01-30 22:11:01 -06:00
25c10e8cf6 Ballistics/Realistic Names - Integrate P90 Compat (#6667)
* Ballistics/Realistic Names - Integrate P90 Compat

* Update CfgWeapons.hpp

* Remove old compat addon

* Update addons/realisticnames/stringtable.xml

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* Update addons/realisticnames/CfgWeapons.hpp

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* Update addons/ballistics/CfgWeapons.hpp

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* Update addons/ballistics/CfgWeapons.hpp

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2018-12-03 12:03:49 -06:00
b3e0135e32 Fix Armake problems (#6697)
* Armake model.cfg fix

* Spaces!

* Case sensitive filenames fix
2018-11-29 11:18:22 +01:00
830536504d RHS Compat - Fix config (#6696) 2018-11-18 23:51:26 -06:00
5bfd64f066 Merge branch 'master' into armake 2018-11-18 20:23:50 +01:00
6f97a4ad39 RHS Compats - Update allowSwapBarrels for some guns (#6675)
* RHS Compats - Update allowSwapBarrels for some guns

Close #6653

* Update comments
2018-11-17 10:11:47 -06:00
0745e249fc Merge branch 'master' into armake 2018-11-14 18:32:47 +01:00
070abfa11b Compat R3F : updated with the last version 3.6 (#6664)
* requiredAddons_r3f_v3.6

* update_r3f_v3.6

* update_r3f_v3.6

* update_r3f_v3.6

* update_r3f_v3.6

* update_r3f_v3.6

* update_r3f_v3.6
2018-11-09 12:26:22 -06:00
1fe7c5c29c Map - Improve flashlight support (#6608)
* Improve flashlight support

* Speed up items check loop

* Speed up more

* Remove useless var
2018-10-25 11:39:27 -05:00
28d23e50f7 Merge branch 'tracer_adjustment' of https://github.com/Drofseh/ACE3 into tracer_adjustment 2018-10-09 16:37:09 -07:00
d8cf117841 Merge remote-tracking branch 'refs/remotes/acemod/master' into tracer_adjustment 2018-10-09 16:36:49 -07:00
75f364c80b travis 2018-10-10 01:25:13 +02:00
44414d4fc0 travis 2018-10-10 01:24:46 +02:00
641eb49dfe travis 2018-10-10 01:24:11 +02:00
a6888cb798 travis 2018-10-10 01:23:40 +02:00
9e8242a8a3 redo large calibre tracers.
I've just taken the small arms tracers, scaled them up 2x, and then
saved over the old large calibre tracers.
This works a lot better and looks a lot nicer than the old large calibre
tracers.
They use the same rvmats and textures as the small arms tracers, so the
old files for large calibre tracers can be removed.
2018-10-08 22:25:39 -07:00
5e07d894f8 Remove BOM from stringtables 2018-10-07 11:30:15 +02:00
e2ac18a05d [WIP] Fix script errors reporting wrong line numbers (#6407)
* advanced_ballistics

* advanced_fatigue

* advanced_throwing

* ai

* aircraft

* arsenal

* atragmx

* attach

* backpacks

* ballistics

* captives

* cargo

* chemlights

* common

* concertina_wire

* cookoff

* dagr

* disarming

* disposable

* dogtags

* dragging

* explosives

* fastroping

* fcs

* finger

* frag

* gestures

* gforces

* goggles

* grenades

* gunbag

* hearing

* hitreactions

* huntir

* interact_menu

* interaction

* inventory

* kestrel4500

* laser

* laserpointer

* logistics_uavbattery

* logistics_wirecutter

* magazinerepack

* map

* map_gestures

* maptools

* markers

* medical

* medical_ai

* medical_blood

* medical_menu

* microdagr

* minedetector

* missileguidance

* missionmodules

* mk6mortar

* modules

* movement

* nametags

* nightvision

* nlaw

* optics

* optionsmenu

* overheating

* overpressure

* parachute

* pylons

* quickmount

* rangecard

* rearm

* recoil

* refuel

* reload

* reloadlaunchers

* repair

* respawn

* safemode

* sandbag

* scopes

* slideshow

* spectator

* spottingscope

* switchunits

* tacticalladder

* tagging

* trenches

* tripod

* ui

* vector

* vehiclelock

* vehicles

* viewdistance

* weaponselect

* weather

* winddeflection

* yardage450

* zeus

* arsenal defines.hpp

* optionals

* DEBUG_MODE_FULL 1

* DEBUG_MODE_FULL 2

* Manual fixes

* Add SQF Validator check for #include after block comment

* explosives fnc_openTimerUI

* fix uniqueItems
2018-09-17 14:19:29 -05:00
75f8a35d3d RHS Compat - Simplify HuntIR mag config (#6580)
* RHS Compat - Simplify HuntIR mag config

* x
2018-09-17 13:22:18 -05:00
64cc287408 RHS Compat - Fix GREF canoes refuel interaction (#6575)
* Fix RHS GREF canoes refuel interaction

* Removed ace_refuel from requiredAddons

* fix inheritance
2018-09-15 11:53:28 -05:00
429ecb6171 RHS Compats - Update bases classes for RHS 4.6 (#6529)
* RHS Compats - Update bases classes for 4.6

* Update CfgMagazines.hpp

* Update CfgWeapons.hpp
2018-09-13 00:29:30 -05:00
364f84d382 Fix RHS static turrets interaction point (#6567) 2018-09-12 16:12:05 -05:00
055c85d56d update shell tracer textures to appear smaller
While in the gunner view, or generally when seeing the tracer from the
front or rear, the shell tracers look reasonalble.
However closer to a perpendicular angle the tracers appear substantially
larger than they ought to.
This texture update makes the tracer look a little smaller from those
angles.
2018-08-29 13:16:06 -07:00
16a3bd096a RHS GREF Compat - MG42 (#6552)
Close #6550
2018-08-27 17:13:38 -05:00
48b459240d Update No Uniform Restrictions for Arma 3 v1.84 (#6513) 2018-08-16 19:41:51 -05:00
b3134d00dc remove comments from rvmat files 2018-08-11 08:58:50 -07:00
21eb5e3df6 Merge branch 'master' into armake 2018-08-02 21:49:35 +02:00
a44411c666 Wire cutter - Allow use when unit has RHS Engineer UMBTS backpack (#6462)
* Allow wirecutter use when unit has RHS Engineer UMBTS backpack

* Move flag from code to config
2018-07-27 12:26:26 -05:00
8a81e3b675 Geforce, RHS Geforce adjustments and MH6M can now fastrope (#6439) 2018-07-19 22:54:06 -05:00
0199ba9b4c Japanese Translation Tweak (#6374)
# fixed typo
# improved readability
# standardized expression
2018-05-28 07:15:28 +02:00
326604ae9f Fix particles preprocessing for both armake and pboProject 2018-05-22 20:09:30 +02:00
9a37713710 Fix pboProject compatibility 2018-05-22 19:53:26 +02:00
58f4ca4581 Merge branch 'master' into armake 2018-05-20 11:08:58 +02:00
a828ebe591 Repair - Disable repair on ERA/Slat armor hitpoints (#6283)
* Repair - Disable repair on ERA/Slat armor

Disable "miscRepair" action for all era and slat armor hitpoints.
Can still be repaired via "Full Repair"

* Minor perf improvment

* Add hitpoint names for 1.82 comTurret/gun

* Fix russian translations
2018-04-19 12:31:00 -05:00
10a3a29ea0 Drop FCS from aircraft (#6265) 2018-04-13 23:08:39 -05:00
caa13cd19e update tracer_white.rvmat
I'm not sure why the R, G, and Y tracers have this commented out line,
but I figure white should match.
2018-04-06 16:59:59 -07:00
e99ac23ffd Set tracers that are white vanilla to white in ACE 2018-04-02 10:32:40 -07:00
11b58576e4 Add more missing ammo classes from Apex and Carts
- B_50BW_Ball_F and B_580x42_Ball_F
- Sub_F_Signal_Green and Sub_F_Signal_Red
* also moved the 5.45x39 classes into alphabetical order with the other
assault rifle ammo
2018-04-01 22:12:55 -07:00
14300a3dda Add missing some missing ammo classes from Apex
- 5.45 and 7.62x39mm
2018-04-01 20:23:12 -07:00
2cad71cd1e Compat R3F: #6171 updated (#6195)
* gunlist_updated_according_presets

* scope_base_angle
2018-03-18 00:38:46 +01:00
5e71030301 AB and ACE3 ballistic : compat r3f updated (#6171)
* update_atragmx_presets

* update airFriction

* r3f_762x51_ball2=m993_ap
2018-03-03 18:34:40 +01:00
e95e83c01e Cleanup userconfig from optionals (#6149) 2018-02-15 18:56:06 -06:00
2ac412a406 Merge branch 'master' into armake 2018-02-06 14:34:07 +01:00
6ce8b8473a korean translate 3.12.x (#6071) 2018-01-28 15:42:32 -06:00
9a9a2d0944 R3F compat: dispersion overhaul & AtragMx presets (#6003)
* dispersion_overhaul

* atragmx_presets
2018-01-22 23:09:40 +01:00