Commit Graph

8077 Commits

Author SHA1 Message Date
Nicolás Badano
c2fe2ed745 Merge pull request #8 from KoffeinFlummi/agmHearingPort
AGM hearing port
2015-01-14 00:32:21 -03:00
Nicolás Badano
40c43944fe hearing: make tinnitus disabable 2015-01-14 00:29:01 -03:00
jaynus
cbee108845 Merge pull request #14 from KoffeinFlummi/agmDisposablesPort
Port: AGM Disposables
2015-01-13 19:20:09 -08:00
PabstMirror
d3f5304f62 work 2015-01-13 21:17:34 -06:00
Nicolás Badano
71879acb79 hearing: ups, wrong triangle 2015-01-14 00:13:57 -03: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
Nicolás Badano
057be50cf6 hearing: skip first execution of the PFH 2015-01-14 00:08:17 -03:00
PabstMirror
341fb7b86f opps 2015-01-13 21:05:09 -06: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
Nicolás Badano
f082242485 hearing: buggy PFH 2015-01-13 23:34:55 -03:00
Nicolás Badano
cc7d67a150 Merge branch 'agmHearingPort' of https://github.com/KoffeinFlummi/ACE3.git into agmHearingPort
Conflicts:
	addons/hearing/CfgSounds.hpp
	addons/hearing/CfgWeapons.hpp
	addons/hearing/script_component.hpp
2015-01-13 23:19:00 -03:00
Nicolás Badano
5e4a78a1bc hearing: replaced spawn by PFH 2015-01-13 23:16:55 -03:00
Nicolás Badano
319e772832 hearing: tweaks 2015-01-13 23:07:50 -03:00
PabstMirror
a78f508551 compiling, still need to test 2015-01-13 20:07:31 -06:00
Nicolás Badano
b9c2af8dfe hearing: final fixes 2015-01-13 23:00:48 -03:00
PabstMirror
2df8f4f1fb Cleanup old AGM 2015-01-13 19:57:15 -06:00
Nicolás Badano
e7c3b0db18 hearing: various fixes 2015-01-13 22:41:53 -03:00
jaynus
01f16be76b Merge pull request #4 from KoffeinFlummi/agmExplosivesPort
Ported AGM_Explosives to ace.
2015-01-13 17:41:32 -08:00
PabstMirror
c550d5dab6 remove debug and add sanity checks 2015-01-13 19:38:00 -06:00
jaynus
c85cc6a15e Merge remote-tracking branch 'origin/agmRespawnPort' 2015-01-13 17:33:08 -08:00
jaynus
7622f3daea Fixed and working. 2015-01-13 17:32:27 -08:00
Nicolás Badano
5af4f1ed53 Merge branch 'master' into agmHearingPort 2015-01-13 22:31:06 -03:00
PabstMirror
de51a61180 convert spawn to perFrame 2015-01-13 19:30:25 -06: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
Nicolás Badano
d0f56f44ab overheating: final fixes 2015-01-13 22:26:55 -03:00
jaynus
6966700a06 Remove jav debug 2015-01-13 17:21:14 -08:00
jaynus
1f8eac7b11 Merge branch 'master' into agmRespawnPort 2015-01-13 17:12:18 -08:00
jaynus
e1dd6e54c3 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-01-13 16:51:17 -08:00
jaynus
facc4304c6 Merge remote-tracking branch 'origin/agmNameTagsPort' 2015-01-13 16:47:35 -08:00
jaynus
db4f88261d nametags fixed. 2015-01-13 16:47:23 -08:00
commy2
fa4a591fbe add some missing pboprefix 2015-01-14 01:40:11 +01:00
Nicolás Badano
81e603bf35 Merge branch 'master' into agmOverheatingPort 2015-01-13 21:38:57 -03:00
commy2
feb988698f fix auto putting mx sw on back 2015-01-14 01:24:05 +01: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
Nicolás Badano
a97b767283 overheating: ironing out bugs 2015-01-13 21:07:32 -03:00
commy2
bed800daa5 port aircraft 2015-01-14 00:52:37 +01:00
Nou
f275969465 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-01-13 15:27:49 -08:00
Nou
f90b23b4f6 Added network event handlers, ref ticket #12. 2015-01-13 15:27:42 -08:00
Nicolás Badano
67ca93a5f8 Merge branch 'master' into agmOverheatingPort 2015-01-13 20:20:56 -03:00
Nicolás Badano
d4bcc413b0 Replace tags in attach 2015-01-13 20:07:52 -03:00
Nicolás Badano
46cf9a194a Extract stuff out of attach config.cpp 2015-01-13 20:03:12 -03:00
Nicolás Badano
e53ed960dd Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3.git 2015-01-13 20:00:36 -03:00
Nicolás Badano
e090119d82 Tag replacements in attach 2015-01-13 20:00:31 -03:00
Nicolás Badano
e24d6aa42f Fix in interaction menu for attaching 2015-01-13 19:59:16 -03:00
commy2
ee7ae79f15 fix key release issues 2015-01-13 23:54:21 +01:00
PabstMirror
78d9ce6d7d needs testing 2015-01-13 16:53:48 -06:00
Felix Wiegand
da943e7c48 Merge pull request #5 from KoffeinFlummi/agm-fcs-port
First port of AGM_FireControlSystem
2015-01-13 22:51:38 +01:00