Commit Graph

91 Commits

Author SHA1 Message Date
bux578
632a3f5e0a Merge branch 'master' into agmScopesPort 2015-01-18 08:18:24 +01:00
commy2
14745af70b port difficulties 2015-01-18 08:06:25 +01:00
commy2
06f39aa158 port lock backpacks 2015-01-18 07:56:09 +01:00
commy2
e67602d76e port movement 2015-01-18 06:45:28 +01:00
Nicolás Badano
daec785600 AGM_Smallarms pre CBA 2015-01-17 18:02:03 -03:00
Nicolás Badano
7c41eb04e9 AGM_SafeMode pre CBA 2015-01-17 17:01:47 -03:00
Nicolás Badano
9a790a229a Merge branch 'agmMapPort' of github.com:KoffeinFlummi/ACE3 2015-01-17 15:24:46 -03:00
bux578
68b56d9161 Merge branch 'master' into agmScopesPort 2015-01-17 19:14:33 +01:00
Nicolás Badano
6bee456aff Merge pull request #24 from KoffeinFlummi/agmGrenadesPort
Port: AGM Grenades
2015-01-17 15:05:15 -03:00
commy2
7a6d0eefe3 port weapon select 2015-01-17 18:26:51 +01:00
bux578
79695f00e9 Merge remote-tracking branch 'origin' into agmScopesPort 2015-01-17 09:22:34 +01:00
PabstMirror
853dfba86a Merge branch 'master' into agmGrenadesPort 2015-01-17 00:15:07 -06:00
Nicolás Badano
7fd578326f Merge pull request #47 from KoffeinFlummi/agmGForcesPort
Port: AGM_GForces
2015-01-17 01:15:52 -03:00
Nicolás Badano
f594198eae gforces: port from AGM 2015-01-16 23:01:41 -03:00
PabstMirror
e260ea5314 Merge branch 'master' into agmMapPort 2015-01-16 19:21:03 -06:00
PabstMirror
2483e8f8d8 Merge branch 'master' into agmMapPort 2015-01-16 17:17:48 -06:00
commy2
d66b78bdd5 infoDisplayChanged via addEventHandler 2015-01-16 23:13:51 +01:00
Nicolás Badano
7883389a53 Merge branch 'master' of git@github.com:KoffeinFlummi/ACE3.git into agmNightVisionPort 2015-01-16 14:35:52 -03:00
commy2
7cd2bc24c8 port magazinerepack 2015-01-16 15:37:32 +01:00
Nicolás Badano
cf08d8cfa6 Merge branch 'master' of git@github.com:KoffeinFlummi/ACE3.git 2015-01-16 11:02:30 -03:00
Nicolás Badano
96d78d07b9 Merge branch 'agmNoRadio' of git@github.com:KoffeinFlummi/ACE3.git into agmPortNoRadio 2015-01-16 10:48:16 -03:00
commy2
9219909ec7 port vehicles 2015-01-16 14:20:41 +01:00
bux578
b556097896 cbafyied scopes
still lots of spawns and waitUntils in there
2015-01-16 13:15:14 +01:00
commy2
18c9c589c8 port reload 2015-01-16 02:25:41 +01:00
Nicolás Badano
e377cd0229 AGM_Resting pre CBA 2015-01-15 19:07:19 -03:00
PabstMirror
e52457bfbc AGM Map Base 2015-01-15 02:36:48 -06:00
KoffeinFlummi
ccc3b9d076 Port AGM_Recoil 2015-01-14 21:29:35 +01:00
KoffeinFlummi
4f4c9ab1b4 Move inventory to addons 2015-01-14 09:23:41 +01:00
PabstMirror
7ead73bc1f AGM Grenades Base 2015-01-14 01:55:23 -06:00
commy2
5636721717 try to port that vector 2015-01-14 07:24:17 +01:00
Nicolás Badano
46cb15e831 AGM_Backblast pre CBA 2015-01-14 01:15:06 -03:00
Nicolás Badano
c2fe2ed745 Merge pull request #8 from KoffeinFlummi/agmHearingPort
AGM hearing port
2015-01-14 00:32:21 -03:00
jaynus
cbee108845 Merge pull request #14 from KoffeinFlummi/agmDisposablesPort
Port: AGM Disposables
2015-01-13 19:20:09 -08:00
Nicolás Badano
0f4d8bc82f Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3.git into agmHearingPort 2015-01-14 00:09:27 -03:00
PabstMirror
bcd4a72013 Base No Radio 2015-01-13 21:04:25 -06:00
commy2
9c99eee461 port ballistics 2015-01-14 04:02:48 +01:00
jaynus
01f16be76b Merge pull request #4 from KoffeinFlummi/agmExplosivesPort
Ported AGM_Explosives to ace.
2015-01-13 17:41:32 -08:00
jaynus
c85cc6a15e Merge remote-tracking branch 'origin/agmRespawnPort' 2015-01-13 17:33:08 -08:00
Nicolás Badano
5af4f1ed53 Merge branch 'master' into agmHearingPort 2015-01-13 22:31:06 -03:00
Nicolás Badano
99925a1ef0 Merge branch 'agmOverheatingPort' 2015-01-13 22:29:55 -03:00
Nicolás Badano
0ceefd893a Merge pull request #7 from KoffeinFlummi/agmOverheatingPort
AGM Overheating port
2015-01-13 22:28:38 -03:00
jaynus
1f8eac7b11 Merge branch 'master' into agmRespawnPort 2015-01-13 17:12:18 -08:00
Nicolás Badano
81e603bf35 Merge branch 'master' into agmOverheatingPort 2015-01-13 21:38:57 -03:00
jaynus
0937de0fa4 Merge branch 'master' into agmNameTagsPort 2015-01-13 16:19:48 -08:00
commy2
4e8daecb35 delete obolete stuff 2015-01-14 01:11:43 +01:00
commy2
bed800daa5 port aircraft 2015-01-14 00:52:37 +01:00
Nicolás Badano
67ca93a5f8 Merge branch 'master' into agmOverheatingPort 2015-01-13 20:20:56 -03:00
Garth L-H de Wet
e3466aaf8e Merge branch 'master' into agmExplosivesPort 2015-01-13 23:17:20 +02:00
KoffeinFlummi
2b54f53ff0 Merge branch 'master' into agm-fcs-port 2015-01-13 22:06:30 +01:00
bux578
a29c48fd9a Merge remote-tracking branch 'origin' into agmNameTagsPort 2015-01-13 20:14:19 +01:00