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
6,322 Commits 73 Branches 88 Tags 752 MiB
be00f7ffe4
Commit Graph

6322 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SilentSpike
d2f7913c9f Merge pull request #2005 from jokoho48/codeCleanupZeus 
Code cleanup Zeus module
 2015-08-05 12:38:02 +01:00
Michael Braun
1b488a17b5 Fixed typo that slipped into the code 2015-08-05 08:36:01 +02:00
ViperMaul
78d4da85cd Updated version to 3.2.2 2015-08-04 21:36:03 -07:00
Michael Braun
441baf3f86 Fixed documentation typo in Vehicles module 2015-08-05 06:02:21 +02:00
jokoho48
24dd320c3c Updated parameterization in Captives module. 2015-08-05 01:15:20 +02:00
jokoho48
3ea545782f Updated parameterization in Attach module. 2015-08-05 00:47:31 +02:00
Michael Braun
1b7f7534da Small correction 2015-08-05 00:16:23 +02:00
Michael Braun
820d1c50a5 Small correction 2015-08-05 00:13:50 +02:00
Michael Braun
13b7e7ae72 Updated parameterization in Zeus module. 2015-08-05 00:10:54 +02:00
Michael Braun
d51d87ba2c Updated parameterization in Weaponselect module. 2015-08-04 23:35:47 +02:00
Michael Braun
ade6c99dac Updated parameterization in Viewdistance module. 2015-08-04 23:33:03 +02:00
Michael Braun
84be21c64e Updated parameterization in Vehicle module. 2015-08-04 23:30:51 +02:00
Michael Braun
2423798753 Updated parameterization in Vehiclelock module. 2015-08-04 23:18:29 +02:00
Glowbal
275b0c4300 Merge branch 'release' 
Conflicts:
	README.md
	addons/finger/stringtable.xml
 2015-08-04 22:29:05 +02:00
Glowbal
1ba4de7520 Merge pull request #1994 from acemod/improveHeadbugfix 
Improve headbugfix
 2015-08-04 21:13:03 +02:00
Glowbal
43f8c87387 Merge pull request #1972 from jokoho48/MedicalModelUpdate 
Medical Litter model update
 2015-08-04 20:06:51 +02:00
ViperMaul
8ac98ed950 Better immersion through using hideUnit 2015-08-04 07:43:42 -07:00
PabstMirror
b3741f4036 Capitalization for macro CBA_fnc_addPerFrameHandler 2015-08-04 02:34:38 -05:00
bux
3281998c44 remove old information center file 2015-08-04 09:11:38 +02:00
bux
ac393ebf2f rename information center 2015-08-04 09:10:08 +02:00
PabstMirror
710135ae3f Opps 2015-08-03 21:49:16 -05:00
PabstMirror
fa49842c53 #1866 - Restore weapon mode after treatment 2015-08-03 19:57:49 -05:00
PabstMirror
d1d9f521fe Merge pull request #1997 from acemod/someCSTRINGS 
Switch to some already translated CSTRINGs
 2015-08-03 16:27:00 -05:00
PabstMirror
3aa60c70fc Merge pull request #1998 from alganthe/doc_typos 
doc pass 9 typos fixed
 2015-08-03 16:26:35 -05:00
Josuan Albin
9e91c1e042 doc pass 9 typos fixed 
- Did some formatting.
- Fixed some typos
 2015-08-03 23:03:22 +02:00
PabstMirror
52130d5a45 Switch to some already translated CSTRINGs 2015-08-03 15:52:35 -05:00
PabstMirror
98649e2bdf Additional output to dumpPerformanceCounters 
For `[] call ace_common_fnc_dumpPerformanceCounters`   Requires `#define
ENABLE_PERFORMANCE_COUNTERS`
 2015-08-03 13:53:44 -05:00
PabstMirror
e7bf06fea2 Merge pull request #1944 from alganthe/documentation_pass_10 
Documentation pass 10
 2015-08-03 13:01:58 -05:00
PabstMirror
aeb649624c Merge pull request #1850 from alganthe/documentation_pass_9 
Documentation pass 9
 2015-08-03 12:25:01 -05:00
Josuan Albin
b8829fd873 documentation pass 9 2015-08-02 22:55:48 +02:00
ViperMaul
59a3e62d69 Attempt to improve the immersion of the magic 2015-08-02 10:44:49 -07:00
KoffeinFlummi
261cd42202 Merge branch 'pl-translation-4' of https://github.com/gienkov/ACE3 into polish-merge 2015-08-02 17:14:41 +02:00
KoffeinFlummi
8f848947ac Merge https://github.com/Clon1998/ACE3 into german-merge 2015-08-02 17:11:06 +02:00
ViperMaul
876a039e36 Disable headbugfix for Handcuffed/Surrender,unconscious,water surface and log the situation locally and on server. 2015-08-01 18:01:35 -07:00
Glowbal
19a4f3fbb1 Merge pull request #1954 from acemod/improve-adv-med-pain 
Improvement for handling minor levels of pain in advanced medical
 2015-08-01 19:05:47 +02:00
jokoho48
ee11622cd5 Fix Position 2015-08-01 16:10:08 +02:00
jokoho48
9d8daf84a4 add New Medical Models 2015-08-01 15:46:25 +02:00
SilentSpike
07845d5a89 Merge branch 'fixmodules' into release 2015-08-01 12:55:43 +01:00
SilentSpike
f6d8625fcb Transfer zeus module fixes from master into hotfix 2015-08-01 12:55:33 +01:00
Glowbal
02cfbeda8c Updated version to 3.2.1 2015-08-01 12:10:42 +02:00
Glowbal
b33d377b9d Merge pull request #1940 from acemod/fixRemoveAction 
#1939 - Fix Remove Action From Class
 2015-08-01 11:54:41 +02:00
PabstMirror
6ea1b95179 #1939 - Fix Remove Action From Class 2015-08-01 11:53:49 +02:00
Glowbal
45191d0d1e Merge pull request #1970 from acemod/PointingInstOfFinger 
PointingInsteadOfFinger
 2015-08-01 11:51:24 +02:00
bux578
1ad1a4b561 rename fingering to pointing 2015-08-01 11:49:28 +02:00
PabstMirror
fb34efdd04 Cleanup stringtable phrasing 2015-08-01 11:48:41 +02:00
Glowbal
a2eeff53a8 Merge pull request #1960 from acemod/laserHandleWeirdData 
Laser - Handle Bad Data Returns
 2015-08-01 11:41:04 +02:00
Glowbal
1878d448ae Merge pull request #1968 from acemod/fixBftModule321 
Fix BFT Module / Settings (for 3.2.1)
 2015-08-01 11:39:01 +02:00
Glowbal
d86bf458fc Merge pull request #1967 from acemod/fixWindDeflection-AB 
Fix Changes in Wind Deflection s in AB
 2015-08-01 11:38:07 +02:00
PabstMirror
efb1f356db Cleanup stringtable phrasing 2015-08-01 01:30:54 -05:00
PabstMirror
2d051188a7 #1957 - Fix BFT Module / Settings (for 3.2.1) 2015-08-01 00:01:33 -05:00