Commit Graph

9203 Commits

Author SHA1 Message Date
ulteq
f15522a88f ATragMX - Estimate bullet length instead of using a fixed value (#4651) 2016-11-10 18:35:57 +01:00
Glowbal
0394ea56b4 Increment build 2016-11-09 22:07:07 +01:00
Glowbal
3417c433fd Prep v3.8.2 2016-11-09 22:06:48 +01:00
commy2
9e6ee0363d fix tripflares script error (#4647) 2016-11-09 21:56:57 +01:00
PabstMirror
0975a4f004 MedicalAI - Fix treatment animion with no weapon (#4633) 2016-11-09 21:56:26 +01:00
ulteq
a43b70fe89 Added 20rnd 6.5 Creedmor and 6.5 Lapua Scenar mags
* Fixed incorrect QBU-88 (DMR_07_base_F) initSpeed
2016-11-09 21:55:39 +01:00
William Giokas
6a910e7fe4 ballistics: Added 20 round 6.5 Lapua and Creedmoor 2016-11-09 21:55:35 +01:00
ulteq
f2a85b63cf Fixed a typo 2016-11-09 21:54:20 +01:00
ulteq
962a296710 Minor corrections in the ballistics module
* Corrected AKS-U barrel length
* Corrected .338 250gr BC
* Corrected .338 API526 BC and muzzle velocity
* Slightly reduced 5.8x42mm muzzle velocity
2016-11-09 21:54:16 +01:00
Dystopian
272ec37603 Fix Full Repair menu not shown when damage returns 0 (#4621) 2016-11-09 21:53:21 +01:00
ulteq
c5322bff37 Fixes the ATragMX 'Done' button issue (#4617) 2016-11-09 21:52:32 +01:00
PabstMirror
910f975276 Fix ubc 2016-11-09 21:51:11 +01:00
PabstMirror
76dbdaaecf Add semi-colon 2016-11-09 21:51:08 +01:00
ulteq
298a90b68a Updates the ATragMX gun list 2016-11-09 21:51:05 +01:00
ulteq
91def9396c Updates the ballistics module to support Apex
* Made the new ammo types ready for advanced ballistics
* Made the new weapons ready for advanced ballistics
* Recalculated all initSpeed coefficients
* Updated the airFrictionAnalysis report
2016-11-09 21:51:01 +01:00
ulteq
eb6319641e Fix Kestrel4500 wind speed calculation (#4609) 2016-11-09 21:47:42 +01:00
PabstMirror
5463e9dff8 Merge branch 'master' into medical-rewrite 2016-11-09 13:12:42 -06:00
Dystopian
ff961a5bd6 Fix Full Repair menu not shown when damage returns 0 (#4621) 2016-11-09 13:11:47 -06:00
Karan Singh
09b89a0bbc Fix typo in Eden Options (#4615)
* Fix typo in Eden Options

This fixes a typo in line 25, ace_isMeidc_temp to ace_isMedic_temp

* Fix L13
2016-11-09 13:07:29 -06:00
commy2
370e746068 fix tripflares script error (#4647) 2016-11-09 13:02:48 -06:00
PabstMirror
20f40f8c55 Use single queue for blood cleanup (#4586) 2016-11-09 13:00:18 -06:00
BaerMitUmlaut
dac4a4dc42 Merged instant death and execution into one setting 2016-11-09 19:01:55 +01:00
BaerMitUmlaut
08a378bb2d Added execution system, improved instant death 2016-11-08 19:37:56 +01:00
ulteq
0580bdcc8e Added 20rnd 6.5 Creedmor and 6.5 Lapua Scenar mags
* Fixed incorrect QBU-88 (DMR_07_base_F) initSpeed
2016-11-08 09:34:48 +01:00
William Giokas
8c2b88da85 ballistics: Added 20 round 6.5 Lapua and Creedmoor 2016-11-08 09:34:48 +01:00
BaerMitUmlaut
928ded0e66 Fixed instant death and PREP 2016-11-07 23:46:10 +01:00
BaerMitUmlaut
ba9fc9240c Removed traces of old state machine 2016-11-07 23:44:33 +01:00
BaerMitUmlaut
0427814961 Started transition to CBA state machine, removed revive in favour of extended cardiac arrest 2016-11-07 22:21:07 +01:00
BaerMitUmlaut
a65f1d19fa Added state machine debug functionality 2016-11-07 22:19:55 +01:00
ulteq
51c12dba1d Allow adding gun list entries via config 2016-11-07 16:40:34 +01:00
ulteq
3f4564605b ATragMX - Implemented missing features
* Muzzle Velocity vs. Temperature Interpolation
* C1 Ballistic Coefficient vs. Distance Interpolation
* Coriolis and Spin drift output
* Options menu
* Truing Drop
---------------------------------
* Overworked default gun profiles
---------------------------------
* Fixed the Cancel buttons on the gun-, atmosphere- and target columns.
* Fixed some muzzle velocity entries in the default gun list.
* Fixed divide by zero error in the target range estimator
2016-11-07 16:40:34 +01:00
SilentSpike
e399597678 Clean some cook off code
- Use unary `createVehicle` syntax
- Removed some parenthesis
- Simpify 3den property condition
2016-11-06 12:29:37 +00:00
System98
6272b95acc Update chemlight translations
- Add missing commas to some chemlight-strings
2016-11-06 12:22:39 +01:00
System98
b0bf50c506 Unify and improve some german translations
- unify and improve some german translations
- fix a few typos
2016-11-06 10:10:36 +01:00
SilentSpike
5032619b9a Add cook off 3den setting to ammo boxes 2016-11-05 14:48:48 +00:00
SilentSpike
7de56ad9b5 Fix #4630
Not all explosives detonate on destruction, so their ammo config must be checked to see if they will.

ACE_Explosives adds a property to define the associated ammo which *will* detonate on destruction, which is used if present. Otherwise a generic small explosion happens.
2016-11-05 14:20:48 +00:00
System98
38be06c28c Typo fix
- fix another typo
2016-11-05 13:50:26 +01:00
System98
5376a3045b Fix typo
- Fiy typo in german translation
2016-11-05 13:43:57 +01:00
System98
7efe752f3c Update german translation
- Add missing german translations
2016-11-05 13:42:55 +01:00
PabstMirror
0746264905 MedicalAI - Fix treatment animion with no weapon (#4633) 2016-11-04 00:01:58 +01:00
jonpas
14c9cffb6a Prevent switching to weapon while carrying fuel nozzle - fix #4601 2016-11-02 18:44:39 +01:00
ulteq
aef7010d67 Fixes the ATragMX 'Done' button issue (#4617) 2016-11-02 18:05:19 +01:00
ulteq
71fe9bde7d Fixed a typo 2016-11-02 14:27:26 +01:00
ulteq
6a60770470 Minor corrections in the ballistics module
* Corrected AKS-U barrel length
* Corrected .338 250gr BC
* Corrected .338 API526 BC and muzzle velocity
* Slightly reduced 5.8x42mm muzzle velocity
2016-11-02 13:54:22 +01:00
ulteq
510622dfc9 Adds realistic names for the QBZ-95 camo variants
Green Hex and Hex variants of:
* QBZ-95-1
* QBZ-95-1 GL
* QBZ-95-1 LSW
2016-10-31 20:35:38 +01:00
ulteq
b91c4acca8 Merge pull request #4613 from acemod/realisticnames-apex-update
Adds realistic names for the QBZ-95 camo variants
2016-10-31 19:58:46 +01:00
ulteq
22ce12ec57 Merge pull request #4609 from acemod/kestrel4500-typo-fix
Fix Kestrel4500 wind speed calculation
2016-10-31 12:57:24 +01:00
ulteq
2e94c40a46 Merge pull request #4616 from acemod/apex-weapon-ballistics
Updates the ballistics module to support Apex
2016-10-31 12:57:02 +01:00
PabstMirror
ebd31168f4 Fix bleeding hit logic for enabledFor = 1 2016-10-30 20:45:02 -05:00
PabstMirror
866612b974 Merge branch 'master' into medical-rewrite
Conflicts:
	addons/medical_blood/XEH_postInit.sqf
2016-10-30 20:38:30 -05:00
PabstMirror
ace24d0282 Fix ubc 2016-10-30 18:46:55 -05:00
PabstMirror
9f56ba50c1 Add semi-colon 2016-10-30 18:43:43 -05:00
jonpas
657c790ee3 Allow checking dogtags inside vehicles and when sitting (#4619)
* Allow checking dogtag inside and when sitting

* Remove redundant format
2016-10-30 21:53:14 +01:00
jonpas
2222834c43 Allow checking dogtags inside vehicles and when sitting (#4619)
* Allow checking dogtag inside and when sitting

* Remove redundant format
2016-10-30 18:54:54 +01:00
Rebel
9ac12aaee8 Blocks AI getting back into the vehicle on cookoff (#4587)
* no message

* Header.

* Typo.

* Less code.

* New getPos syntax.

* leaveVehicle seems to work.

* Removed the second waypoint.

* Clear previous waypoints.

* Run away waypoint before others.

* Use arr select code

* Revert select. Use doMove.
2016-10-30 18:11:17 +01:00
commy2
357d5c119b remove scrollbars from javelin scope (#4618) 2016-10-30 18:10:40 +01:00
commy2
18e5fa2849 remove scrollbars from javelin scope (#4618) 2016-10-30 14:46:31 +01:00
Rebel
e84cdef817 Blocks AI getting back into the vehicle on cookoff (#4587)
* no message

* Header.

* Typo.

* Less code.

* New getPos syntax.

* leaveVehicle seems to work.

* Removed the second waypoint.

* Clear previous waypoints.

* Run away waypoint before others.

* Use arr select code

* Revert select. Use doMove.
2016-10-30 13:33:28 +01:00
ulteq
c3f967e365 Updates the ATragMX gun list 2016-10-30 12:26:15 +01:00
ulteq
14af5577c6 Updates the ballistics module to support Apex
* Made the new ammo types ready for advanced ballistics
* Made the new weapons ready for advanced ballistics
* Recalculated all initSpeed coefficients
* Updated the airFrictionAnalysis report
2016-10-30 09:02:55 +01:00
ulteq
0e364b0d48 Adds realistic names for the QBZ-95 camo variants
Green Hex and Hex variants of:
* QBZ-95-1
* QBZ-95-1 GL
* QBZ-95-1 LSW
2016-10-29 13:49:24 +02:00
ulteq
7b2d736ba3 Fix Kestrel4500 wind speed calculation
* Cosine was applied twice (on some screens)
2016-10-28 22:25:47 +02:00
PabstMirror
e1900d81bc Fix bleeding hit logic for enabledFor = 1 (#4585)
* Fix bleeding hit logic for enabledFor = 1

* Handle RC

* fix
2016-10-28 22:12:38 +02:00
PabstMirror
70439aaa9d Fix bleeding hit logic for enabledFor = 1 (#4585)
* Fix bleeding hit logic for enabledFor = 1

* Handle RC

* fix
2016-10-28 22:12:37 +02:00
commy2
eb38290aaf cookoff ammo selections default values (#4604)
* cookoff ammo selections default values

* Add missing subTurret cache for Wheeled APCs
2016-10-28 22:10:40 +02:00
commy2
416ab31610 cookoff ammo selections default values (#4604)
* cookoff ammo selections default values

* Add missing subTurret cache for Wheeled APCs
2016-10-28 22:10:31 +02:00
PabstMirror
7a95d66085 Remove repair locization warning (#4607) 2016-10-28 19:25:38 +02:00
PabstMirror
2df4a28145 Remove repair locization warning (#4607) 2016-10-28 12:16:23 -05:00
BaerMitUmlaut
60d98df5fc Fix makeJerryCan locality issues (#4600) 2016-10-27 22:19:55 +02:00
BaerMitUmlaut
945adf8fef Fix makeJerryCan locality issues (#4600) 2016-10-27 22:19:51 +02:00
PabstMirror
8c700cfd17 Cleanup map gesture sync / color mapping (#4486)
* Cleanup map gesture sync / color mapping

- Adds ace_common_fnc_setPlayerOwner which syncs player's owner var
- Redo publicVarClient with CBA's ownerEvent
- Remove old ace_settings
- Make color module run globaly
- Ad public ace_map_gestures_fnc_addGroupColorMapping

* fix return
2016-10-27 19:55:08 +02:00
PabstMirror
aeb0614e7e Cleanup map gesture sync / color mapping (#4486)
* Cleanup map gesture sync / color mapping

- Adds ace_common_fnc_setPlayerOwner which syncs player's owner var
- Redo publicVarClient with CBA's ownerEvent
- Remove old ace_settings
- Make color module run globaly
- Ad public ace_map_gestures_fnc_addGroupColorMapping

* fix return
2016-10-27 19:54:58 +02:00
Ozan Eğitmen
49b5a0ea86 Cleanup Frag Component (#4581)
* Cleanup frag component

* Optimize fnc_addTrack

* Add additional cleanup

* Please work?

* Add more cleanup

* Fix script errors

* Fix/optimize spalling

* Add missing changes
2016-10-27 00:16:31 +02:00
Ozan Eğitmen
029b68526f Cleanup Frag Component (#4581)
* Cleanup frag component

* Optimize fnc_addTrack

* Add additional cleanup

* Please work?

* Add more cleanup

* Fix script errors

* Fix/optimize spalling

* Add missing changes
2016-10-27 00:16:28 +02:00
Glowbal
a13441fa85 Merge branch 'release'
Conflicts:
	addons/main/script_version.hpp
2016-10-25 20:33:25 +02:00
Glowbal
e1aa5b4292 Increment build 2016-10-25 20:27:34 +02:00
Glowbal
27eb30bdd8 Prep 3.8.1 2016-10-25 20:16:16 +02:00
Glowbal
d2f485329f Update make.py to 0.8 (#4579) 2016-10-25 20:11:57 +02:00
jonpas
ffd1f0aff2 Update make.py to 0.8 (#4579)
* Update make.py to 0.8

* Remove redundant extras folder obsolete handling

* Fix version updating in files when version changes number of digits

* Satisfy bux
2016-10-25 20:11:05 +02:00
PabstMirror
eeb482eb7e #4557 - Fix warning about bad func type (#4582) 2016-10-22 10:57:49 +02:00
PabstMirror
fc15ab9cf0 #4557 - Fix warning about bad func type (#4582) 2016-10-22 10:56:26 +02:00
PabstMirror
23568609a6 Faster, non movment blocking gesture for tap shoulder (#4578)
Close #4577
2016-10-20 23:44:34 +02:00
Glowbal
1390b845d4 Prep 3.8.1 patch 2016-10-20 19:45:40 +02:00
PabstMirror
89d6fefff1 Sanatize damage value used for blood creation (#4574)
Fix #4571
2016-10-20 19:44:16 +02:00
PabstMirror
f2746891af Sanatize damage value used for blood creation (#4574)
Fix #4571
2016-10-20 19:43:52 +02:00
commy2
347be3c222 handle vehicle crashes and add wounds for fall damage 2016-10-20 15:02:24 +02:00
commy2
576a63c27e Merge branch 'master' of https://github.com/acemod/ACE3 into medical-rewrite 2016-10-20 13:56:56 +02:00
commy2
fc39ac14b7 don't knock out if pain is removed 2016-10-20 13:49:52 +02:00
commy2
be56b4d806 knock out due to pain 2016-10-20 13:46:28 +02:00
commy2
370faf9b48 cleanup 2016-10-20 13:38:26 +02:00
commy2
0370a34672 remove some debug 2016-10-20 12:43:57 +02:00
commy2
7e498ab762 setting for basic/advanced syringes 2016-10-20 02:14:11 +02:00
Glowbal
b150f440e6 Prep 3.8.0 Release 2016-10-18 21:57:40 +02:00
Glowbal
d867805406 Prepare v3.8.0 RC3 2016-10-18 20:25:45 +02:00
jonpas
877944ddce Fix 3rd party air and sea vehicle fuel capacity (#4554)
* Fix fuel capacity for air vehicles

* Sea vehicles as well, minor empty classes cleanup
2016-10-18 20:21:27 +02:00
classicarma
19fe4016e5 Japanese translations (#4553) 2016-10-18 20:19:29 +02:00
PabstMirror
63f3673a65 Missile Guidance Overhaul 2016-10-17 16:08:23 -05:00
PabstMirror
5ae8145234 Don't show dogtag ID in action menu (#4558)
#4476
2016-10-17 10:55:42 +02:00
commy2
519ea25fc7 cleanup 2016-10-15 13:48:13 +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
commy2
633c6f0ce4 formating 2016-10-13 21:21:42 +02:00
commy2
6b84bd1ff6 fix misc. treatment actions 2016-10-13 21:11:13 +02:00
commy2
e03614757e fix misc. treatment actions 2016-10-13 21:08:41 +02:00
commy2
03fe2826dd remove some debug 2016-10-13 20:31:39 +02:00
commy2
f2dfc6dc0e fixes, tweaks 2016-10-13 20:17:21 +02:00
commy2
bc4c1787f9 show tourniquets in 3d menu 2016-10-13 19:05:29 +02:00
commy2
ba2d6fda8a treatment tweaks 2016-10-13 17:39:01 +02:00
commy2
fe2c6e8d85 basic <-> advanced 2016-10-13 17:14:43 +02:00
commy2
68d75beae6 manual merge 2016-10-13 16:56:57 +02:00
commy2
2d243d45f3 fix tourniquets 2016-10-13 10:28:28 +02:00
commy2
e1cbeeea16 fix tourniquets 2016-10-13 10:12:28 +02:00
commy2
18907adcd5 increase medical item mass to at least 100 grams 2016-10-13 09:48:58 +02:00
commy2
5965326ca1 merge basic and adv. bandage actions 2016-10-13 09:47:52 +02:00
commy2
b1f0af7e1c merge basic and adv. bandage actions 2016-10-13 09:10:08 +02:00
commy2
68d199c5b2 merge basic and adv. bandage actions 2016-10-13 02:05:14 +02:00
commy2
4a06d19ce4 merge basic and adv. bandage actions 2016-10-13 01:55:10 +02:00
commy2
fd6e46b622 make waking up rocket soldier kneel not stand 2016-10-13 01:42:32 +02:00
commy2
71884778dd animation fixes 2016-10-13 01:16:51 +02:00
commy2
e38845bf45 add ace_kill event handler 2016-10-12 23:20:22 +02:00
commy2
92fc4ec14b add a setting for 'basic' blood bags 2016-10-12 22:38:58 +02:00
commy2
a5d070f829 blood and unconsciousness fixes 2016-10-12 21:59:32 +02:00
commy2
be71e6fa7b Merge branch 'medical-rewrite-blood' into medical-rewrite 2016-10-12 04:05:50 +02:00
commy2
41dde51e8e Merge branch 'medical-rewrite-pain' into medical-rewrite 2016-10-12 03:19:48 +02:00
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