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 |
|
Garth "L-H" de Wet
|
3703394bae
|
Merge pull request #1340 from acemod/defuseObjectForAllExplosives
Defuse object for all explosives
|
2015-05-22 15:22:31 +02:00 |
|
BullHorn
|
6c5fb94d9b
|
Docs: missionmaker - add Zeus
Add Zeus module description to modules.md
|
2015-05-22 16:16:32 +03:00 |
|
BullHorn
|
2abafc5147
|
Docs: Add zeus.md and fix others
Add zeus.md for ACE3 Zeus feature/module
Fix standardization of vehiclelock.md, weather.md and windeflection.md
|
2015-05-22 15:51:36 +03:00 |
|
bux578
|
f71812c4ed
|
Merge pull request #1345 from BullHorn7/installation
Doc: Installation-guide - improve
|
2015-05-22 14:30:18 +02:00 |
|
BullHorn
|
c7f77a610f
|
Update installation-guide.md - add images
Add images for Vanilla and A3S launchers
|
2015-05-22 13:42:13 +03:00 |
|
BullHorn
|
c208bb3fce
|
Doc: Installation-guide - improve
Divide Installation process from Launch process
|
2015-05-22 12:54:00 +03:00 |
|
PabstMirror
|
72020a43f1
|
Privates / Remove Debug
|
2015-05-21 17:53:15 -05:00 |
|
PabstMirror
|
4e92a51cf8
|
Create Defuse Helpers for spawned Explosives
|
2015-05-21 17:47:54 -05:00 |
|
jaynus
|
46751fd912
|
Merge pull request #1163 from acemod/fragSpallOptimization
Frag spall optimization
|
2015-05-21 15:08:07 -07:00 |
|
jaynus
|
3cb4094429
|
Merge branch 'fragSpallOptimization' of github.com:acemod/ACE3 into fragSpallOptimization
|
2015-05-21 15:07:12 -07:00 |
|
jaynus
|
c297257421
|
Disable frag by default. Add @pabstmirror fix closes #1339 closes #820
|
2015-05-21 15:06:55 -07:00 |
|
Felix Wiegand
|
fd2676c7b9
|
Merge pull request #1135 from acemod/fcsPrivates
FCS - Privates
|
2015-05-21 22:18:14 +02:00 |
|
PabstMirror
|
6cd90d15e7
|
Merge pull request #1292 from alganthe/mk6mortar
mk6mortar and missing entries
|
2015-05-21 14:02:59 -05:00 |
|
Glowbal
|
8b69b3b1b1
|
Merge pull request #1332 from acemod/medicalBinocTreatment
Fix Script Error when treating with bincos
|
2015-05-21 20:20:41 +02:00 |
|
ulteq
|
c4bd97c016
|
Merge pull request #1338 from acemod/kestrelPersistentRefHeading
Persistent reference heading for the Kestrel 4500.
|
2015-05-21 19:29:13 +02:00 |
|
ulteq
|
24b2fea303
|
Persistent reference heading for the Kestrel 4500.
|
2015-05-21 19:28:59 +02:00 |
|
ulteq
|
90ffee4ce6
|
Merge pull request #1333 from acemod/negativeTailwinds
Tailwinds are displayed as negative values.
|
2015-05-21 19:18:43 +02:00 |
|
ulteq
|
1816208997
|
Proper Min/Max storing of negative tailwind values.
|
2015-05-21 19:18:15 +02:00 |
|
jaynus
|
c924baefd7
|
All instances of time and diagTicktime changed to ACE_time / ACE_diagTime.
|
2015-05-21 09:42:44 -07:00 |
|
jaynus
|
1f105a9596
|
Merge remote-tracking branch 'origin/master' into superTime
|
2015-05-21 09:36:20 -07:00 |
|
jaynus
|
f74eb31bbc
|
cross-platform compat integration for medical (history rewrite from gay merge).
|
2015-05-21 08:43:02 -07:00 |
|
bux578
|
4c5f20fa1a
|
shields.io is down atm
|
2015-05-21 17:12:30 +02:00 |
|
bux578
|
af5b7779b2
|
version update for readme.md
|
2015-05-21 17:07:29 +02:00 |
|
bux578
|
4f944bbf04
|
Merge pull request #1327 from BullHorn7/installation
Docs: Installation guide
|
2015-05-21 16:57:08 +02:00 |
|
Glowbal
|
a4e5bfff95
|
Merge pull request #1323 from gienkov/patch-18
Update medical guide
|
2015-05-21 12:31:06 +02:00 |
|
BullHorn
|
74d146078b
|
Update installation-guide.md - style
|
2015-05-21 13:22:09 +03:00 |
|
ulteq
|
db7c2a19e6
|
Tailwinds are displayed as negative values.
|
2015-05-21 11:14:37 +02:00 |
|
BullHorn
|
1054dc0654
|
Docs: installation - rename file
|
2015-05-21 10:44:52 +03:00 |
|
PabstMirror
|
1aa9520adb
|
Fix Script Error when treating with bincos
|
2015-05-20 23:24:44 -05:00 |
|
Nicolás Badano
|
72d955bc0c
|
Merge pull request #1328 from alef/master
Fixed: Removed § typo at the end of EH call
|
2015-05-20 19:01:52 -03:00 |
|