Commit Graph

8963 Commits

Author SHA1 Message Date
PabstMirror
5ae8145234 Don't show dogtag ID in action menu (#4558)
#4476
2016-10-17 10:55:42 +02:00
Glowbal
d9a199b942 Increment build number 2016-10-15 11:44:43 +02:00
Glowbal
8afb3c7279 Update CBA required version 2016-10-15 11:44:26 +02:00
PabstMirror
6fce923783 Fix mortar changes for laser shootRay changes
Ref #4478
2016-10-15 11:42:09 +02:00
PabstMirror
fe35e64696 Reset animation speed when not swimming (#4546) 2016-10-15 11:41:03 +02:00
Glowbal
84cbd50582 Merged branch master into release 2016-10-11 19:04:14 +02:00
commy2
8822cb1b90 emulate frag grenade ai behaviour for incendiaries (#4534) 2016-10-11 19:04:08 +02:00
jonpas
b8cc10fecb Fix #4523 - fuel nozzle disconnect at maximum hose distance 2016-10-11 18:57:58 +02:00
PabstMirror
5d610cf148 Always create namespace at preInit 2016-10-11 18:57:34 +02:00
commy2
130265fd9f add function to disable dogtags for factions, and disable for civilians 2016-10-11 18:57:34 +02:00
Glowbal
a98013c36e Merge branch 'master' into release 2016-10-11 18:51:05 +02:00
PabstMirror
cd79ebe3ce Bump REQUIRED_VERSION to 1.64 2016-10-11 18:49:31 +02:00
BaerMitUmlaut
2ba0137a1e Fix going unconscious while fastroping (#4531) 2016-10-11 18:48:20 +02:00
commy2
c390b6c1fc increase red laser alpha, close #4535 2016-10-11 18:47:52 +02:00
commy2
4fb5d230ac remove civilian rank icons from nametags (#4538) 2016-10-11 18:44:27 +02:00
PabstMirror
a3bbc848a7 Fix ammo box cookoff strings (#4528) 2016-10-09 11:57:29 +02:00
Glowbal
8e72d89ef6 Prepare 3.80 RC1 2016-10-08 13:10:34 +02:00
Nicolás Badano
ab6fc8efca Laser guidance for all designators (#3308)
* Fix laser and missileguidance over water

* Return a normalized vector in EFUNC(common,getTurretDirection)

* Make laser dispersion simulation optional, default off

* Prototype for ace_laser_designate

* Remove vanilla laser handling from ace_laser in favor of the new code on ace_laser_designate

* Simplify laser into one module

Rewrite large parts of laser
Merge laser_designate
Delete lase_selfDesignate

* Cleanup missile guidance

* Headers, fix laser over water

* Cleanup

* Test

* Change setting to scalar, more cleanup

* Add seeker debug drawing
2016-10-08 12:55:30 +02:00
commy2
74dfa6ca33 avoid PCTW error on certain vehicles (#4463)
fix #4413
2016-10-08 12:45:40 +02:00
commy2
4c96278bb4 fix fatigue when diving while sprinting, fix #4481 2016-10-08 12:44:37 +02:00
commy2
842279af9a setup hit-points LODs 2016-10-08 12:43:28 +02:00
commy2
d1db8899c1 fix damage materials of repair items 2016-10-08 12:43:28 +02:00
PabstMirror
de1c4bc4d9 Draw Straight Lines with maptool (#4410)
* Draw Straight Lines

* Fix roamer sides, handle closing map mid-draw

* Add missing privates / formula notes
2016-10-07 17:21:19 -05:00
PabstMirror
ef9fd92898 Show correct elev for mortar with no ammo (#4478)
Fix #3757
2016-10-07 17:06:04 -05:00
PabstMirror
198f6c93e4 Fix FRIES attach point for unarmed wildcat (#4518)
Close #4490
2016-10-06 15:58:45 -05:00
Glowbal
059980b1a5 Add ammo cookoff (#4376)
* Add Ammo cookoff

* Remove tabs

* Add initial ammo box cook-off

Does not include a fire effect, mostly just a proof of concept.

Should probably also add further potential cook-off conditons (if hit by tracer for example).

* Add burning effects to ammo box cook off

- Add burning effect while ammo box is cooking off
- Add setting to enable/disable ammo boxes cooking off
- Clear magazine cargo while box is burning

Currently the box will burn for 60 seconds hardcoded, this is to allow time for the ammunition to cook off (since boxes sink into the ground and dissapear when destroyed). Perhaps we can implement a way to burn until all ammo is expended.

* Improve ammo cookoff

* Integrate ammo cookoff with the incendiary grenade

* Disable ammo cook off underwater

* Optimize fnc_detonateAmmunition

I say optimize, the only real performance optimization is using `vectorMultiply`. The rest is readability optimization though!

* Improve ammo box cook off

- Remove unnecessary light source (fire particles provide lighting)
- Add randomness to cook off time
- Cook off begins with fire effect rather than smoke

* Add tracer induced ammo box cook off

Due to limitations in the way arma handles tracer rounds (there's no way to check if an individual projectile is a tracer), only magazines with a high enough tracer density (at least 1 in 4) can cause cook off this way. However this is deemed an acceptable approximation since the chance of this happening should be quite low anyway.

* Decrease amount of explosions from ammo cookoff

* Add is local check for remote event
2016-10-06 22:37:38 +02:00
PabstMirror
dfa09d3161 Functions to perform arithmetic ops on sets (#4514)
* Functions to perform arithmetic ops on a set

* fix spelling
2016-10-06 10:18:14 +02:00
commy2
2e147b37f0 fix formating of CBA version check (#4511) 2016-10-05 13:06:21 -05:00
PabstMirror
1779099b71 Cleanup old common macros (#4507) 2016-10-04 05:29:37 +02:00
commy2
05d30c5573 convert log macros to cba versions (#4282)
* convert log macros to cba versions

* Add changes to AB

* remove obsolete macro
2016-10-02 12:55:31 +02:00
Pawel W
ddd036f5bd Removed aiDispersionCoef for vanilla weapons (#4484)
When merged this pull request will restore default aiDispersionCoef for vanilla weapons.
2016-10-01 10:27:34 +02:00
PabstMirror
95da004370 Fix Ambient Sounds (#4470)
Fix #4418
- Remove leading `\` for configfile sounds
- Cleanup randomized location code
2016-10-01 10:27:00 +02:00
PabstMirror
bfc5af32f3 Add model.cfg for medical blood (#4489) 2016-09-30 16:29:48 -05:00
PabstMirror
6ad15e02c7 Fix spotting rifle loudness (#4488) 2016-09-30 15:10:20 -05:00
jonpas
8458cb2339 Replace ace_common_fnc_stringRemoveWhiteSpace with CBA_fnc_removeWhitespace (#4222)
* Replace FUNC(stringRemoveWhiteSpace) with CBA_fnc_removeWhitespace, Depreacte ACE's

* Use QFUNC

* Bump required CBA version

* Change remove version to 3.110.0
2016-09-30 15:51:03 +02:00
PabstMirror
a5d106c116 Fix cookoff event calling (#4487) 2016-09-29 18:44:48 -05:00
jonpas
dad4293216 Revert "Update showHud setter for Squad Radar" (#4485) 2016-09-29 17:53:17 -05:00
jonpas
1bd7a66888 Merge pull request #4085 from acemod/apexShowHud
Update showHud setter for Squad Radar
2016-09-29 21:11:15 +02:00
PabstMirror
3c7ac5a3e4 Fix medical blood locality / bleeding in vehicles (#4469)
* Fix medical blood locality / bleeding in vehicles

- Fix ace_setting
- Don't run on headless if enabledFor = 1
- Don't create blood for non-local units
- Don't create blood when mounted (except static weapons)

* Add readme
2016-09-29 10:42:56 -05:00
PabstMirror
85c4a1f021 Fix frag - reflectionsEnabled (#4475)
PFEH never exited
2016-09-29 10:42:21 -05:00
Nicolás Badano
0fda1b0c3d Fix #4476 2016-09-28 19:37:54 -03:00
commy2
1219d3df23 remove deprecated sitting module (#4458)
* remove deprecated sitting module

* Update sitting documentation for removal

* Remove ACE3 sitting doc, redirect to ACEX and add note

* Fix wording
2016-09-28 13:14:50 +02:00
KoffeinFlummi
72899643bd Merge branch 'master' into japanesestringtables 2016-09-27 20:54:17 +02:00
classicarma
1fe8cc03db translate realisticnames 2016-09-28 01:38:19 +09:00
classicarma
3f79d47fb4 translate zeus 2016-09-28 01:27:05 +09:00
classicarma
30a62b1337 translate yardage450 2016-09-28 01:26:50 +09:00
classicarma
b2e1432c2b translate winddeflection 2016-09-28 01:26:42 +09:00
classicarma
c4038970f2 translate weather 2016-09-28 01:26:31 +09:00
classicarma
5a2f92613d translate weaponselect 2016-09-28 01:26:17 +09:00
classicarma
e1b1a9cfec translate viewdistance 2016-09-28 01:26:08 +09:00
classicarma
de60b9fdbf translate vehicle 2016-09-28 01:25:57 +09:00
classicarma
d1c2c5be2e translate vehiclelock 2016-09-28 01:25:47 +09:00
classicarma
8f86482a86 translate vector 2016-09-28 01:25:36 +09:00
classicarma
ff4464370c translate ui 2016-09-28 01:25:23 +09:00
classicarma
04e3a5f92e translate tripod 2016-09-28 01:25:14 +09:00
classicarma
2f2c426e97 translate trenches 2016-09-28 01:25:06 +09:00
classicarma
eed1f50ae0 translate tagging 2016-09-28 01:24:58 +09:00
classicarma
4ee9ffba3f translate tacticalladder 2016-09-28 01:24:47 +09:00
classicarma
95da6b471c translate switchunits 2016-09-28 01:24:37 +09:00
classicarma
2b4bcfc585 translate spottingscope 2016-09-28 01:24:28 +09:00
classicarma
038e7775a3 translate spectator 2016-09-28 01:24:21 +09:00
classicarma
4cfa3d95cc translate slideshow 2016-09-28 01:23:18 +09:00
classicarma
6bcdaae866 translate sitting 2016-09-28 01:23:04 +09:00
classicarma
686b534701 translate scopes 2016-09-28 01:22:56 +09:00
classicarma
953ba0ff98 translate sandbag 2016-09-28 01:22:49 +09:00
classicarma
ae82c41a1b translate safemode 2016-09-28 01:22:40 +09:00
classicarma
775a6a5bc9 translate respawn 2016-09-28 01:22:33 +09:00
classicarma
cb842a4e1c translate repair 2016-09-28 01:22:20 +09:00
classicarma
3935a1b781 translate reloadlaunchers 2016-09-28 01:22:08 +09:00
classicarma
52d9c080cb translate reload 2016-09-28 01:21:58 +09:00
classicarma
feebd8e1b8 translate refuel 2016-09-28 01:21:49 +09:00
classicarma
45486fa843 translate rearm 2016-09-28 01:20:20 +09:00
classicarma
31229ffa0d translate rangecard 2016-09-28 01:18:10 +09:00
classicarma
ae69ec9338 translate parachute 2016-09-28 01:18:03 +09:00
classicarma
f61c54ad91 translate overheating 2016-09-28 01:17:56 +09:00
classicarma
de0f944013 translate opitionsmenu 2016-09-28 01:17:49 +09:00
classicarma
a25bc3b42b translate optics 2016-09-28 01:17:40 +09:00
classicarma
d0d826350b translate nightvision 2016-09-28 01:17:28 +09:00
classicarma
a778240d0e translate nametags 2016-09-28 01:17:07 +09:00
classicarma
1b39e6428b translate mx2a 2016-09-28 01:17:00 +09:00
classicarma
6f0c860aab translate movement 2016-09-28 01:16:50 +09:00
classicarma
6084b81e51 translate mk5motar 2016-09-28 01:16:42 +09:00
classicarma
a7b6d45f45 translate missionmodules 2016-09-28 01:16:34 +09:00
classicarma
2f86ed9a1c translate missileguidance 2016-09-28 01:16:21 +09:00
classicarma
33fde9ea72 translate minedetector 2016-09-28 01:16:13 +09:00
classicarma
60e57709cf translate microdagr 2016-09-28 01:16:06 +09:00
classicarma
188a1bf02b translate medical_ai 2016-09-28 01:15:59 +09:00
classicarma
a35e50e6af translate medical_menu 2016-09-28 01:15:51 +09:00
classicarma
eaf00c8340 translate medical 2016-09-28 01:15:38 +09:00
classicarma
0ced153e53 translate markers 2016-09-28 01:15:26 +09:00
classicarma
4afd71d293 translate map_gestures 2016-09-28 01:15:19 +09:00
classicarma
530946180b translate maptools 2016-09-28 01:14:58 +09:00
classicarma
4c2692c2ba translate map 2016-09-28 01:14:38 +09:00
classicarma
a6ae9047f6 translate main 2016-09-28 01:14:28 +09:00
classicarma
ef6ea019c9 translate magazinerepack 2016-09-28 01:14:15 +09:00
classicarma
c1fb635add translate logistics_wirecutter 2016-09-28 01:14:07 +09:00
classicarma
0f6b15e569 translate logistics_uavbattery 2016-09-28 01:13:45 +09:00
classicarma
d0d52b5604 translate laser_selfdesignate 2016-09-28 01:13:33 +09:00
classicarma
4dbdb8bd93 translate laserpointer 2016-09-28 01:13:20 +09:00
classicarma
f3b3105f01 translate laser 2016-09-28 01:13:12 +09:00
classicarma
7b4582d8e0 translate kestrel4500 2016-09-28 01:12:56 +09:00
classicarma
f2cbe233ab translate javelin 2016-09-28 01:12:46 +09:00
classicarma
10484e696c translate inventory 2016-09-28 01:12:32 +09:00
classicarma
fd069c48d4 translate interact_menu 2016-09-28 01:12:22 +09:00
classicarma
fda61324c8 translate interaction 2016-09-28 01:12:05 +09:00
classicarma
a44c26efb8 translate huntir 2016-09-28 01:11:47 +09:00
classicarma
e59c93988b translate hearing 2016-09-28 01:11:40 +09:00
classicarma
5453b15dd8 translate common 2016-09-28 01:11:27 +09:00
classicarma
c6806872c9 translate ballistics 2016-09-28 01:11:19 +09:00
PabstMirror
257f1a1b4c Fix interaction addActionToX return values (#4461)
* Fix interaction addActionToX return values

Fix #4460
Fix returning number from pushBack

* Retrun empty array on error
2016-09-27 11:09:06 -05:00
PabstMirror
055c6d23f3 Fix passanger interaction (#4467) 2016-09-26 12:09:20 -05:00
PabstMirror
11b6370e8f Fix undefined var in paradrop (#4465) 2016-09-25 21:25:11 +02:00
commy2
7f07d4e4b8 fix broken parachutes, fix #4437 (#4462) 2016-09-25 09:45:55 +02:00
commy2
e7bc2e9d62 remove deprecated code for 3.8.0 (#4457)
* remove deprecated scroll wheel event handler

* remove deprecated ace hash functions

* remove deprecated execNextFrame

* remove deprecated insertionSort

* remove deprecated getConfigType

* remove deprecated binocularMagazine

* remove deprecated wait(Until)AndExecute

* remove old ass and deprecated alternative syntax setHitPointDamage

* remove deprecated event handlers (#4459)

* remove deprecated event handlers#

* remove ACE_newEvents

* Remove old ACE PlayerEventHandler wrappers
2016-09-24 22:31:10 +02:00
PabstMirror
9451716a44 Show damage on repair items interaction point (#4448)
* Show damage on repair items interaction point

* Fix dot size

* Change scaling
2016-09-24 15:15:02 -05:00
commy2
bc520c7fe7 add dmg materials to spare tracks and wheel (#4450)
* add dmg materials to spare tracks and wheel

* attempt to fix damage rvmats by making FIRE GEO components convex

* get materials to work
2016-09-24 22:08:56 +02:00
commy2
c1ead851cb Add 3den attribute to disable bft (#4452)
* add 3den object attribte to disable BFT on the object

* delay setVariable public on group

* fix tooltip
2016-09-24 21:46:03 +02:00
PabstMirror
0b3d38a72f Use waitAndExecute for fatigue loop (#4453)
* Use waitAndExecute for fatigue loop

Close #4379
- Will use CBA_missionTime so it repsects pause and time accl
- Possible performance improvment over using a PFEH

* Rename main loop function
2016-09-23 16:40:52 -05:00
PabstMirror
a7c75a3bf6 Handle RHS impact grenades (RGN/RGO) (#4447) 2016-09-23 16:38:24 -05:00
PabstMirror
f23e5d33fc Fix throwing from map screen - global XEH (#4449)
* Fix throwing from map screen - global XEH

* Fix Capitalization
2016-09-23 12:48:25 -05:00
PabstMirror
b7dfdc6c84 End path drawing when passing through Geom/Fire (#4385)
* End path drawing when passing through Geom/Fire

* Add Advanced Throwing colored circles documentation
2016-09-23 12:48:15 -05:00
PabstMirror
4abf969abf Update for newest JR / 1.64 UBC (#4208)
* Update flashsuppressor JR configs for pistols

* Update for newest JR / 1.64 UBC
2016-09-23 12:48:04 -05:00
commy2
26ae575d4a fix broken ace menu in main menu (#4451) 2016-09-22 23:55:52 +02:00
commy2
03d83b633f more immersive dogtag interaction (#4446)
* more immersive dogtag interaction

* fix indent and macro usage

* move dogtag interaction point to neck
2016-09-21 09:07:45 +02:00
PabstMirror
58bd6467b2 Debugging tool to watch variables on main display (#4408)
* Debugging tool to watch variables on main display

* Fix error when called from scheduled code

* Remove demo code
2016-09-20 12:18:44 -05:00
BaerMitUmlaut
b1f6973772 Filter player medics (#4444) 2016-09-20 16:01:54 +02:00
Glowbal
c7e16210c3 fix pboprefix path 2016-09-19 23:17:10 +02:00
commy2
3d422021ef Merge pull request #4377 from acemod/sys-blood-port
Add ace2 sys blood port
2016-09-19 17:35:32 +02:00
commy2
5b42dd8616 remove deleted models 2016-09-19 15:47:51 +02:00
commy2
9a9d547893 this variable was meant to be used here... 2016-09-19 15:38:03 +02:00
commy2
226742088b remove unused variables 2016-09-19 15:36:08 +02:00
commy2
00964bd007 add a comment 2016-09-19 15:31:53 +02:00
commy2
d9b670f45f switch to SuperShader for SMDI and NoHQ, rename blood textures 2016-09-19 15:30:12 +02:00
commy2
b1f726a1fe get rid of config and use namespace for blood models 2016-09-19 15:08:38 +02:00
commy2
f60b368c65 precompile and cache functions at game start 2016-09-19 14:41:02 +02:00
commy2
a2805fad53 fix undefined variable, synch splat direction correctly 2016-09-19 14:38:47 +02:00
commy2
70512db0e3 simplifying and fixing offset 2016-09-19 13:26:32 +02:00
commy2
bc3260c8fc convert magic numbers into macros, simplify a waitAndExecute 2016-09-19 12:27:02 +02:00
commy2
d86ceef484 use ASL instead of ATL when z isn't used anyway 2016-09-19 12:18:24 +02:00
commy2
4de8ed0f10 delete unused blood splat configs and models 2016-09-19 12:11:37 +02:00
commy2
edfc33d297 simplify serverEvent call 2016-09-19 12:06:13 +02:00
commy2
86f6a5db73 move model files into data folder 2016-09-19 12:03:05 +02:00
commy2
022e8b52d0 remove unused CBA macro from blood config, disable A3 canBeShot 2016-09-19 11:38:29 +02:00
commy2
0cf6094875 rename spawnBlood to createBlood for consistency 2016-09-19 11:21:05 +02:00
commy2
26caafdab3 fix wrong function used in a example/header 2016-09-19 11:19:16 +02:00
PabstMirror
616ec642da Add AB Terrain Extension Logging (#4391) 2016-09-18 22:00:34 +02:00
BaerMitUmlaut
7388892dac Fixed weather for inherited CfgWorlds (#4360)
* Fixed weather for inherited CfgWorlds

* toLower for inArray - check all configs exist
2016-09-18 22:00:27 +02:00
Grzegorz
a63dcb49d0 PL Translation 3.7.1 (#4395)
* translate advanced fatigue

* translate advanced throwing

* translate cargo

* translate chemlights

* translate cookoff

* translate explosives

* translate fastroping

* translate gforce

* translate googles

* translate grenades

* translate gunbag

* translate maptools

* translate medical

* translate medical_ai

* translate minedetector

* translate nametags

* translate overheating

* translate repair

* translate tagging

* translate ui

* translate zeus
2016-09-18 22:00:13 +02:00
PabstMirror
fbb054dec4 Merge pull request #4422 from acemod/incindNull
Skip incindinary effects if projectile is null
2016-09-18 14:54:18 -05:00
BaerMitUmlaut
a8b490bfca Merge pull request #4358 from acemod/tweakFatigueDuty
Tweak fatgiue duty factors
2016-09-18 16:31:21 +02:00