Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,341 Commits 73 Branches 88 Tags 752 MiB
60c57a7f20
Commit Graph

9327 Commits

Author SHA1 Message Date
commy2
b0b9037f24 simplify lost some/much blood macros 2016-10-11 19:44:20 +02:00
commy2
d1df47919d support neg numbers to remove pain in addPain 2016-10-11 19:36:04 +02:00
commy2
1ea2a72f20 don't play scream by addPain function 2016-10-11 19:29:44 +02:00
commy2
ed6688c899 Merge remote-tracking branch 'origin' into medical-rewrite 2016-10-11 19:14:13 +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
commy2
d0df141cf7 add comment explaining why 6.0 were chosen 2016-10-10 18:22:46 +02:00
commy2
e2d174837a move IV transufsion rate macro to blood config 2016-10-10 18:20:58 +02:00
commy2
c2f7366d32 blood volume unit vitals 2016-10-10 17:46:17 +02:00
commy2
3438ea0946 use liters for blood volume variable 2016-10-10 17:30:42 +02:00
commy2
fc079abd46 function header 2016-10-10 16:53:25 +02:00
commy2
2ad7c4c4ea add addPain function, cap pain 2016-10-10 16:44:03 +02:00
commy2
3521bca00b change blood texture threshold 2016-10-10 15:22:59 +02:00
commy2
0f43829b63 Merge branch 'master' of https://github.com/acemod/ACE3 into medical-rewrite 2016-10-10 14:29:50 +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
commy2
b0c0156d75 reduce some overhead 2016-10-07 05:10:43 +02:00
commy2
4bc1c1db56 handle blood visuals 2016-10-07 04:21:01 +02:00
commy2
b698a88dc1 move modifyAction func to menu component 2016-10-07 01:58:40 +02:00
commy2
d4dd1626a5 delete some unused/moved functions from medical main component 2016-10-07 00:19:51 +02:00
commy2
50eeebd30d add weapon sway by pain 2016-10-07 00:09:58 +02:00
commy2
f004504a53 Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite 2016-10-06 23:44:31 +02:00
commy2
56c77fed94 prep for new pain aim sway method 2016-10-06 23:44:14 +02:00
PabstMirror
198f6c93e4 Fix FRIES attach point for unarmed wildcat (#4518) 
Close #4490
 2016-10-06 15:58:45 -05:00
commy2
673f3b4f9f implement arithmetic source for fatigue system (#4517) 2016-10-06 22:46:46 +02:00
commy2
e9586ebccc use common header file for medical components 2016-10-06 22:40:36 +02: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
commy2
853c7db1dc Merge remote-tracking branch 'origin/master' into medical-rewrite 2016-10-06 10:20:10 +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
5613ec5d5a treatment functions and unconsciousness rework 2016-10-06 00:54:57 +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
bad01c3126 simplify blood splatter by using woundReceived event 2016-10-02 19:13:56 +02:00
commy2
6082020056 simplify blood splatter by using woundReceived event 2016-10-02 18:35:40 +02:00
commy2
5875f58604 use new macro 2016-10-02 17:50:17 +02:00
commy2
feac296f9c use a new macro 2016-10-02 13:06:47 +02:00
commy2
56882a9bcb manual merge 2016-10-02 13:04:20 +02:00
commy2
f4d4c521d7 manual merge 2016-10-02 13:02:17 +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
commy2
f185742e68 manual merge 2016-10-02 12:51:29 +02:00
commy2
5da11d5f79 remove obsolete macro 2016-10-02 12:17:48 +02:00
commy2
9942518a53 Merge remote-tracking branch 'origin/master' into cba-log-macros 2016-10-02 12:11:52 +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
commy2
a54aec72bc Merge remote-tracking branch 'origin/master' into medical-rewrite 2016-09-30 21:19:16 +02:00
PabstMirror
1bc5669c95 Merge branch 'master' into cba-log-macros 2016-09-30 11:18:58 -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
commy2
c93e9e3f3b fix playSoundInjured wrong args 2016-09-30 13:03:43 +02:00
commy2
6ae57e991f delete obsolete 2016-09-30 12:28:34 +02:00
commy2
490155270b QEGVAR vs QGVAR 2016-09-30 12:18:59 +02:00
commy2
bd98e44a94 simplify 2016-09-30 11:52:05 +02:00
commy2
77f21e9441 add some more functions to engine component 2016-09-30 11:23:07 +02:00
commy2
1196cbb210 Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite 2016-09-30 10:39:06 +02:00
commy2
96a1e74c85 synch anim speed acceleration 2016-09-30 10:38:27 +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
PabstMirror
60a7490b7e Fix some moved funcs/strings 2016-09-29 15:08:36 -05:00
commy2
03e24d8fd9 improve checkItems function 2016-09-29 21:32:54 +02:00
jonpas
1bd7a66888 Merge pull request #4085 from acemod/apexShowHud 
Update showHud setter for Squad Radar
 2016-09-29 21:11:15 +02:00
commy2
f53d324c0d simplifications in the treatment config 2016-09-29 20:29:44 +02:00
commy2
20a544e549 remove debug mode 2016-09-29 19:45:03 +02:00
commy2
ef8ad21446 fix inconsistencies in treatment time between basic and adv, fix item usage 2016-09-29 19:43:50 +02:00
commy2
e418cc05e9 cleanup, fix headers treatment has/use item functions 2016-09-29 19:31:48 +02:00
commy2
d3f6f040cd fix some problems with transitions from lowered weapon animations 2016-09-29 19:15:16 +02:00
commy2
2c7864c02b implement custom treatment sounds 2016-09-29 18:45:18 +02:00
commy2
ecd77630f5 some more animation time tweaks 2016-09-29 18:12:51 +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
commy2
36d244a868 'modernize' primary treatment functions, fix animation issues, add anim speed scaling 2016-09-29 16:00:19 +02:00
Nicolás Badano
0fda1b0c3d Fix #4476 2016-09-28 19:37:54 -03:00
commy2
410c5f1d5f treatment debug 2016-09-28 20:46:46 +02:00
commy2
4484a36f25 Merge remote-tracking branch 'origin/master' into medical-rewrite 2016-09-28 18:33:16 +02: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
commy2
0decd72063 manual merge 2016-09-28 08:37:39 +02:00
commy2
3d67de6fc1 fix a missing 2016-09-27 22:33:29 +02:00
commy2
035e8017cc Merge remote-tracking branch 'origin/medical-rewrite-interactions' into medical-rewrite 2016-09-27 21:38:30 +02:00
commy2
20d00d7cd9 make units scream when they're hit 2016-09-27 21:21:44 +02:00
KoffeinFlummi
72899643bd Merge branch 'master' into japanesestringtables 2016-09-27 20:54:17 +02:00
commy2
a913054b57 fix error with out of bounds blood loss 2016-09-27 20:00:58 +02:00
commy2
5a19d4884b disable debug medical_damage 2016-09-27 19:22:54 +02:00
commy2
09c5fbde15 Merge remote-tracking branch 'origin/master' into medical-rewrite 2016-09-27 18:59:43 +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
commy2
5e35204811 woundHandler(SQF), fixes, improvements, more consistent variable naming 2016-09-27 17:29:49 +02:00
commy2
72e2bc72c0 don't exit loop prematurely 2016-09-27 11:57:37 +02:00
commy2
f90a91dfb5 add todo 2016-09-27 11:14:22 +02:00
commy2
7470d1f0f5 cleanup/improve parseConfigForinjuries 2016-09-27 11:05:38 +02:00
commy2
cae5196656 fix wound translations being lost in limbo 2016-09-26 21:09:32 +02:00
commy2
0637a7401e travis pls 2016-09-26 20:52:08 +02:00
commy2
c21323f9ed travis 2016-09-26 20:45:29 +02:00
commy2
2bfa1370a5 port injury parse fnc to medical damage 2016-09-26 20:30:45 +02:00
commy2
9f6baca424 port injury parse fnc to medical damage 2016-09-26 20:25:14 +02:00
commy2
8fd7e8335a simplify and fix medical engine damage 2016-09-26 19:59:00 +02:00
PabstMirror
055c6d23f3 Fix passanger interaction (#4467) 2016-09-26 12:09:20 -05:00
commy2
80232c39cc add todo note 2016-09-26 19:07:14 +02:00
commy2
4b9873d304 fix various issues with handleDamage engine component 2016-09-26 18:30:39 +02:00
PabstMirror
11b6370e8f Fix undefined var in paradrop (#4465) 2016-09-25 21:25:11 +02:00
commy2
033c7c7eec Merge remote-tracking branch 'origin/master' into medical-rewrite 2016-09-25 18:11:48 +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
PabstMirror
f6941b29bf Add changes to AB 2016-09-22 15:12:07 -05:00
PabstMirror
3c53a314d4 Merge remote-tracking branch 'refs/remotes/origin/master' into cba-log-macros 2016-09-22 15:10:30 -05:00
PabstMirror
39fa0b5d0e #4366 - Fix treatment animion with no weapon equiped 2016-09-21 15:55:29 -05:00
PabstMirror
c7afae88f7 Fix base interaction nodes 2016-09-21 10:55:19 -05:00
BaerMitUmlaut
7d2d40ee55 Added 3D treatment actions 2016-09-21 14:36:00 +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
236d1f9669 Merge remote-tracking branch 'origin/medical-rewrite' into medical-rewrite 2016-09-19 18:23:37 +02:00
commy2
729ba9178b Merge remote-tracking branch 'origin/master' into medical-rewrite 2016-09-19 18:23:26 +02:00
commy2
8937a27b96 port litter settings to treatment, stringtable fixes 2016-09-19 18:20:56 +02:00
commy2
c2f8007d36 port litter settings to treatment 2016-09-19 18:05:49 +02:00
commy2
10d4047b4c fix problems with ported treatment 2016-09-19 17:52:16 +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
commy2
158b1eed69 add server only event handler only on server machine 2016-09-19 10:05:16 +02:00
commy2
81d962f0d5 port litter to treatment 2016-09-19 09:55:30 +02:00
Glowbal
27314c34b1 fix treatment functionality 2016-09-18 22:58:56 +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
Glowbal
b74245c323 Merged branch medical-rewrite into medical-rewrite 2016-09-18 19:48:58 +02:00
Glowbal
1c1e47c039 Enable treatmnet actions 2016-09-18 19:48:49 +02:00
BaerMitUmlaut
a8b490bfca Merge pull request #4358 from acemod/tweakFatigueDuty 
Tweak fatgiue duty factors
 2016-09-18 16:31:21 +02:00
commy2
6cc960aacc fix nocrosshair being in addons and optionals 2016-09-18 15:19:17 +02:00
commy2
031bb1ec91 Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite 2016-09-18 15:17:01 +02:00
commy2
0ff4c20861 Merge pull request #4168 from acemod/nocross 
optional pbo to disable cross hair
 2016-09-18 15:08:43 +02:00
commy2
a5dcdf102f use TRACE macros for parseConfig function 2016-09-18 14:17:18 +02:00
Glowbal
9263cb0f7d Fix handleDamage not working 2016-09-18 14:05:05 +02:00
Glowbal
7691af47f3 Further clean up 2016-09-18 13:33:22 +02:00
commy2
1c4cd81680 add displayName to blown off turret object 2016-09-18 12:19:29 +02:00
Glowbal
811e1cd598 First set up clean up for medical rewrite 2016-09-18 12:05:36 +02:00
Glowbal
0c43c83b3d Merge branch 'master' 
Conflicts:
	addons/medical/ACE_Settings.hpp
	addons/medical/XEH_postInit.sqf
	addons/medical/XEH_preInit.sqf
	addons/medical/functions/fnc_actionDiagnose.sqf
	addons/medical/functions/fnc_actionLoadUnit.sqf
	addons/medical/functions/fnc_addDamageToUnit.sqf
	addons/medical/functions/fnc_createLitter.sqf
	addons/medical/functions/fnc_displayPatientInformation.sqf
	addons/medical/functions/fnc_handleCreateLitter.sqf
	addons/medical/functions/fnc_handleDamage.sqf
	addons/medical/functions/fnc_handleDamage_advanced.sqf
	addons/medical/functions/fnc_handleDamage_airway.sqf
	addons/medical/functions/fnc_handleDamage_caching.sqf
	addons/medical/functions/fnc_handleDamage_internalInjuries.sqf
	addons/medical/functions/fnc_handleDamage_wounds.sqf
	addons/medical/functions/fnc_isBeingCarried.sqf
	addons/medical/functions/fnc_isBeingDragged.sqf
	addons/medical/functions/fnc_litterCleanupLoop.sqf
	addons/medical/functions/fnc_moduleAssignMedicRoles.sqf
	addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf
	addons/medical/functions/fnc_setCardiacArrest.sqf
	addons/medical/functions/fnc_showBloodEffect.sqf
	addons/medical/functions/fnc_treatmentAdvanced_fullHealLocal.sqf
	addons/medical/functions/fnc_treatmentAdvanced_surgicalKit_onProgress.sqf
	addons/medical/functions/fnc_treatmentBasic_epipen.sqf
	addons/medical/functions/fnc_treatmentIV.sqf
	addons/medical/functions/fnc_treatmentIVLocal.sqf
 2016-09-18 11:51:21 +02:00
commy2
2b4c5f9c49 auto add blown off turrets to curator 2016-09-18 11:31:28 +02:00
PabstMirror
32b7ef7b85 Skip incindinary effects if projectile is null 2016-09-17 13:09:03 -05:00
commy2
95409f6772 Merge pull request #4383 from acemod/support-disable-cookoff 
Add object attribute to disable cookoff for individual vehicles
 2016-09-17 18:50:34 +02:00
commy2
d5edc5a1f5 Merge pull request #4411 from acemod/burn-wheels 
incendiary and cookoff improvements
 2016-09-17 18:30:08 +02:00
commy2
e02516e5b5 invert reverted inverted 2016-09-17 18:08:08 +02:00
commy2
3d18374747 add object 3den setting for disabling cook off effects 2016-09-17 17:47:29 +02:00
Glowbal
e8f55348d8 Add ACE2 sys_Blood port 2016-09-17 16:52:25 +02:00
SilentSpike
e3d26c535a Merge pull request #4368 from 654wak654/delete-teleport-module 
Delete "Teleport Players" module after use
 2016-09-17 11:52:38 +01:00
Glowbal
48a198fea4 Add support for disabling cookoff for individual vehicles 2016-09-17 12:13:43 +02:00
Ozan Eğitmen
56751eff0e Revert "Delete "Group Side" module after use" 
This reverts commit 2880c6152a.
 2016-09-17 01:01:37 +03:00
classicarma
0d4a0a52ba translate gunbag 2016-09-17 01:47:01 +09:00
classicarma
7f208e094d translate grenades 2016-09-17 01:46:51 +09:00
classicarma
5c160db023 translate goggles 2016-09-17 01:46:34 +09:00
classicarma
3605778d60 translate gforces 2016-09-17 01:46:19 +09:00
classicarma
1e28c16ba2 translate gestures 2016-09-17 01:46:09 +09:00
classicarma
5fc3b05c21 translate frag 2016-09-17 01:46:00 +09:00
classicarma
f9e44a2820 translate flashsuppressors 2016-09-17 01:45:47 +09:00
classicarma
32939571e5 translate flashlights 2016-09-17 01:45:34 +09:00
classicarma
6312a19dd6 translate finger 2016-09-17 01:45:24 +09:00
classicarma
d1e57f9678 translate fcs 2016-09-17 01:45:14 +09:00
classicarma
47bd4e9991 translate fastroping 2016-09-17 01:44:56 +09:00
classicarma
4fabf8b1f1 translate exolosives 2016-09-17 01:44:45 +09:00
classicarma
647ad8c681 translate dragging 2016-09-17 01:44:37 +09:00
classicarma
4827a18aa0 translate digtags 2016-09-17 01:44:30 +09:00
classicarma
99c5122120 translate disarming 2016-09-17 01:44:22 +09:00
classicarma
dfa5a745a0 translate dagr 2016-09-17 00:58:02 +09:00
classicarma
24d365fa5d translate cookoff 2016-09-17 00:57:49 +09:00
classicarma
83a18e84de translate concertina_wire 2016-09-17 00:57:40 +09:00
classicarma
e767d65cfb translate common 2016-09-17 00:57:27 +09:00
classicarma
e6b2cc8a74 translate chemlights 2016-09-17 00:57:17 +09:00
classicarma
78ee33b46f translate cargo 2016-09-17 00:57:09 +09:00
classicarma
fb48edb667 translate captives 2016-09-17 00:57:00 +09:00
classicarma
53bee76f8d translate ballistics 2016-09-17 00:56:53 +09:00
classicarma
23d70fb6f0 translate attach 2016-09-17 00:56:45 +09:00
classicarma
1e1c202f96 translate atragmx 2016-09-17 00:56:36 +09:00
classicarma
4003b1486b translate advanced_throwing 2016-09-17 00:56:25 +09:00
classicarma
892af25bac translate advanced_fatigue 2016-09-17 00:56:13 +09:00
classicarma
4fd92b534a translate advanced_ballistics 
This reverts commit 65bfee0f9481313599c654b69ca2a0370077f3ea.

translate advanced_ballistics
 2016-09-17 00:55:53 +09:00
commy2
3cea9e727d fix a comment 2016-09-16 14:00:43 +02:00
commy2
a487c5e89f offset for quad engine smoke, delete destroyed RepairItem s 2016-09-16 13:51:41 +02:00
commy2
d200eadb46 incendiary and cookoff improvements 2016-09-16 13:08:19 +02:00
classicarma
524312dce3 translate aircraft 2016-09-16 19:49:08 +09:00
classicarma
53e50f4f91 translate disposable 2016-09-16 12:01:26 +09:00
Ozan Eğitmen
2880c6152a Delete "Group Side" module after use 2016-09-16 01:34:32 +03:00
PabstMirror
bbcc82acf6 Tweak fatgiue duty factors 2016-09-13 16:56:06 -05:00
PabstMirror
b81ccca3f7 Captives - rewrite findEmptyNonFFVCargoSeat (#4348) 
Simplify func using `fullCrew`
Fix #4339
also switch hard `ERROR(` macro to `WARNING(`
 2016-09-13 16:52:51 -05:00
Glowbal
65cdf200fb Merged branch release into master 2016-09-13 21:28:22 +02:00
Glowbal
4ae4fca852 Prep 3.7.0 release 2016-09-12 19:47:31 +02:00
jonpas
0400a857e6 Fix Advanced Throwing vanilla throw block for primed throwables (#4370) 
* Fix vanilla throwing block failing after priming, simplify muzzle ammo (can only be 1 or 0, 1 doesn't influence anything if no appliccable throwable in inventory)

* Disable select grenade keys when advanced throwing is active

* Fix #4375 - select next grenade cycles between first 2 grenade muzzles due to setAmmo
 2016-09-12 19:21:04 +02:00
BaerMitUmlaut
1601f6a7b7 Disable medical AI for remote controlled AI 2016-09-12 17:06:14 +02:00
PabstMirror
9844ae32c9 Exit fatiuge loop when dead (don't play breathing sound) 2016-09-11 22:03:20 -05:00
commy2
bfb88efe9a Fix script error in cargo drop function (#4369) 2016-09-10 21:21:09 +02:00
Ozan Eğitmen
d533bd1663 Delete "Teleport Players" module after use 2016-09-10 15:33:19 +03:00
Glowbal
04dd0412ff Prepare 3.7.0 RC6 2016-09-09 11:43:40 +02:00
jonpas
062f6deec8 Fix Advanced Throwing floating IR grenades and block vanilla throwing (#4365) 
* Fix #4362 - floating primed IR grenades

* Fix #4363 - block vanilla throwing while prepared

* Respect last thrown time with vanilla throwing and dropping primed throwable,
 2016-09-09 11:00:30 +02:00
BaerMitUmlaut
b1f91f8cf5 Use directCall on tripflare effect 2016-09-08 21:22:32 +02:00
Glowbal
ebdc883855 Prepare 3.7.0 RC5 2016-09-07 21:35:58 +02:00
PabstMirror
0d81ce34e2 Fix stop gesture keybind (#4354) 2016-09-07 21:07:51 +02:00
PabstMirror
1caea46d60 Medical - Fix adv wound not stacking (#4353) 2016-09-07 20:54:54 +02:00
jonpas
13df3efce2 Prepare 3.7.0 RC4 2016-09-06 22:56:22 +02:00
commy2
6e99e8a951 don't let tripod fall over as easily (#4352) 2016-09-06 21:55:23 +02:00
PabstMirror
1a4ed7b7b4 Grenades - disable throw mode / keybind if advThrow (#4350) 2016-09-06 21:54:42 +02:00
commy2
5cd9b56866 don't let tripod fall over as easily (#4352) 2016-09-06 21:53:38 +02:00
PabstMirror
a320a56813 Fix blood bags not showing in medical menu (#4351) 
fix #4306
 2016-09-06 21:52:22 +02:00
PabstMirror
4781903be6 Add setting for medical ai 2016-09-06 21:48:46 +02:00
PabstMirror
ec4c2276a5 Add setting for medical ai 2016-09-05 22:35:01 -05:00
Glowbal
89a5f28772 Merge pull request #4192 from acemod/medical-rewrite-engine-component 
merge medical engine component into medical rewrite branch
 2016-09-05 22:31:37 +02:00
Glowbal
f3dc1afdbf Prepare 3.7.0 RC3 2016-09-05 22:27:30 +02:00
PabstMirror
4fd5d6be6c Fix handleDamage params for addDamageToUnit (#4344) 2016-09-05 22:27:00 +02:00
BaerMitUmlaut
a096439f36 Moved particles component to optionals (#4341) 2016-09-05 20:50:30 +02:00
PabstMirror
a585a36ced Add ace mags to 7.62 SPAR_03 (#4340) 2016-09-05 20:33:12 +02:00
jonpas
2034234940 Refuel nozzle taking, disconnecting, connecting and returning interaction fixes (#4337) 
* Prevent taking or disconnecting a nozzle if already carrying one

* Fix multiple nozzle connect actions, Fix returning nozzle into a vehicle being refueled
 2016-09-05 20:23:28 +02:00
jonpas
2474da36b3 Fix pick up delay and IR chemlights, prevent picking up GL and mortar smoke shells (#4336) 
* Fix pick up interaction not rendering right after throw, Prevent GL rounds from being picked up

* Prevent picking up GL and mortar smoke shells

* Fix pick up delay properly, Add separate define for quick throwing (for use when debugging)

* Fix forgotten rename in IR chemlight handling
 2016-09-05 20:23:03 +02:00
Glowbal
be8b4468af Increment build number 2016-09-05 08:27:58 +02:00
PabstMirror
7055b242e4 Fix AF author String (#4330) 2016-09-04 22:34:48 +02:00
PabstMirror
f21d45392f SPAR use ACE Magazines - Fix #4207 (#4329) 2016-09-04 21:56:05 +02:00
Glowbal
849a2cd475 Prepare 3.7.0 2016-09-04 21:51:36 +02:00
Glowbal
5034dffec8 Fix build error with make 2016-09-04 21:51:13 +02:00
BaerMitUmlaut
cc414de8d1 Add Advanced Fatigue component (#4321) 
* Initial commit advanced fatigue

* Added animation changes

* Fixes, rewrites

* Broadcast 3den attribute and fix UBC

* Further animation tweaks

* Added Eden attribute and CBA settings

* Switch to CBA events

* Add beautified component name

* Rewrites, fixes, tweaks

* Move setVars to GVARs

* Add setting to disable

* Switch to status effect handler for sprint and jog blocking

* Add component name

* Failsafe for early unit player EH

* Removed raised weapon penalty for pistols

* Added respawn compatibility

* Tweaked side jog animation speed

* Added support for virtual load

* Added stamina bar

* Remove debug flags

* Added custom duty factor functions and values

* Added structural comments

* Disabled CBA settings, added ACE settings

* Fixed config

* Added readme

* Remove leftover debug diag_logs

* Improved stringtable
 2016-09-04 21:33:07 +02:00
PabstMirror
7314f863f6 Add spare barrel to VA in 1.64 (#4328) 
Close #4325
 2016-09-04 21:26:15 +02:00
PabstMirror
0848b6d1de Fix script errors (#4327) 2016-09-04 21:03:52 +02:00
BaerMitUmlaut
8a47d7a9b6 Add fade nametags towards screen border (#4316) 
* Fade nametags towards screen border

* Use distance2D instead of vector commands

* Don't calculate fade when off screen

* Made fade on border optional
 2016-09-04 20:50:12 +02:00
Glowbal
b0fa1a32d9 Fix params 2016-09-04 20:37:25 +02:00
Glowbal
b489750d5b Minor optimizations using private, params, and isEqualType (#4323) 
* Optimizations with private, params, and isEqualType

* Fixed tab being used instead of space

* Fixed tabs inserted by notepad++

* More usage of new private syntax and params

- changed a few checks for an array being empty to `_arr isEqualTo []`
rather than `count _arr == 0`
- added more uses of `private` on the same line as the variable is
declared
- added more uses of params to assign variables passed as parameters
- removed unnecessary parentheses
- removed several unnecessary variable declarations with private array
syntax

* clean up and formatting
 2016-09-04 16:44:22 +02:00
BaerMitUmlaut
278e7fa800 Add Medical AI implementation for basic medical (#4311) 
* Initial commit medical AI

* Finished non-healing functions

* Initial work on self healin

* AI healing

* Finished medical AI for basic medical

* Finito

* Fix for dead units, medic not being close enough

* Make ace_medical required

* Fixed double systemChat

* Made AI units able to heal players

* Fixed wound treatment

* Fixed medic movement

* Made units heal themselves earlier
 2016-09-04 11:25:03 +02:00
BaerMitUmlaut
c3222bdf0c Add realistic weights (#3868) 
* Adjusted weapon weights - Vanilla

* Adjusted weapon weights - Marksmen DLC

* Adjusted weight of SIG 556 to SIG 550
 2016-09-04 11:07:36 +02:00
PabstMirror
1c5761f845 Bundle fire damage into larger chunks (#4223) 2016-09-03 22:00:45 +02:00
J3aLeiNe
7220d0ee5d compat RHS US : Change for default ACE_12.7x99 (#4184) 
* Change for default ACE_12.7x99

 - rhsusf_ammo_127x99_M33_Ball = B_127x99_Ball from addons/ballistics/CfgAmmo.hpp

 - rhsusf_ammo_127x99_mk211 = ACE_127x99_API from addons/ballistics/CfgAmmo.hpp

* Default ACE3 12.7x99 and recheck bullets values

 - 7.62 M993 : fix Ballistic Coefficient and Mass according with ballistics/CfgAmmo.hpp
 - 7.62 M993 : add a muzzle velocity according with the Mk11 Mod0 barrel length (609.6mm) and the M14 EBR-R1 barrel length (558.8mm) (empiric, not perfect but better than nothing)
 - recheck all bullets values

* Accurate M249s' barrel length

* Little add and fix for Atragmx "GunList" (#1)

- add 12.7x99 API
 - fix .408 "Mass" according with the ballistics/CfgAmmo.hpp
 - fix .300WM MK248 Mod0 "Mass" according with the ballistics/CfgAmmo.hpp
 - Typo Mod0, Mod1 for a better reading on the Atrag's panel
 - fix .308 M80 "Mass" according with the ballistics/CfgAmmo.hpp
 - add .308 Mk316
 2016-09-03 22:00:15 +02:00
PabstMirror
2b29dcadc3 Merge pull request #4310 from acemod/voiperr-flashlight_housekeeping 
Map + Flashlights Cleanup (merge conflicts + fixes)
 2016-09-02 18:57:48 -05:00
jonpas
0e1f2828a9 Rename Advanced Throwing component to be in-line with other advanced_ components (#4318) 
* Rename Advanced Throwing component to be in-line with other advanced_ components

* Rename wiki page as well

* Add redirect from old wiki page
 2016-09-03 01:39:34 +02:00
PabstMirror
12de3265b8 Fix INFO Macro not in CBA 3.0 (#4320) 2016-09-02 12:50:23 -05:00
jonpas
d3ee125d5e Fix Advanced Throwing IR Chemlight and in-hand pick up (#4313) 
* Fix IR Chemlights pick up

* Fix attached throwable pick up interaction condition

* Fix in hand pick up locality
 2016-09-02 14:57:20 +02:00
PabstMirror
c4d2383005 Increase blood bag flow rate for basic medical (#4306) 
* Change blood bags

- Increase flow rate for basic medical
- Don't queue bags

* change to ivBags, reset var on init / fullHeal
 2016-09-01 12:46:08 +02:00
jonpas
eb007973c1 Merge pull request #4315 from acemod/fixChemlightShieldDescriptions 
Fix Chemlight Shield Green and Red descriptions
 2016-09-01 01:20:04 +02:00
jonpas
cbdabfb78d Fix Chemlight Shield Green and Red descriptions 2016-08-31 23:14:12 +02:00
PabstMirror
62bb1db705 Fix chemlight supplyCreate UBC (#4314) 2016-08-31 16:10:40 -05:00
PabstMirror
41d758567e Chemlights cleanup (#4304) 2016-08-31 22:12:40 +02:00
Glowbal
df66b0876f Minor private variable fixes (#4300) 2016-08-27 17:35:45 +02:00
PabstMirror
d448ea8916 Improve interaction position for air units. (#4285) 
Fix #4233
 2016-08-27 10:37:58 +02:00
[OMCB]kaban
64cf8aa95a Russain Translations Update (#4286) 2016-08-27 10:36:00 +02:00
PabstMirror
df7aa38a7a Allow inheritance for addActionToClass (#4272) 
* Allow inheritance for addActionToClass

* Update Headers

* Use inline code for inheritance example
 2016-08-27 10:35:21 +02:00
Glowbal
1366a6f15f Merge pull request #4289 from acemod/earlyAddPlayerEventHandler 
Fix null ace_player from early call to addPlayerEH
 2016-08-27 10:32:12 +02:00
Grey-Soldierman
dae3d8d682 Definable classname for Spare Barrel (#4121) 
* Added definable barrel classname through weapon config

* Improved condition for player carrying spare barrel
 2016-08-27 10:21:15 +02:00
voiperr
fedad7f8f7 Ace_Chemlights (Chemlight Enhancements) (#3921) 
* Add ace_chemlights.
Make chemlight intensity and dropoff more realistic.
Add orange, white, IR chemlights.
Add chemlight shields.
Make chemlight impact sounds more realistic.

* Moved impact sound changes to a different branch.

* Used QPATHTOF. Fixed scopes. Used initServer. Reduced lifetime duration.
Checked privates.

* Stringtable: 5 minute.

* Blue lifetime. Removed ref to deprecated function

* Use proper magazine macro. Add new chemlights to Misc box.
 2016-08-27 10:19:39 +02:00
commy2
9ef24d25ba paradrop crates from helicopter or plane cargo (#2468) 2016-08-27 10:14:54 +02:00
commy2
602d074898 integrate medical-engine handledamage into medical-damage component 2016-08-27 09:39:24 +02:00
commy2
2ac52fb430 remove static fix from vmedical component 2016-08-27 08:50:55 +02:00
PabstMirror
c9f9b89ea2 Fix merge (was moved to XEH_postInitServer) 
Use short circuit for loadout change and add note
 2016-08-25 18:56:57 -05:00
PabstMirror
fd6bd7f794 Merge branch 'flashlight_housekeeping' of https://github.com/voiperr/ACE3 into voiperr-flashlight_housekeeping 2016-08-25 15:50:11 -05:00
Joko
927d8ead8f add Hiddenselection camo to bodybag for Retexturing (#4276) 
* add Hiddenselection camo to bodybag

* Add default texture

* Use macro
 2016-08-24 12:42:32 -05:00
PabstMirror
3f343086dc ad fix for noradio 2016-08-23 22:43:37 -05:00
PabstMirror
18153b0451 Fix null ace_player from early call to addPlayerEH 2016-08-23 22:24:59 -05:00
PabstMirror
5a83659136 Don't cookoff when commander turret is hit (#4280) 2016-08-23 09:57:54 +02:00
commy2
f76457f48f convert log macros to cba versions 2016-08-22 21:06:52 +02:00
jonpas
f8dfa4f933 Add Advanced Throwing (#3477) 
* Add Advanced Throwing

* Add feature documentation
 2016-08-22 15:09:08 +02:00
commy2
cda100c9e7 Remove superfluous requiredAddons in hearing 2016-08-20 21:10:37 +02:00
Glowbal
d911dab5a7 Merge pull request #4191 from acemod/fix-4181 
add explosive devices to missing units, close #4181
 2016-08-20 12:25:56 +02:00
Glowbal
83e78f1021 Merge pull request #4258 from acemod/reviveTimer 
Clear reviveState when calling setUnconscious
 2016-08-20 11:57:51 +02:00
Glowbal
47d17c49dc Merge pull request #4245 from acemod/eject-ai-crew-cookoff 
eject ai during cookoff
 2016-08-20 11:56:40 +02:00
Glowbal
167dc7735d Merge pull request #4197 from acemod/litterSimpleObject 
Use createSimpleObject for medical litter
 2016-08-20 11:53:43 +02:00
Glowbal
1f8f463f32 Merge pull request #4267 from acemod/fix-object-event 
fix FUNC(objectEvent)
 2016-08-20 11:49:53 +02:00
PabstMirror
7f9a697dca Update CBA_DEBUG_SYNCHRONOUS macro for new CBA (#4271) 2016-08-19 16:33:27 -05:00
commy2
1c6825bcab skip DLL check on non-windows machines, close #4253 2016-08-19 16:01:59 +02:00
commy2
91e4f50ba0 fix FUNC(objectEvent) 2016-08-19 15:23:47 +02:00
jonpas
ff0dcd3152 Use pushBackUnique in Tags cache (#4249) 
* Use pushBackUnique in tagging

* Use configProperties, Add maintainers

* Fix header

* Revert to configClasses
 2016-08-18 20:52:28 +02:00
jonpas
986ac43a68 Cache config UI (#4234) 
* Cache config UI

* Use configClasses to prevent reading entries in base class

* Fix header not containing return value

* One more count

* More lazy eval
 2016-08-18 19:07:05 +02:00
PabstMirror
b02e91e02e Clear reviveState when calling setUnconscious 
#4250
 2016-08-18 01:59:40 -05:00
freghar
9fa247398f add BlueForceTracking filtering via an object variable (#4196) 
There's no good workaround for this:

 * creating a dummy unit on [0,0,0] and making it leader prevents
   grp members from entering vehicles
 * joining group of a different side prevents grp members from seeing
   blueforce tracking markers of their original side

Usage (_obj can be group or unit, depending on BFT_ShowPlayerNames):

  _obj setVariable ["ACE_map_hideBlueForceMarker", true];

The inverse, hiding of markers of other groups/units for a particular
player, can be already done by 'ace_map_BFT_Enabled = false' locally,
as the Update function checks for it every time.

Signed-off-by: freghar <freghcz@gmail.com>
 2016-08-16 19:28:21 -05:00
PabstMirror
24d13e525f Add ACE_isBelt for DLC/Expansion magazines 
Fix #4094
 2016-08-14 13:35:00 -05:00
commy2
7d2f2023ee eject ai during cookoff 2016-08-14 13:51:33 +02:00
commy2
2231464087 fix bug which would cause unecessary echo network traffic (#4242) 2016-08-13 16:45:50 +02:00
Lukas
84a370d0f2 Czech translation (#4241) 2016-08-13 15:44:48 +02:00
Glowbal
fdfe672491 Merge pull request #4166 from acemod/glasses-hearing 
Make hearing component compatible with glasses
 2016-08-13 14:17:47 +02:00
Glowbal
ba8c8bb5b0 Merge pull request #4109 from acemod/port-incendiary-grenades 
Port ACE2 incendiary grenades
 2016-08-13 14:16:39 +02:00
commy2
58539a0949 Merge branch 'master' of https://github.com/acemod/ACE3 into glasses-hearing 2016-08-13 13:03:23 +02:00
commy2
5b3d424509 always destroy engine, effect only requires cookoff 2016-08-13 12:44:38 +02:00
commy2
d0d407a2c5 only do engine burning effect if cookoff is enabled 2016-08-13 12:39:52 +02:00
commy2
1bde8d617b rename cookoff setting to 'GVAR(enable)' 2016-08-13 12:38:04 +02:00
commy2
0dc13276df change default value to true 2016-08-13 12:13:49 +02:00
commy2
f0a74781c9 add setting to disable cook off effects 2016-08-13 12:12:34 +02:00
commy2
c42004449d Port AGM cook off 2016-08-13 11:59:15 +02:00
commy2
9a93dffc3b port A2 incendiary grenades 2016-08-13 11:49:36 +02:00
Broström.A | Evul
0dfee34a56 Added additional cargo and dragging for crates (#4129) 
* Added Cargo and Dragging for `Land_WoodenBox_F` and `Land_WoodenCrate_01_F`.
 2016-08-13 11:33:41 +02:00
PabstMirror
f354bab3c2 Add Tripflare (#4152) 2016-08-13 11:29:01 +02:00
[OMCB]kaban
8fc2cbd0ef Russian Translations - Update (#4217) 2016-08-13 11:25:43 +02:00
jonpas
5985f3bd26 Fix missing zeroing UI on vehicles without FCS 2016-08-11 22:34:38 +02:00
PabstMirror
a2da54bfec Fix javelin fire block not being removed (#4228) 2016-08-11 13:30:28 -05:00
PabstMirror
f12feae7fe Fix some efuncs 2016-08-09 12:47:59 -05:00
PabstMirror
011c6a0d00 Fix merge conficlts 2016-08-09 12:14:30 -05:00
PabstMirror
6c63d3c23a Merge branch 'master' into medical-rewrite 2016-08-09 12:11:30 -05:00
commy2
5e40c24985 Merge pull request #4185 from acemod/cleanup-deprecated 
remove deprecated functions
 2016-08-09 18:34:43 +02:00
commy2
c2da1b4980 Merge pull request #4225 from acemod/fix-missing-magazine-mass 
Fix wrong config path in FUNC(calculateMass)
 2016-08-09 18:30:04 +02:00
commy2
9228bb9349 manual merge 2016-08-09 18:28:42 +02:00
jonpas
e909901100 Merge pull request #4226 from acemod/fixTagString 
Fix tagging cstring
 2016-08-09 18:27:00 +02:00
commy2
36e78e0722 Merge pull request #4171 from acemod/cleanup-hash 
deprecate ACE hash functions in favor of CBA versions
 2016-08-09 18:25:01 +02:00
commy2
83f32ebc29 Merge pull request #4170 from acemod/cleanup-missionSQM 
remove some broken functions
 2016-08-09 18:24:52 +02:00
commy2
439a85924c Merge pull request #4188 from acemod/cba-hash-synchedEvent 
Convert common to CBA hashes
 2016-08-09 18:24:27 +02:00
commy2
7000414df4 Fix wrong config path in FUNC(calculateMass) 2016-08-09 18:20:25 +02:00