Commit Graph

5605 Commits

Author SHA1 Message Date
ViperMaul
7e6be08153 Improved unloading on roof tops
Less chance of patient being unloaded directly to the ground instead of the roof top where the helo has landed.
Probably not fool proof yet due to randomness. #1728
2015-06-23 16:11:00 -07:00
ViperMaul
6b6ad93848 Fix for unable to unload from driver seat.
Improvement for helo's on roof tops and boats.
#1728
2015-06-22 19:48:28 -07:00
ViperMaul
ce0bbe60d3 Merge pull request #1659 from jonpas/automateRelease
Automated version change and Zip acrhiving in make.py
2015-06-21 19:26:56 -07:00
Nicolás Badano
057759cb1e Merge pull request #1716 from SilentSpike/master
Fix for #1713
2015-06-21 21:59:02 -03:00
SilentSpike
27a4ecd747 Expanded readme 2015-06-22 00:43:39 +01:00
SilentSpike
378b39db77 Merge remote-tracking branch 'upstream/master' 2015-06-22 00:37:28 +01:00
SilentSpike
93f6c48acf Moved myself 2015-06-22 00:33:18 +01:00
SilentSpike
398f1c768f Fix the module on dedicated servers 2015-06-22 00:17:29 +01:00
SilentSpike
e3e415c727 Added readme 2015-06-21 23:46:23 +01:00
jonpas
91dc9f5f18 Added version argument to run version update, default will stash and restore changes to keep git work dir clean 2015-06-21 21:58:19 +02:00
PabstMirror
ce2a617c7b #1709 - Remove ACE_Comanche_Test from zeus 2015-06-21 13:00:51 -05:00
ulteq
8d1d0c5480 Merge pull request #1672 from acemod/hearingAmmoClassCaching
Improved config caching
2015-06-20 09:48:07 +02:00
jonpas
da9b5dd917 Merge branch 'master' into automateRelease 2015-06-19 16:44:37 +02:00
Garth "L-H" de Wet
7129cb34fd Merge pull request #1688 from acemod/explosiveUnderwaterInteraction
Enable interaction with explosives while swimming
2015-06-19 11:52:49 +02:00
ulteq
474e694309 Enable interaction with explosives while swimming 2015-06-19 11:49:38 +02:00
ViperMaul
4eb39989e2 Merge pull request #1684 from acemod/fixMakeBuildErrorWithNOBIN
make.py - Fix missing backup files forr $NOBIN$ situations
2015-06-18 17:48:45 -07:00
ViperMaul
c0cdcbab62 fixing missing backup files for config.cpp and $pboprefix$ in $NOBIN$ situations
#1682
2015-06-18 17:43:12 -07:00
ViperMaul
394bcafc4a Set version to 3.1.2 2015-06-18 15:49:27 -07:00
PabstMirror
d7717448fa #1670 - Laser pointer - pass _brightness to drawFnc 2015-06-18 17:16:53 -05:00
jonpas
4330caea9a Removed redundant check 2015-06-18 21:30:06 +02:00
jonpas
873f861dc8 Improved release command line argument handling, Revamped set_version_in_files to support both types of versions dynamically, Release archive using long version, old archive removal improved 2015-06-18 21:19:01 +02:00
ulteq
5d2905ca42 Improved config caching 2015-06-18 11:56:58 +02:00
ulteq
c3fea42bce Merge pull request #1622 from acemod/huntirHitpoints
Added 'parachute' and 'camera' hitpoints to the HuntIR model:
2015-06-18 11:03:15 +02:00
ulteq
95ae42ef41 Merge pull request #1671 from acemod/AceMiscBoxMissingItems
Added HuntIR and tactical ladder to ACE_Box_Misc
2015-06-18 11:02:28 +02:00
ulteq
bb877bc54c Added HuntIR and tactical ladder to ACE_Box_Misc 2015-06-18 11:02:04 +02:00
Glowbal
7b1015155c Merge pull request #1626 from acemod/cupCompatImprovment
CUP weapon config improvement:
2015-06-18 08:35:30 +02:00
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
jonpas
b708c5dd4e Fixed zipping the zip, improved zip name definition 2015-06-17 22:05:16 +02:00
jonpas
d210c3b009 Fixed make.py release zip archive 2015-06-17 21:21:35 +02:00
jonpas
59a3e1a451 Automated version change in make.py 2015-06-17 20:42:11 +02: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