Commit Graph

5783 Commits

Author SHA1 Message Date
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
commy2
6b9c4d1700 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-01-13 16:38:39 +01:00
commy2
9efc1f9547 fix script errors 2015-01-13 16:38:21 +01:00
bux578
f2ef2fa886 core -> config 2015-01-13 16:32:15 +01:00
bux578
67c3c7e7c3 core -> common 2015-01-13 16:29:35 +01:00
bux578
eea6780e59 add more macros to np++ sh 2015-01-13 16:23:48 +01:00
bux578
a4a7318eae change np++ sh colors 2015-01-13 16:16:10 +01:00
bux578
46fe10658e notepad++ sh sqf cba
It's not really a tool ... i know
2015-01-13 15:56:02 +01:00
bux578
992b3f721b 4 spaces 2015-01-13 15:39:58 +01:00
bux578
41f843514f 4 spaces 2015-01-13 15:38:17 +01:00
bux578
2074e200d5 icon path fix 2015-01-13 15:33:29 +01:00
bux578
efe68df728 add stringtable 2015-01-13 15:29:55 +01:00
bux578
425be3a6c2 fixes and spaces 2015-01-13 15:28:03 +01:00
bux578
5ffe1fa3e5 Merge remote-tracking branch 'origin' into agmRespawnPort 2015-01-13 15:19:45 +01:00
bux578
cd74a5bb6a change sqf include to hpp
https://github.com/KoffeinFlummi/ACE3/pull/10#issuecomment-69745232
2015-01-13 15:17:12 +01:00
bux578
38ed800389 move ui folder, cleanup 2015-01-13 12:30:20 +01:00
bux578
069eb7860a cba'fied nametags 2015-01-13 12:29:13 +01:00
bux578
621625b48d init 2015-01-13 11:59:28 +01:00
Garth L-H de Wet
6d8708618a Wrapped BIS and CBA function calls in CALLSTACK.
Converted startTimer to CBA's perFrameEventHandler.
2015-01-13 12:13:43 +02:00
Garth L-H de Wet
43bac209d9 Changed EGVAR to not have spaces in macro call. 2015-01-13 12:12:59 +02:00
bux578
49f01a0fac fix switchUntis
forgot that little bugger
2015-01-13 10:53:04 +01:00
PabstMirror
073805148b Replace Spawn/Sleep in attach 2015-01-13 03:06:24 -06:00
ViperMaul
252b9f6790 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-01-12 23:20:26 -08:00