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,228 Commits 73 Branches 88 Tags 752 MiB
c486f17539
Commit Graph

11228 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
System98
6272b95acc Update chemlight translations 
- Add missing commas to some chemlight-strings
 2016-11-06 12:22:39 +01:00
System98
ac30aadb62 Merge remote-tracking branch 'refs/remotes/acemod/master' 2016-11-06 10:11:18 +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
jonpas
cb9c69186c Merge pull request #4640 from acemod/fixMakeArgs 
Fix make.py checkexternal argument documentation
 2016-11-05 20:44:00 +01:00
jonpas
43c2e299c9 Fix make.py checkexternal argument documentation 2016-11-05 20:10:08 +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
System98
a04aa31f21 Merge remote-tracking branch 'upstream/master' 
- Sync fork with ACE3
 2016-11-05 11:22:32 +01:00
bux578
0a047074e5 Merge pull request #4632 from acemod/acerep7 
Add ACEREP7
 2016-11-04 20:58:45 +01:00
bux578
f9f6afb8bb increase date 2016-11-04 20:16:35 +01:00
bux578
f23d96d455 fix typos, wording 2016-11-04 09:24:21 +01:00
PabstMirror
0746264905 MedicalAI - Fix treatment animion with no weapon (#4633) 2016-11-04 00:01:58 +01:00
bux578
d1d2796392 fix typos, improve medical rewrite cba text 2016-11-03 11:12:18 +01:00
bux578
0bfc476888 add second draft of acerep7 2016-11-03 10:54:20 +01:00
bux578
493613e1ed Merge branch 'master' into acerep7 2016-11-03 10:26:41 +01:00
bux578
21baf7fc1f Merge pull request #4624 from acemod/improve-dockerfile 
improve dockerfile
 2016-11-03 09:56:37 +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
e34d7dd268 Merge pull request #4627 from acemod/ballistics-minor-corrections 
Minor corrections in the ballistics module
 2016-11-02 14:47:44 +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
bux578
4ef3d9f063 improve dockerfile 2016-11-02 11:49:16 +01:00
bux578
7d3d3ad47d add first draft of acerep 2016-11-02 11:46:50 +01:00
jonpas
b5c967e504 Merge pull request #4622 from acemod/fixReleaseInfoWiki 
Fix make.py documentation lists
 2016-11-01 16:39:17 +01:00
jonpas
9e37dc1192 Fix make.py wiki lists 2016-11-01 13:50:00 +01:00
PabstMirror
e60df02758 Update CBA macros in tools (#4620) 2016-10-31 15:11:45 -05:00
ulteq
b2dfe956d7 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:37:53 +01:00
jonpas
2a9d76c2f8 Allow checking dogtags inside vehicles and when sitting (#4619) 
* Allow checking dogtag inside and when sitting

* Remove redundant format
 2016-10-31 20:36:26 +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
PabstMirror
6a7998d47d WebDoc Version to 3.8.1 (#4611) 
Close #4610
 2016-10-29 08:28: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