Commit Graph

14705 Commits

Author SHA1 Message Date
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
KoffeinFlummi
c8fd07a5ab Finalize FCS port 2015-01-13 22:51:02 +01:00
Garth L-H de Wet
66eeba7df1 Fixed small errors that expressed themselves when getting explosives in game. 2015-01-13 23:49:27 +02:00
commy2
2b348a94de fix that blank module 2015-01-13 22:47:46 +01:00
commy2
46a0fc5631 more macros for common 2015-01-13 22:32:56 +01:00
Garth L-H de Wet
0e09d5de67 Added the function's script_component.hpp that includes the correct file. To reduce potential pain areas if a rename occurs. 2015-01-13 23:21:31 +02: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
commy2
e071b2f684 fix macros in common' config 2015-01-13 20:56:02 +01:00
bux578
a29c48fd9a Merge remote-tracking branch 'origin' into agmNameTagsPort 2015-01-13 20:14:19 +01:00
bux578
7271e25c56 probably fixing config 2015-01-13 20:12:41 +01:00
PabstMirror
1648def53f first pass 2015-01-13 13:12:37 -06:00
bux578
b8d0f52544 probably fixing config 2015-01-13 20:10:30 +01:00
PabstMirror
629c0f92db Base Port 2015-01-13 12:32:05 -06:00
commy2
b7050a4a92 fixing macros 2015-01-13 19:31:26 +01:00
PabstMirror
20d44e4515 Changed \function scrippComp to link to base 2015-01-13 12:28:45 -06:00
commy2
270ff5535a fix interaction menu 2015-01-13 19:14:34 +01:00
Thomas Kooi
5a775176ef Port from Basic Ballistics wind deflection 2015-01-13 18:05:05 +01:00
commy2
2336b51e5b fix key input not working 2015-01-13 17:42:56 +01:00
Thomas Kooi
e575e6027e Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-01-13 17:35:53 +01:00
Thomas Kooi
21acccc228 Removed to_merge nametags folder (now called sys_nametags) 2015-01-13 17:35:39 +01:00
jaynus
cca61e95f8 initial commit. 2015-01-13 08:26:45 -08:00
commy2
039ae01594 fix some sqf errors 2015-01-13 17:08:49 +01:00