Commit Graph

287 Commits

Author SHA1 Message Date
commy2
95f550c360 spaces 2015-01-16 02:26:59 +01:00
commy2
18c9c589c8 port reload 2015-01-16 02:25:41 +01:00
Nicolás Badano
9bd5758e40 overheating: replace a spawn by a PFH 2015-01-15 22:00:01 -03:00
commy2
addc7feb40 vector, relative slope distance and relative azimuth + distance modes, spaghetti 2015-01-16 01:48:43 +01:00
Nicolás Badano
577e6c9672 Merge branch 'master' of git@github.com:KoffeinFlummi/ACE3.git 2015-01-15 20:44:53 -03:00
Nicolás Badano
cded65d9a9 resting: changed spawn for PFH, reorganized code 2015-01-15 20:42:46 -03:00
Nicolás Badano
4340becc43 Merge pull request #35 from KoffeinFlummi/agmRestingPort
AGM resting port
2015-01-15 19:36:22 -03:00
Nicolás Badano
f9de90c6f9 resting: port 2015-01-15 19:34:35 -03:00
Nicolás Badano
e377cd0229 AGM_Resting pre CBA 2015-01-15 19:07:19 -03:00
commy2
7785a9df75 changing macros, irl vector guide 2015-01-15 22:32:45 +01:00
Nicolás Badano
9cf9733850 interaction: fixed the modifier key 2015-01-15 17:15:39 -03:00
Nicolás Badano
a4a4ca39f6 explosives: fixed timer #26 2015-01-15 17:06:38 -03:00
Nicolás Badano
f06da9a8c1 explosives: missing include 2015-01-15 16:57:27 -03:00
Nicolás Badano
2091aedcbc Merge branch 'master' of git@github.com:KoffeinFlummi/ACE3.git 2015-01-15 16:13:53 -03:00
Nicolás Badano
1d5201c0d7 explosives: Fix #32 2015-01-15 16:13:12 -03:00
commy2
2eb547a52e some advanced vector modes, macros 2015-01-15 19:01:27 +01:00
Nicolás Badano
d1d12804f4 Merge branch 'master' of git@github.com:KoffeinFlummi/ACE3.git 2015-01-15 14:41:55 -03:00
Nicolás Badano
8f31dea752 common: various fixes. Fix #33 2015-01-15 14:41:22 -03:00
commy2
530e93414a vector height + distance mode 2015-01-15 17:24:19 +01:00
commy2
3e9785e145 vector azimuth+inclination mode 2015-01-15 16:40:06 +01:00
commy2
79426252a1 vector distance + azmimuth mode 2015-01-15 16:21:47 +01:00
commy2
bc43ee5136 get the vector to work, wip 2015-01-15 07:18:57 +01:00
Nou
d281caffbe Added ACRE2's hash and hash lists. 2015-01-14 13:29:52 -08:00
Nou
5c039a4ffd Variable misnamed for event holder! 2015-01-14 12:55:44 -08:00
Nou
9a37538d50 More event handler changes! Added removeEventHandler and removeAllEventHandler, changed name from addNetEventHandler to addEventHandler, and added a localEvent function. 2015-01-14 12:44:32 -08:00
KoffeinFlummi
ccc3b9d076 Port AGM_Recoil 2015-01-14 21:29:35 +01:00
KoffeinFlummi
3a44b58b5f Add PBOPREFIX to inventory 2015-01-14 21:14:53 +01:00
KoffeinFlummi
bda6afabb7 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-01-14 21:11:51 +01:00
KoffeinFlummi
b704ce5cba Merge branch 'agmInventoryPort' 2015-01-14 21:11:31 +01:00
commy2
cbc71329d2 SETPVAR instead of SETGVAR 2015-01-14 21:09:33 +01:00
KoffeinFlummi
d567785518 Change FCS indentation to 4 spaces 2015-01-14 21:07:41 +01:00
KoffeinFlummi
66b33590d5 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-01-14 21:07:08 +01:00
KoffeinFlummi
5c5c49519a Fix vector texture paths; Fix #21 2015-01-14 21:06:45 +01:00
PabstMirror
1927d6ba36 Script Comp Fix 2015-01-14 13:51:03 -06:00
commy2
3bf0b772bb Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-01-14 20:39:18 +01:00
commy2
ddbc54b992 add getVariable, setVariable macros 2015-01-14 20:38:59 +01:00
PabstMirror
614dced0fa DEBUG_SETTINGS in script comps 2015-01-14 12:34:24 -06:00
PabstMirror
ad47b9a5df fix scriptComponent.hpp 2015-01-14 12:24:09 -06:00
bux578
de8ca47e88 change some core to common 2015-01-14 14:28:04 +01:00
Nicolás Badano
c16c5e756c explosives: fixes 2015-01-14 10:13:04 -03:00
Nicolás Badano
fcbabc1388 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3.git 2015-01-14 10:12:34 -03:00
Nicolás Badano
167497ec2f small fixes for explosives and interaction 2015-01-14 10:11:46 -03:00
PabstMirror
7b49e06b0d Fix config 2015-01-14 05:21:47 -06:00
KoffeinFlummi
250050129b CBAify inventory 2015-01-14 09:45:20 +01:00
KoffeinFlummi
4f4c9ab1b4 Move inventory to addons 2015-01-14 09:23:41 +01:00
PabstMirror
4a0eb2d4ef Interaction paths 2015-01-14 00:48:06 -06:00
commy2
5636721717 try to port that vector 2015-01-14 07:24:17 +01:00
PabstMirror
ece2456773 #15 - updated model (on correct branch) 2015-01-14 00:15:08 -06:00
PabstMirror
00ecb21ad7 #15 oops 2015-01-14 00:02:44 -06:00
PabstMirror
c9e957f9ac #15 - all agm ref in p3d fixed - still bin issues 2015-01-13 23:24:53 -06:00
Nicolás Badano
b868e9a35c interaction: remove stuff from config. cable ties are no longer in interaction. 2015-01-14 01:47:39 -03:00
Nicolás Badano
465ae0bbfe Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3.git 2015-01-14 01:39:12 -03:00
Nicolás Badano
1de58631fb Merge pull request #19 from KoffeinFlummi/agmBackblastPort
Agm_Backblast port
2015-01-14 01:36:43 -03:00
Nicolás Badano
3209fea7db backblast: completed port 2015-01-14 01:32:38 -03:00
Nicolás Badano
95ec952acf backblast: initial port 2015-01-14 01:15:58 -03:00
Nicolás Badano
46cb15e831 AGM_Backblast pre CBA 2015-01-14 01:15:06 -03:00
Nicolás Badano
9408363706 Fix interaction and overheating headers 2015-01-14 01:14:47 -03:00
PabstMirror
436815fea3 Paths 2015-01-13 21:45:09 -06:00
PabstMirror
cb9b38bca2 Done I think 2015-01-13 21:36:53 -06:00
commy2
0aa348133d fix target wall texture path 2015-01-14 04:36:33 +01:00
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
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
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