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 |
|
PabstMirror
|
ccb30e0a47
|
use master pfh for frag
|
2015-06-16 22:39:37 -05:00 |
|
Macusercom
|
ed4fbb5d33
|
More corrections
|
2015-06-16 23:19:47 +02:00 |
|
Macusercom
|
cf2f36a775
|
Corrections suggested by others
|
2015-06-16 23:17:34 +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 |
|
Macusercom
|
f1691f2562
|
Fixed a typo
|
2015-06-16 03:23:32 +02:00 |
|
Macusercom
|
24cea18ae5
|
Revert "Revert "Added German translations""
This reverts commit 4403e3c665.
|
2015-06-16 03:21:25 +02:00 |
|
Macusercom
|
09f7473d7b
|
Added German translations
|
2015-06-16 03:06:47 +02:00 |
|
Macusercom
|
4403e3c665
|
Revert "Added German translations"
This reverts commit 0adc07d284.
|
2015-06-16 03:06:23 +02:00 |
|
Macusercom
|
0adc07d284
|
Added German translations
|
2015-06-16 03:06:13 +02:00 |
|
Christoph
|
7fdbc66c48
|
Merge pull request #1 from acemod/master
Update from upstream
|
2015-06-16 02:30:39 +02: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 |
|
ulteq
|
3c775b19ba
|
CUP weapon config improvement:
* Adjusted magazine initSpeed values
* Adjusted weapon initSpeed coefficients
* Recalculated all airFriction values
* Added missing ace configs to some classes
|
2015-06-14 17:46:46 +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 |
|
ulteq
|
32f02b72a5
|
Fixed missing 'HitEngine' RPT warning.
|
2015-06-14 13:57:38 +02: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 |
|
ulteq
|
14fd5c930b
|
You can no longer connect to destroyed HuntIR cameras
|
2015-06-14 12:54:10 +02:00 |
|
ulteq
|
af2e2f71fd
|
Added 'parachute' and 'camera' hitpoints to the HuntIR model:
* You can now shoot the parachute to make it fall faster
* And you can shoot the camera to kill the video feed
|
2015-06-14 12:25:56 +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
|
bb414dd10f
|
Redo Some UI - Try to fix vectorUp problems
|
2015-06-14 00:52:30 -05: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 |
|
jonpas
|
1eeca28a3d
|
Enabled DAGR, Kestrel4500, Laser switching, Mag Repack, Markers, MicroDAGR, NVG Adjusting and Check Ammo while Sitting
|
2015-06-13 22:08:13 +02:00 |
|
PabstMirror
|
4a8344e1a4
|
Merge branch 'master' into userActionPrototype
Conflicts:
addons/interact_menu/ACE_Settings.hpp
addons/interact_menu/stringtable.xml
extensions/CMakeLists.txt
|
2015-06-13 15:05:57 -05:00 |
|
PabstMirror
|
f811fc797e
|
Suppress optionsmenu debug
|
2015-06-13 15:03:22 -05:00 |
|