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
4,399 Commits 73 Branches 88 Tags 752 MiB
44466e8be8
Commit Graph

4399 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Grzegorz Sikora
44466e8be8 Remove tabs and repair errors @Glowbal found 
Conflicts:
	addons/map/CfgVehicles.hpp
	addons/medical/CfgVehicles.hpp

Conflicts:
	addons/map/CfgVehicles.hpp
	addons/medical/CfgVehicles.hpp
	addons/optionsmenu/stringtable.xml
 2015-05-12 18:27:27 +02:00
GieNkoV
5bbf875ef2 Tabs removed 
Conflicts:
	addons/missileguidance/stringtable.xml
	addons/optionsmenu/stringtable.xml
 2015-05-12 18:27:02 +02:00
Grzegorz Sikora
63c5308cd9 Missed one Yes/no to BOOL 2015-05-12 18:26:41 +02:00
Grzegorz Sikora
156bba3321 Yes/No to BOOL 
Conflicts:
	addons/common/CfgVehicles.hpp
	addons/common/stringtable.xml
	addons/explosives/stringtable.xml
	addons/hearing/CfgVehicles.hpp
	addons/hearing/stringtable.xml
	addons/interaction/stringtable.xml
	addons/map/CfgVehicles.hpp
	addons/map/stringtable.xml
	addons/medical/CfgVehicles.hpp
	addons/medical/stringtable.xml
	addons/nametags/stringtable.xml
	addons/respawn/stringtable.xml
	addons/switchunits/CfgVehicles.hpp
	addons/switchunits/stringtable.xml

Conflicts:
	addons/common/CfgVehicles.hpp
	addons/common/stringtable.xml
	addons/explosives/stringtable.xml
	addons/hearing/stringtable.xml
	addons/interaction/stringtable.xml
	addons/map/CfgVehicles.hpp
	addons/map/stringtable.xml
	addons/medical/CfgVehicles.hpp
	addons/medical/stringtable.xml
	addons/nametags/stringtable.xml
	addons/respawn/stringtable.xml
	addons/switchunits/CfgVehicles.hpp
	addons/switchunits/stringtable.xml
 2015-05-12 18:26:24 +02:00
Grzegorz Sikora
6a821715a0 Stringtable modules 
Conflicts:
	addons/missionmodules/CfgVehicles.hpp
	addons/respawn/CfgVehicles.hpp
 2015-05-12 18:25:40 +02:00
ViperMaul
ab580dd1c7 Set version number to 3.0.0.3 2015-05-12 07:08:45 -07:00
ViperMaul
66f5ed43c0 More help on certain errors in make.py 2015-05-12 07:05:48 -07:00
ViperMaul
89d19e817c Merge pull request #1114 from acemod/respawnMissingPBOPREFIX 
Added missing $PBOPREFIX$ for respawn
 2015-05-11 15:32:17 -07:00
ViperMaul
e75c4594e6 Added missing $PBOPREFIX$ for respawn 2015-05-11 15:17:44 -07:00
ViperMaul
f78b2ed598 Merge pull request #1110 from acemod/nobin_fixes 
Do not execute CfgConvert if $NOBIN$ is found.
 2015-05-11 14:37:27 -07:00
jaynus
8e7763af08 Removed: systemChat debug in captive 2015-05-11 13:50:24 -07:00
jaynus
991ecdfe01 Removed: Debug sidechat in laser seeker code. 2015-05-11 13:37:50 -07:00
ViperMaul
50abf64359 Do not execute CfgConvert if $NOBIN$ is found. 
#1107
 2015-05-11 12:53:49 -07:00
ViperMaul
0bb158bd14 Merge pull request #1109 from acemod/makeNewVersionStamping 
Make new version stamping
 2015-05-11 11:16:14 -07:00
ViperMaul
59d6e84fc0 Use abbreviated public key to minimize a BI bug. 
REFERENCE: http://feedback.arma3.com/view.php?id=22133
Always copy public key in case it is missing from the release folder.
#1105
 2015-05-11 10:43:05 -07:00
ViperMaul
5092d586fd Exception handling and clean up. 
#1105
 2015-05-11 10:06:40 -07:00
commy2
c0e2af2e66 quotes in config arrays 2015-05-11 18:50:04 +02:00
ViperMaul
a7a76d69ae Read ACE VERSION from main/script_mod.hpp 
#1105
 2015-05-11 09:48:47 -07:00
jaynus
192a02ce56 No really, change it. 2015-05-11 09:03:09 -07:00
jaynus
9660978b92 Changed: search for ace_server, not ace_serverconfig 2015-05-11 09:02:13 -07:00
jaynus
695e775cd7 Change 'ace_serverconfig' to 'ace_server' 2015-05-11 09:01:16 -07:00
ViperMaul
9c288ffa12 Merge pull request #1108 from acemod/missingPBOPREFIX 
Added missing PBOPREFIX files
 2015-05-11 08:54:03 -07:00
ulteq
0bae8471c5 Added more missing PBOPREFIX files 2015-05-11 17:43:48 +02:00
ViperMaul
b0051a6638 Merge pull request #1094 from acemod/fixUnSurrender 
Fix not being able to UnSurrender (currentWeapon)
 2015-05-11 08:39:39 -07:00
ViperMaul
4e1370cbc3 Merge pull request #1093 from acemod/fixDisarming 
Fix disarming
 2015-05-11 08:38:56 -07:00
ulteq
0b3d3b8793 Added missing PBOPREFIX files 2015-05-11 17:37:08 +02:00
ViperMaul
cf6846dac2 Improve exception handling 
#1105
 2015-05-11 00:34:32 -07:00
ViperMaul
46cabb14ad Remove unnecessary return so that it can move to the next PBO after missing $PBOPREFIX$ 
#1105
 2015-05-10 23:49:40 -07:00
jaynus
d6dde3c73f Merge pull request #1077 from acemod/fixSwitchUnits 
Fix switch units
 2015-05-10 23:38:56 -07:00
ViperMaul
d03203d3d5 remove debug 
#1105
 2015-05-10 22:20:29 -07:00
ViperMaul
0e36e56c1c Proper handling $PBOPREFIX$ backups and cleanup if canceled. 
#1105
 2015-05-10 22:12:57 -07:00
ViperMaul
4d56e6317c Warn builder for missing $PBOPREFIX$ 
#1105
 2015-05-10 19:58:32 -07:00
ViperMaul
097d0cb8ed Update $PBOPREFIX$ with Commit ID for each PBO 
#1105
 2015-05-10 19:44:24 -07:00
ViperMaul
2ffc38ddd2 Do not build common every time 
#1105
 2015-05-10 18:21:01 -07:00
ViperMaul
97105c5b07 Change ACE is version stamp. Example. You will now see ACE is version 3.0.0.2 
Initial prep for showing Commit ID for each PBO in #1105
 2015-05-10 18:16:27 -07:00
ulteq
9fe8d6f40a Merge pull request #1097 from acemod/dispersionFix 
Rifle dispersion overhaul:
 2015-05-11 00:31:23 +02:00
PabstMirror
2e91f45273 #1104 - Fix legend in editor 2015-05-10 16:57:05 -05:00
Glowbal
e6a8f0b295 Merge pull request #1103 from SilentSpike/medical_typofix 
Trivial variable name fix for moduleAssignMedicalVehicle function
 2015-05-10 22:37:54 +02:00
SilentSpike
eff5ce03d6 false -> 0 2015-05-10 20:58:17 +01:00
SilentSpike
518cfdab9e isMedic -> medicClass 2015-05-10 20:19:32 +01:00
ulteq
09c19e4ec2 Subtle recoil reduction when using a suppressor 2015-05-10 20:58:36 +02:00
SilentSpike
d321ed2753 Changed function variable to match other medical vehicle functions 2015-05-10 19:56:35 +01:00
ViperMaul
9be22ee8b5 Merge pull request #1088 from acemod/makeNOBIN_improvements 
Make Improvements
 2015-05-10 11:46:16 -07:00
ulteq
82f3c65c31 Tuned down the dispersion reduction of suppressors some more 2015-05-10 20:06:27 +02:00
ViperMaul
7012b32b55 Display the most likely resolution to the Error FAILED TO DETERMINE COMMIT ID. 2015-05-10 07:56:56 -07:00
KoffeinFlummi
f103a19920 Merge branch 'codingGuidelinesMacroListFix' of https://github.com/usecforce/ACE3 into doc-merge 2015-05-10 16:41:48 +02:00
ViperMaul
1cc5bd1c50 removing unneeded debug files 2015-05-10 07:41:24 -07:00
ulteq
235534292f Rifle dispersion overhaul: 
*Added dispersion values for the new marksmen rifles (when needed)
*Overworked some of the (ridiculous) existing values
*Made use of the vanilla values whenever possible
 2015-05-10 16:31:56 +02:00
KoffeinFlummi
2bb3a0f139 Cleanup #1095 
- Fix tabs
- Remove tabler comments
- Restore one removed Russian string
 2015-05-10 16:19:46 +02:00
KoffeinFlummi
9e982fe958 Merge branch 'translation/15bn/alef' of https://github.com/alef/ACE3 into italian-merge 2015-05-10 16:09:31 +02:00