ViperMaul
|
06932f0c03
|
Restore missing actionDragUnit function file
#1375
|
2015-05-24 15:14:11 -07:00 |
|
ViperMaul
|
4a12f53855
|
Merge pull request #1359 from jonpas/setupVars
Added maindir, projectdir and cba variables to setup.py
|
2015-05-24 13:13:58 -07:00 |
|
jonpas
|
0771ab21b6
|
Capitalized previously missed global
|
2015-05-24 22:12:56 +02:00 |
|
jonpas
|
88c57780fc
|
Capitalized globals
|
2015-05-24 22:09:28 +02:00 |
|
ViperMaul
|
84584fa0b0
|
Merge pull request #1358 from jonpas/buildVars
Added mainprefix and prefix variables to build.py
|
2015-05-24 13:08:31 -07:00 |
|
jonpas
|
72abe20f58
|
Capitalized globals
|
2015-05-24 22:07:12 +02:00 |
|
BullHorn
|
369499b5d0
|
Docs - installation - add optionals
|
2015-05-24 18:21:08 +03:00 |
|
jaynus
|
a69c6fd090
|
Merge pull request #1373 from acemod/rhsJavelinAmmoCompat
#1321 - Add MGuidance to RHS Javelin Ammo
|
2015-05-23 18:14:24 -07:00 |
|
ViperMaul
|
d471f1e261
|
Merge pull request #1355 from jonpas/makeRelPaths
Changed absolute make.py paths to read from variables
|
2015-05-23 13:06:32 -07:00 |
|
PabstMirror
|
22fe30b5a0
|
#1321 - Add MGuidance to RHS Javelin Ammo
We already set the weapon (rhs_weap_fgm148) to ace_javelin_enabled and
disable vanilla locking.
|
2015-05-23 14:22:15 -05:00 |
|
ulteq
|
7a0fd7cf24
|
Removed duplicate config entries
|
2015-05-23 19:04:29 +02:00 |
|
gienkov
|
00c5abecc2
|
Merge remote-tracking branch 'origin' into module-translations-2
Conflicts:
addons/viewdistance/ACE_Settings.hpp
addons/viewdistance/functions/fnc_changeViewDistance.sqf
|
2015-05-23 17:55:06 +02:00 |
|
ulteq
|
038885b10a
|
Merge pull request #1370 from acemod/missingConfigEntries2
Fixes broken scope config (#1312)
|
2015-05-23 17:08:01 +02:00 |
|
ulteq
|
ee022e1dea
|
Fixes broken scope config (#1312)
|
2015-05-23 17:06:46 +02:00 |
|
Glowbal
|
7170db5dc2
|
Merge pull request #1368 from acemod/medicalBloodBags
Medical blood bags size matters
|
2015-05-23 10:07:58 +02:00 |
|
PabstMirror
|
d82fcd1f96
|
Advanced - Bloodbag lookup by treatment not item
|
2015-05-23 01:26:13 -05:00 |
|
PabstMirror
|
d752dd50d0
|
Basic - Bloodbag size matters
|
2015-05-23 01:16:18 -05:00 |
|
bux578
|
04dd791374
|
Merge pull request #1367 from jonpas/stringtableABfix
Fixed missing close tag in Advanced Ballistics stringtable
|
2015-05-23 07:48:56 +02:00 |
|
PabstMirror
|
437db22ab8
|
#1364 - Prevent script error if bad muzzle
|
2015-05-22 23:38:16 -05:00 |
|
PabstMirror
|
e31a49283b
|
Merge branch 'master' into nameTagFixes
Conflicts:
addons/nametags/functions/fnc_drawNameTagIcon.sqf
|
2015-05-22 21:56:42 -05:00 |
|
jonpas
|
030b509ec5
|
Fixed missing close tag in Advanced Ballistics stringtable
|
2015-05-23 03:34:11 +02:00 |
|
Nicolás Badano
|
5e94e2c04b
|
Merge pull request #1366 from BullHorn7/docs
Docs: viewdistance
|
2015-05-22 22:00:12 -03:00 |
|
jonpas
|
8bf1abadb3
|
New-school .format, more absolutes changed to variables
|
2015-05-23 02:48:32 +02:00 |
|
jonpas
|
7cf64c7a52
|
New-school .format
|
2015-05-23 02:34:55 +02:00 |
|
jonpas
|
defe356940
|
New-school .format, Fixed prefix
|
2015-05-23 02:26:48 +02:00 |
|
BullHorn
|
658af43bb9
|
Update viewdistance.md
|
2015-05-23 03:08:56 +03:00 |
|
BullHorn
|
89fbf17d27
|
Docs: viewdistance - fix typo
|
2015-05-23 03:05:24 +03:00 |
|
BullHorn
|
b19bf8ce45
|
Docs: viewdistance - create .md, add to modules.md
|
2015-05-23 03:03:55 +03:00 |
|
PabstMirror
|
8fd0aef7d4
|
Medical - Fix Handle Damage
{} were unmatched so nothing ran.
I think this is just leftover from a merge.
|
2015-05-22 16:35:48 -05:00 |
|
Glowbal
|
48ed51b03c
|
Merge pull request #1361 from acemod/FixUnconsciousCondition
Medical - Fix Unconscious Condition
|
2015-05-22 22:39:18 +02:00 |
|
PabstMirror
|
f785fcc0d4
|
Merge pull request #1362 from acemod/timeHasComeToday
Fix Time Calc
|
2015-05-22 14:32:56 -05:00 |
|
PabstMirror
|
f4bf6ea26d
|
Fix Time Calc
|
2015-05-22 14:29:56 -05:00 |
|
PabstMirror
|
537bba1382
|
Medical - Fix Unconscious Condition
|
2015-05-22 13:56:45 -05:00 |
|
bux578
|
97a11f55fe
|
Merge pull request #1352 from BullHorn7/docs
Docs: installation - fix typo
|
2015-05-22 20:54:57 +02:00 |
|
ulteq
|
c1bf119cfb
|
Merge pull request #1360 from acemod/barrelLengthFix
Fixed incorrect barrel length.
|
2015-05-22 20:41:42 +02:00 |
|
ulteq
|
308b0aa0f9
|
Fixed incorrect barrel length.
|
2015-05-22 20:41:36 +02:00 |
|
jonpas
|
cc70d6808c
|
Added fulldir and cba variables to initial ouput text
|
2015-05-22 20:20:47 +02:00 |
|
jonpas
|
0b70c04468
|
Added maindir, projectdir and cba variables
|
2015-05-22 20:12:41 +02:00 |
|
jonpas
|
02580d510d
|
Added mainprefix and prefix variables
Fixed prefix variable values
|
2015-05-22 19:59:56 +02:00 |
|
jonpas
|
361cfc8802
|
Changed absolute make.py paths to read from variables
|
2015-05-22 19:21:29 +02:00 |
|
ulteq
|
9536423f2e
|
Merge pull request #1353 from acemod/cleanup_ATragMX_AB
Removed a deprecated function and fixed some typos.
|
2015-05-22 18:42:20 +02:00 |
|
ulteq
|
e88c570ef2
|
Removed a deprecated function and fixed some typos.
|
2015-05-22 18:42:09 +02:00 |
|
BullHorn
|
ee5ac320b0
|
Docs: installation - fix typo
Rename Arma3Sync to ArmA3Sync to represent the accurate name of the
software
|
2015-05-22 18:00:48 +03:00 |
|
jaynus
|
7913f27229
|
Merge branch 'master' of github.com:acemod/ACE3
|
2015-05-22 07:25:01 -07:00 |
|
jaynus
|
582ea318d4
|
Merge remote-tracking branch 'origin/superTime'
Conflicts:
addons/frag/functions/fnc_fired.sqf
addons/frag/functions/fnc_trackFragRound.sqf
|
2015-05-22 07:24:55 -07:00 |
|
Glowbal
|
2c00f7b11e
|
Merge pull request #1350 from BullHorn7/docs
Fix copypasta
|
2015-05-22 16:24:49 +02:00 |
|
Nicolás Badano
|
24542300f2
|
Merge pull request #1349 from BullHorn7/installation
Docs: Add zeus, add images to installation
|
2015-05-22 11:06:09 -03:00 |
|
BullHorn
|
c82b7dc6d6
|
Fix copypasta
|
2015-05-22 16:42:37 +03:00 |
|
BullHorn
|
a1dd0cfae5
|
Docs: installation - convert .png to .jpg
Edit the file extensions according to the edit done on gh-pages per bux'
request
|
2015-05-22 16:34:31 +03:00 |
|
BullHorn
|
690a800884
|
Merge remote-tracking branch 'upstream/master' into installation
|
2015-05-22 16:34:00 +03:00 |
|