Glowbal
|
0631a6ae7d
|
Merge pull request #1647 from acemod/medicalStringtableFix
Fixes: #1646
|
2015-06-18 08:34:42 +02:00 |
|
Glowbal
|
160d659523
|
Merge pull request #1656 from acemod/wireCutterCwire
Add concertinawire to wirecutters
|
2015-06-18 08:34:02 +02:00 |
|
ViperMaul
|
7207aef5c2
|
Update proper file size for 3.1.1.zip
|
2015-06-17 19:24:44 -07:00 |
|
ViperMaul
|
85c40a4cf2
|
Merge pull request #1668 from acemod/release
Release v3.1.1 merge into Master
|
2015-06-17 19:15:35 -07:00 |
|
ViperMaul
|
bab33bfbe2
|
Bump the build number from 0 to 1
|
2015-06-17 08:15:19 -07:00 |
|
ViperMaul
|
6ee0672ba2
|
Update mod.cpp and readme to version 3.1.1
#1651
|
2015-06-17 07:52:30 -07:00 |
|
ViperMaul
|
e5a5832cac
|
Merge branch 'release' of https://github.com/KoffeinFlummi/ACE3 into release
|
2015-06-16 22:43:46 -07:00 |
|
ViperMaul
|
47ef53201a
|
Set version number to 3.1.1
|
2015-06-16 22:41:04 -07:00 |
|
Glowbal
|
a8998690ea
|
Merge pull request #1650 from acemod/tacticalladderFixes
Fixed model.cfg and requiredAddons
|
2015-06-17 07:36:01 +02:00 |
|
Glowbal
|
d87ce29847
|
Merge pull request #1640 from acemod/fix-ab-extension
New build of the AB extension
|
2015-06-17 07:19:12 +02:00 |
|
ulteq
|
82d80359d1
|
Fixes: https://github.com/acemod/ACE3/issues/1646
|
2015-06-16 21:57:12 +02:00 |
|
Nicolás Badano
|
2afcf92643
|
Merge pull request #1440 from legman/akalegman
IED Class Inheritance Fixes
|
2015-06-16 13:35:19 -03:00 |
|
Glowbal
|
6374a39edb
|
Fixed extra [
|
2015-06-16 17:08:39 +02:00 |
|
Glowbal
|
e701f35b7b
|
Build extension with strcpy instead of sprintf
|
2015-06-16 08:04:05 +02:00 |
|
Glowbal
|
154cf9d032
|
strcpy instead of sprintf
|
2015-06-16 08:03:11 +02:00 |
|
PabstMirror
|
196f3bd86b
|
Add concertinawire to wirecutters
|
2015-06-15 23:59:21 -05:00 |
|
Glowbal
|
b6b203b57f
|
New build of the AB extension
Might fix the avx issue
|
2015-06-15 22:30:22 +02:00 |
|
AKALegman
|
c027db2e0e
|
final fixes
|
2015-06-15 20:55:49 +01:00 |
|
Nicolás Badano
|
fbf99224c4
|
Merge pull request #1635 from jonpas/fixCheckPBOkick
Fixed CheckPBO Kick
|
2015-06-15 15:43:28 -03:00 |
|
jonpas
|
04c06b51ed
|
Fixed #1632 - CheckPBOs kick serverCommand changed to display 46
|
2015-06-15 20:23:16 +02:00 |
|
Nicolás Badano
|
57ac97707a
|
Merge pull request #1633 from jonpas/checkPBOfix
Fixed checkPBO function not executing on server
|
2015-06-15 15:16:42 -03:00 |
|
jonpas
|
f61066f11a
|
Fixed checkPBO function not executing on server
|
2015-06-15 19:55:30 +02:00 |
|
Glowbal
|
f8aa9a3171
|
Merge pull request #1621 from acemod/hrIncrease
Medical - change hrIncrease random min/max
|
2015-06-15 10:42:43 +02:00 |
|
AKALegman
|
5915e24f5d
|
some fixes
|
2015-06-14 16:09:01 +01:00 |
|
Nicolás Badano
|
a730469868
|
Merge pull request #1623 from Legolasindar/master
Updated spanish translation
|
2015-06-14 11:57:49 -03:00 |
|
Ivan Navarro Cabello
|
76f7962dac
|
Updated spanish stringatable
Updated spanish stringatable for (Common, Medical, Optionsmenu,
Tacticalladder).
|
2015-06-14 13:52:55 +02:00 |
|
Legolasindar
|
4d598d27cd
|
Merge pull request #2 from acemod/master
update my master fork
|
2015-06-14 13:26:58 +02:00 |
|
PabstMirror
|
1c5788baab
|
Medical - change hrIncrease random min/max
|
2015-06-14 03:54:50 -05:00 |
|
ulteq
|
8d6b7de0ad
|
Fixed model.cfg and requiredAddons
|
2015-06-14 10:37:21 +02:00 |
|
AKALegman
|
0690e6f745
|
fixed conflicts
|
2015-06-14 09:36:03 +01:00 |
|
Glowbal
|
6d94f69cd8
|
Merge pull request #1620 from acemod/master
Master > release for upcoming release
|
2015-06-14 10:01:22 +02:00 |
|
ulteq
|
55fa94ebc4
|
Merge pull request #1619 from acemod/dagrMultipleDevices
DAGR now supports the new multiple devices framework
|
2015-06-14 09:59:20 +02:00 |
|
ulteq
|
906e365b94
|
DAGR now supports the new multiple devices framework
|
2015-06-14 09:59:06 +02:00 |
|
ulteq
|
48d8d5e076
|
Empty default keys for the DAGR to prevent conflicts
|
2015-06-14 09:38:25 +02:00 |
|
PabstMirror
|
dff99c4736
|
Tweak HTML Size
|
2015-06-13 20:41:57 -05:00 |
|
Glowbal
|
07ac512465
|
Merge pull request #1618 from acemod/add_sqf_assignWounds_backup
Adds a back up function in sqf to assign open wounds.
|
2015-06-13 23:39:42 +02:00 |
|
Glowbal
|
91b54bfc3a
|
Adds a back up function in sqf to assign open wounds.
|
2015-06-13 23:20:01 +02:00 |
|
Glowbal
|
8d30e3fde0
|
Build medical extension for new version.
|
2015-06-13 23:11:52 +02:00 |
|
ViperMaul
|
4c572ef298
|
Set version number to 3.1.0
|
2015-06-13 13:46:24 -07:00 |
|
PabstMirror
|
9300a92dd5
|
Merge pull request #1617 from jonpas/fixCellphoneDisplay
Fixed Black Cellphone Display after 1.46
|
2015-06-13 15:29:00 -05:00 |
|
Glowbal
|
973835fcd8
|
Merge pull request #1605 from acemod/Fix-injuryToAdd-Med-Extension
Fixed select new injuryToAdd always selects first
|
2015-06-13 22:28:33 +02:00 |
|
jonpas
|
670d23e14c
|
Fixed Black Cellphone Display after 1.46
|
2015-06-13 22:12:32 +02:00 |
|
PabstMirror
|
f811fc797e
|
Suppress optionsmenu debug
|
2015-06-13 15:03:22 -05:00 |
|
ViperMaul
|
1322da5537
|
Merge pull request #1587 from acemod/fixVehicleUnconcious
fix animation and consistently unload units from vehicle
|
2015-06-13 12:44:34 -07:00 |
|
ViperMaul
|
132ec343b0
|
Suppress debug
|
2015-06-13 12:39:29 -07:00 |
|
ViperMaul
|
911a18d169
|
Expand maxDistance for findEmptyPosition from 10 to 13 to support the GhostHawk
Convert ASLtoPosition
#1575 and #1577
|
2015-06-13 12:37:10 -07:00 |
|
PabstMirror
|
849a45d68b
|
DAGR - has item check
|
2015-06-13 14:29:34 -05:00 |
|
PabstMirror
|
b2d69611d7
|
Merge pull request #1118 from acemod/multipleDevices
Multiple Devices
|
2015-06-13 14:20:38 -05:00 |
|
PabstMirror
|
e7347be47b
|
Increase delete delay for attached IR grenades (#1615)
|
2015-06-13 14:08:25 -05:00 |
|
Nicolás Badano
|
d262dc790f
|
Merge pull request #1616 from acemod/addMk16ToClaymore
Make claymores detonatable by MK16. Close #1603
|
2015-06-13 16:07:56 -03:00 |
|