Commit Graph

261 Commits

Author SHA1 Message Date
Nicolás Badano
e377cd0229 AGM_Resting pre CBA 2015-01-15 19:07:19 -03: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
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
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
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
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
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
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