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

4748 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
KoffeinFlummi
5f60321a69 Merge https://github.com/Legolasindar/ACE3 into spanish-merge 
Conflicts:
	addons/ballistics/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/medical/stringtable.xml
	addons/mk6mortar/stringtable.xml
 2015-05-01 17:12:00 +02:00
KoffeinFlummi
761e23001f Merge https://github.com/Dimaslg/ACE3 into spanish-merge 
Conflicts:
	addons/medical/stringtable.xml
	addons/missileguidance/stringtable.xml
	addons/optionsmenu/stringtable.xml
 2015-05-01 16:51:20 +02:00
ulteq
800ccc07f3 Removed duplicate code 2015-05-01 16:24:16 +02:00
Nicolás Badano
65dcbce25e Merge pull request #945 from acemod/revert-937-fcsMuzzleVelocityCorrection 
Revert "Takes negative initSpeed values into account"
 2015-05-01 11:07:57 -03:00
ulteq
3ad668605a Fix for last fcs change 2015-05-01 16:02:34 +02:00
jaynus
ce6e59b25e Merge pull request #926 from acemod/guidanceClassFixes 
Limit Titan & Javelin optic configs to only those weapons and disable inheritance for LAZY MOD MAKERS
 2015-05-01 07:00:08 -07:00
jaynus
e4567fb59f Merge remote-tracking branch 'origin/master' into guidanceClassFixes 
Conflicts:
	addons/javelin/functions/fnc_onOpticDraw.sqf
 2015-05-01 06:59:28 -07:00
jaynus
9997b6d464 action is select 1 2015-05-01 06:57:49 -07:00
Nicolás Badano
cde80b2901 Revert "Takes negative initSpeed values into account" 2015-05-01 10:38:41 -03:00
commy2
b255d1040b scope 1 for ACE_Comanche_Test, #943 2015-05-01 15:30:11 +02:00
FreeZbe
68d62b0005 Update stringtable.xml 2015-05-01 14:20:21 +02:00
FreeZbe
518614ec0b Update stringtable.xml 2015-05-01 14:20:03 +02:00
FreeZbe
79ac41bd95 Update stringtable.xml 2015-05-01 14:19:43 +02:00
bux578
bfb68fe368 fix spelling errors 2015-05-01 14:19:30 +02:00
FreeZbe
80ae016021 Update stringtable.xml 2015-05-01 14:19:15 +02:00
FreeZbe
acf74dd2ae Update stringtable.xml 2015-05-01 14:13:32 +02:00
FreeZbe
7a397459ae Update stringtable.xml 2015-05-01 14:13:08 +02:00
FreeZbe
371aa381ec Update stringtable.xml 2015-05-01 14:12:45 +02:00
FreeZbe
820c841b35 Update stringtable.xml 2015-05-01 14:12:10 +02:00
FreeZbe
53be70f661 French : update stringtable 2015-05-01 14:07:08 +02:00
ulteq
a6f4c68ef4 Removed obsolete comment 2015-05-01 13:50:01 +02:00
ulteq
6d0e2cc464 Merge pull request #936 from acemod/explosivesSleepReplacement 
Replaced sleep with waitAndExecute
 2015-05-01 12:55:14 +02:00
Glowbal
fbaf3ace90 Merge pull request #932 from acemod/modNameChange 
ACE3 Name Adjustment
 2015-05-01 12:44:41 +02:00
Glowbal
f0efba09e5 Merge pull request #814 from acemod/basic-med-options 
Basic medical module options
 2015-05-01 12:27:22 +02:00
ulteq
a9cde188ea Merge pull request #937 from acemod/fcsMuzzleVelocityCorrection 
Takes negative initSpeed values into account
 2015-05-01 12:24:22 +02:00
bux578
2acc10ba70 meh 2015-05-01 12:19:42 +02:00
Glowbal
e9a86da8e0 Should be in same order as the module 2015-05-01 12:18:21 +02:00
bux578
aa2e5077e4 missing german translation 2015-05-01 12:17:28 +02:00
ulteq
4c0bed609e Fixed a typo 2015-05-01 11:53:53 +02:00
Glowbal
5beca63ae2 Added missing private 2015-05-01 11:51:23 +02:00
ulteq
940f8e8349 Cleanup++: 
*Removed spawn
*Added, moved and renamed some privates
 2015-05-01 11:38:09 +02:00
commy2
437c3c0526 Merge pull request #939 from acemod/fixubc 
fix ubc, fix #938
 2015-05-01 11:22:53 +02:00
commy2
a97c934688 fix ubc, fix #938 2015-05-01 11:01:07 +02:00
ulteq
d3b36c2b56 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-05-01 10:26:48 +02:00
ulteq
723ffc21d1 Removed unneeded TODO 2015-05-01 10:26:37 +02:00
ulteq
2219339e24 Fixed a typo 2015-05-01 10:25:59 +02:00
ulteq
965e45a53c Takes negative initSpeed values into account 2015-05-01 10:25:33 +02:00
commy2
b859956604 rename category ace <blank> to ace common 2015-05-01 10:19:47 +02:00
PabstMirror
0f736ae684 GetDeathAnim 2015-05-01 03:13:26 -05:00
ulteq
e8264110bb Replaced sleep with waitAndExecute 2015-05-01 10:12:41 +02:00
commy2
6115b8d23e Merge branch '11thmeu-feature/laserpointer-3rdparty' 2015-05-01 09:52:12 +02:00
commy2
c52278c11f Merge branch 'feature/laserpointer-3rdparty' of https://github.com/11thmeu/ACE3 into 11thmeu-feature/laserpointer-3rdparty 2015-05-01 09:52:03 +02:00
Nicolás Badano
b4c057919e Merge pull request #935 from acemod/dynamicActionPositions 
Dynamic action positions
 2015-05-01 01:58:50 -03:00
esteldunedain
a0923aa5c3 Tweak the position for rally point actions. Fix #837 2015-05-01 01:57:37 -03:00
esteldunedain
324b9510e3 Allow positions for actions to be computed dynamically. Also leverage that for the position of the "Weapon" action, instead of hard coding an exception for that. 2015-05-01 01:56:39 -03:00
Nicolás Badano
9489cc9b18 Merge pull request #921 from acemod/interactMoreOptions 
Interact more options
 2015-05-01 00:32:59 -03:00
esteldunedain
fc02bb4e06 Stylistic changes 2015-05-01 00:32:16 -03:00
esteldunedain
aa4a5539d4 Merge branch 'master' into interactMoreOptions 
Conflicts:
	addons/interact_menu/functions/fnc_renderIcon.sqf
 2015-05-01 00:04:22 -03:00
Nicolás Badano
c38a4da68c Merge pull request #933 from acemod/break-line-name 
Rename breakLine to break_line
 2015-04-30 21:22:48 -03:00
KoffeinFlummi
984a1fe337 Rename breakLine to break_line 2015-05-01 02:14:23 +02:00