Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
816 Commits 73 Branches 88 Tags 752 MiB
f3aa0e58aa
Commit Graph

728 Commits

Author SHA1 Message Date
Nicolás Badano
ccc96eb71c Merge branch 'cseOptionsMenu' of github.com:KoffeinFlummi/ACE3 2015-01-22 00:58:53 -03:00
PabstMirror
cb561a2d93 Convert Old Ace_Options 2015-01-21 18:19:10 -06:00
PabstMirror
d5916ced9e Colors from config 2015-01-21 17:43:57 -06:00
PabstMirror
2b62c170fd Read from config 2015-01-21 17:29:42 -06:00
commy2
b0e7cefb06 Merge pull request #82 from KoffeinFlummi/weather 
weather module
 2015-01-22 00:23:40 +01:00
commy2
ce81f6d9f5 kestrel 360, weather 2015-01-22 00:22:09 +01:00
commy2
770a151bf5 CBA keybinding for vector 2015-01-21 23:49:16 +01:00
PabstMirror
fe4a0b9be8 Formating 2015-01-21 16:27:53 -06:00
commy2
1737e3e7fa vector config, DONE 2015-01-21 23:05:19 +01:00
PabstMirror
a595b48d32 More Locaization 2015-01-21 16:00:54 -06:00
commy2
efb761a14c vector settings 2015-01-21 22:52:39 +01:00
Thomas Kooi
7020a8ef30 Replaced some PFH by waitandExecute 2015-01-21 21:37:03 +01:00
PabstMirror
c29acb4c68 Localization start 2015-01-21 14:23:33 -06:00
commy2
2c4c1d7db2 add config, settings to vector 2015-01-21 21:15:51 +01:00
PabstMirror
92bbfd92d1 Color Sliders 2015-01-21 13:53:05 -06:00
Thomas Kooi
77bd8f753d Added AGM blood volume greyness effect 2015-01-21 16:04:34 +01:00
Thomas Kooi
dcd42f55e8 Minor improvements to handleTreatment 2015-01-21 15:53:18 +01:00
Thomas Kooi
7e5806b834 Improved drag and carry actions. 2015-01-21 15:52:59 +01:00
Thomas Kooi
bbf9ce61f0 Changed QGVAR(isDead) to ACE_isDead 
Minor improvements to debug function
 2015-01-21 15:52:11 +01:00
PabstMirror
0ae940fdfb Rough Conversion 
Gut keybind stuff, redo data arrays, reset button, progress on color
changer.
 2015-01-21 05:43:58 -06:00
Nicolás Badano
2c34c16621 weather: weird syntax! 2015-01-21 02:28:23 -03:00
PabstMirror
09bb14d11b Options Menu from CSE 2015-01-20 23:27:08 -06:00
Nicolás Badano
306b3250e5 Merge branch 'master' into weather 2015-01-21 02:21:07 -03:00
Nicolás Badano
3a57b477de weather: replace agm's seasonal by cse's monthly temperatures 2015-01-21 02:12:57 -03:00
Nicolás Badano
59144e7b53 weather: only force set misc parameters on clients 2015-01-21 01:07:33 -03:00
Nicolás Badano
851db25e56 weather: add config data for A3 islands 2015-01-21 01:05:27 -03:00
Nicolás Badano
bba99d64f7 weather: added temperature simulation and air density 2015-01-21 00:14:51 -03:00
Nicolás Badano
0f790267f1 weather: more tabs to spaces 2015-01-21 00:00:32 -03:00
Nicolás Badano
b3d14987bc weather: sync misc. parameters: lightnings, rainbow, fog 2015-01-21 00:00:06 -03:00
Nicolás Badano
a92ebf4e41 weather: fix for waves sync 2015-01-20 23:59:32 -03:00
Nicolás Badano
64649fa781 weather: tabs to spaces 2015-01-20 23:58:19 -03:00
Nicolás Badano
a35f9a2be4 weather: sync waves 2015-01-20 23:30:49 -03:00
Nicolás Badano
2f12fca967 Wind: remove debug prints 2015-01-20 23:19:57 -03:00
Nicolás Badano
a29e08ed3c Ensure the transition time for rain is never 0 2015-01-20 23:18:17 -03:00
Nicolás Badano
6d34c310ad Reduce intensity of initial wind 2015-01-20 23:17:32 -03:00
Nicolás Badano
4a29f6a3c3 Set wind and rain syncing. Change ACE_wind from macro to global variable 2015-01-20 23:17:09 -03:00
Nicolás Badano
71bd34234b weather: initial port of ACE2 features. variables names changed to use macros. 2015-01-20 20:18:40 -03:00
commy2
b9551f6ad8 split mags from ballistic 2015-01-20 22:40:15 +01:00
Nicolás Badano
2255a56885 Merge remote-tracking branch 'origin/wind_deflection' into weather 2015-01-20 18:10:24 -03:00
commy2
a1432e35d7 fix missing base class 2015-01-20 20:02:43 +01:00
commy2
7071f34131 split flashhiders and uniform/vest nerfs from ballistics 2015-01-20 19:55:17 +01:00
Thomas Kooi
a92430b701 Added events to carry object. 2015-01-20 18:57:53 +01:00
Thomas Kooi
9a0b73bf3a Changed drag/carry to event driven architecture 2015-01-20 18:57:33 +01:00
commy2
9d687b9b3e vector: fix potential error in FOS, prep settings, config 2015-01-20 18:26:31 +01:00
commy2
65e12745d6 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-01-20 13:17:59 +01:00
Glowbal
8554cf7e6c Can now also remove a medic class through setMedic 2015-01-20 11:57:16 +01:00
Glowbal
72ae6eb08f Updated playInjured 
Removed sleep.
Made use of waitUnitl execute.
Changed MP sound broadcasting. No longer using the broadcastSound_F function.
 2015-01-20 11:56:00 +01:00
Glowbal
1337c2c562 Made unit loop flag public 2015-01-20 11:36:52 +01:00
PabstMirror
aec687f007 #78 - targetEvent working in SP 2015-01-20 03:54:34 -06:00
Nicolás Badano
544dbb1e29 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-01-20 02:58:45 -03:00
Nicolás Badano
06743bef52 interaction: fix canInteract and exceptions in agm menu 2015-01-20 02:58:06 -03:00
Nicolás Badano
b6dbd8d3c4 interact_menu: add canInteract (including exceptions) and canInteractWith to condition. 2015-01-20 02:41:04 -03:00
Nicolás Badano
9e11aeb0b9 interaction: fix canInteract and exceptions in agm menu 2015-01-20 02:39:22 -03:00
PabstMirror
cb52ac18c9 Send marker configNames instead of index 
Upstream fix from AGM
If CfgMarkers don't match, will throw warning:
22:46:53
[3896,74.535,0,"z\ace\addons\markers\functions\fnc_setMarkerNetwork.sqf:11","WARNING:
CfgMarker not found changed to milDot"]
 2015-01-19 22:49:39 -06:00
jaynus
7e621616d0 function name error. 2015-01-19 20:19:33 -08:00
jaynus
c5d03ce2c0 GBU and DAGR guidance initializations. 2015-01-19 20:16:33 -08:00
jaynus
16a296e92b laser_selfdesginate commit for commanche 2015-01-19 20:13:12 -08:00
Nicolás Badano
a5ac89dcb1 make some key events non blocking to allow some actions to share keybinds 2015-01-20 01:12:30 -03:00
Nicolás Badano
3bdd706e5d Merge remote-tracking branch 'origin/master' into moreCbaKeyBinds 2015-01-20 00:38:18 -03:00
Nicolás Badano
f3746d8391 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into nouInteractionMenu 2015-01-19 23:56:36 -03:00
Nicolás Badano
1cb8da4c21 Merge branch 'interact_menu' of github.com:KoffeinFlummi/ACE3 into nouInteractionMenu 2015-01-19 23:56:16 -03:00
commy2
42f2270a3a stuff 2015-01-20 02:19:31 +01:00
commy2
599dc134d8 simplify stuff 2015-01-20 01:34:26 +01:00
commy2
70b642afc0 get kestrl to work 2015-01-20 01:05:57 +01:00
Nou
ef94011cdc Menu rendering should be done with the mission event handler for Draw3D because it executes before rendering the current frame, rather than after the current frame. 2015-01-19 15:13:41 -08:00
Nicolás Badano
b0e99ada12 Merge branch 'master' into HEAD 2015-01-19 19:03:02 -03:00
commy2
8c8e14b0ca port kestrel 2015-01-19 21:13:56 +01:00
commy2
97ee63a349 getting PFH to work on briefing screen, review 2015-01-19 17:47:52 +01:00
commy2
87adbe9b9e DFUNC 2015-01-19 17:30:04 +01:00
commy2
e55a85cc26 get markers to work 2015-01-19 16:59:00 +01:00
commy2
1c37c76cc6 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into agmPortMarkers 2015-01-19 14:42:25 +01:00
Garth "L-H" de Wet
3f83085aed Merge pull request #68 from KoffeinFlummi/agmGogglesPort 
Agm goggles port
 2015-01-19 13:57:08 +02:00
KoffeinFlummi
4356c0d02b Add addon variable to FCS 2015-01-19 12:38:07 +01:00
Garth L-H de Wet
2fe155f990 Converted a couple PFHs to use the waitAndExecute function as that is what they were doing. 
Fixed a couple bugs.
 2015-01-19 10:34:49 +02:00
Nou
1a2231c14a Privatize 2015-01-18 20:13:45 -08:00
Nou
84f404ae84 Remove debug, added scripted add/remove actions. 2015-01-18 20:08:34 -08:00
Thomas Kooi
29c4676b20 Added missing variables to private array. 2015-01-19 00:59:19 +01:00
Thomas Kooi
e4b1265a84 Fixed incorrect parameter passing in treatment actions 2015-01-19 00:58:36 +01:00
Thomas Kooi
76e877067c Fixed examine actions 2015-01-19 00:58:17 +01:00
Garth L-H de Wet
ef19ffad0c Glasses conditions are local to each unit. No longer global scope on each client. 2015-01-19 01:38:54 +02:00
Garth L-H de Wet
b499cc9a1d Rain effect is working as expected. 2015-01-19 01:12:45 +02:00
Garth L-H de Wet
10cdbeb4dd Made the glasses effects slowly fade (not completely away) over 30 seconds. 2015-01-19 01:04:32 +02:00
Thomas Kooi
a890400c55 Fixed tourniquet treatment actions. 2015-01-18 23:58:10 +01:00
Garth L-H de Wet
49e19610c2 Removed a bunch of spawns and used PFH's in their place. 2015-01-19 00:57:39 +02:00
Thomas Kooi
5745408647 Added hold and release functionality for CMS menu. 2015-01-18 23:44:32 +01:00
Nicolás Badano
fc8c391596 nametags: cba keybinds 2015-01-18 19:39:15 -03:00
Nicolás Badano
058aa8d920 interaction: cba keybinds 2015-01-18 19:38:58 -03:00
commy2
9e2eaa96e1 pull master into branch 2015-01-18 23:26:41 +01:00
Garth L-H de Wet
fc18cb443f Converted Goggles to use ACE/CBA macros. 2015-01-18 23:50:45 +02:00
Thomas Kooi
920453e150 Fixed incorrect personal aid kit model. 2015-01-18 22:37:26 +01:00
Nicolás Badano
112c9f319f scopes: partial fix 2015-01-18 18:34:45 -03:00
Thomas Kooi
e468832324 Added initial port of CSE medical (CMS) 2015-01-18 22:16:35 +01:00
Nicolás Badano
63af6892eb fix for safemode 2015-01-18 17:56:12 -03:00
Nicolás Badano
e38eb5c09d fix for fcs 2015-01-18 17:56:05 -03:00
Nicolás Badano
7895173407 overheating: cba keybinds 2015-01-18 17:08:56 -03:00
Nicolás Badano
5a77e2c220 reload: cba keybinds 2015-01-18 17:05:32 -03:00
Nicolás Badano
9ed9dc916b resting: cba keybinds 2015-01-18 17:05:17 -03:00
Nicolás Badano
dc8c5758f1 scopes: cba keybinds 2015-01-18 17:01:18 -03:00
Nicolás Badano
60649d780c scopes: cba keybinds 2015-01-18 17:01:07 -03:00
Nicolás Badano
d8d665cc03 vehicles: cba keybinds 2015-01-18 17:00:43 -03:00
Garth L-H de Wet
0f04d0dfb1 Moved goggles to addons folder and renamed all occurances of AGM to ACE. 2015-01-18 21:43:51 +02:00
Glowbal
b80cec4c18 Merge pull request #45 from KoffeinFlummi/csePort_fixed 
Port from CSE Common.
 2015-01-18 20:12:18 +01:00
Thomas Kooi
8dfdd11f3c Changed tabs to 4 spaces 2015-01-18 20:09:19 +01:00
KoffeinFlummi
a78730d387 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-01-18 20:03:59 +01:00
KoffeinFlummi
8872424abe Merge branch 'fcs-extension' 2015-01-18 20:03:40 +01:00
KoffeinFlummi
4978bb5294 Move FCS calculation to extension 2015-01-18 20:02:37 +01:00
Thomas Kooi
86663e8a8e Changed disableUserInput_f to setDisableUserInputStatus. 2015-01-18 19:54:43 +01:00
Nou
6a04408a74 Initial nou menu commit. 2015-01-18 10:38:27 -08:00
Nicolás Badano
d532caf1a0 fix execNextFrame (#56) 2015-01-18 15:26:26 -03:00
Nicolás Badano
d299331f80 Merge branch 'weaponSelecCbaKeyBinds' 2015-01-18 15:24:15 -03:00
Nicolás Badano
1b1e5fd70d Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into fcsCbaKeyBinds 2015-01-18 15:23:32 -03:00
commy2
67fcb0c7b6 Merge pull request #60 from KoffeinFlummi/vectorZoomFix 
Zoom level adjustment. fix #58
 2015-01-18 17:19:59 +01:00
commy2
a545efe02c work on port markers 2015-01-18 17:17:06 +01:00
Nicolás Badano
7bc356008c fcs: cba keybinds 2015-01-18 12:42:33 -03:00
Nicolás Badano
84fd6de793 fcs: fix to make adjust range up/down work again 2015-01-18 12:40:41 -03:00
Thomas Kooi
63c024bc79 Fixed undefined variable script error 2015-01-18 16:31:40 +01:00
VKing
99a31f8ae8 Zoom level adjustment. Ref #58 2015-01-18 16:03:34 +01:00
Nicolás Badano
415df07af4 weaponselect: replace keybinds for cba 2 2015-01-18 11:57:23 -03:00
Nicolás Badano
b867dc04ed weaponselect: replace keybinds for cba 2015-01-18 11:30:57 -03:00
Thomas Kooi
b76eabe1c4 Fixed incorrect parameters being given to callback function 2015-01-18 15:17:25 +01:00
Nicolás Badano
4d721418fa Merge pull request #54 from KoffeinFlummi/laserPointerImprovements 
Laser pointer improvements
 2015-01-18 10:03:16 -03:00
PabstMirror
6e8c394903 Standardize Config Version Stuff 2015-01-18 01:32:07 -06:00
commy2
cb8945a879 port markers 2015-01-18 08:20:55 +01:00
bux578
632a3f5e0a Merge branch 'master' into agmScopesPort 2015-01-18 08:18:24 +01:00
bux578
a1c167844d fix errors, but still no overlay 
and lots of spawns
 2015-01-18 08:13:37 +01:00
commy2
14745af70b port difficulties 2015-01-18 08:06:25 +01:00
commy2
06f39aa158 port lock backpacks 2015-01-18 07:56:09 +01:00
commy2
e67602d76e port movement 2015-01-18 06:45:28 +01:00
Nicolás Badano
74bfc31598 laserpointer: various improvements: 
- calculate system of reference vectors to offset the laser start.
- as much stuff as possible calculated in ASL, removing all conversions inside loops.
- halved the distance in which men are searched.
- increased the tolerance when calculating distance.
 2015-01-17 23:51:31 -03:00
Nicolás Badano
e7ec905892 Cache the units near to the camera instead of the player. 
Works even when no player exists or is somehow viewing the action remotely.
 2015-01-17 23:48:44 -03:00
commy2
8683667d24 add day laser pointer 2015-01-17 23:38:13 +01:00
commy2
fa2acfbb50 vector FOS mode 2015-01-17 22:49:06 +01:00
Nicolás Badano
a1cb57f4db smallarms: port 2015-01-17 18:14:56 -03:00
Nicolás Badano
daec785600 AGM_Smallarms pre CBA 2015-01-17 18:02:03 -03:00
Nicolás Badano
9247bb3411 safemode: port 2015-01-17 17:32:34 -03:00
Nicolás Badano
7c41eb04e9 AGM_SafeMode pre CBA 2015-01-17 17:01:47 -03:00
Nicolás Badano
16be448168 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-01-17 16:05:14 -03:00
Nicolás Badano
fd4a2192e9 map: small fixes 2015-01-17 16:04:48 -03:00
commy2
6658eafe3d vector object height, length mode 2015-01-17 19:25:12 +01:00
Nicolás Badano
9a790a229a Merge branch 'agmMapPort' of github.com:KoffeinFlummi/ACE3 2015-01-17 15:24:46 -03:00
Nicolás Badano
6abc6073e1 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-01-17 15:19:53 -03:00
Nicolás Badano
3fa6f1b0c9 gforces: fix for when there's no player 2015-01-17 15:18:11 -03:00
bux578
68b56d9161 Merge branch 'master' into agmScopesPort 2015-01-17 19:14:33 +01:00
PabstMirror
1d475111e7 Flashbang Icon Name 2015-01-17 12:12:02 -06:00
Nicolás Badano
6bee456aff Merge pull request #24 from KoffeinFlummi/agmGrenadesPort 
Port: AGM Grenades
 2015-01-17 15:05:15 -03:00
commy2
7a6d0eefe3 port weapon select 2015-01-17 18:26:51 +01:00
Thomas Kooi
d3c05209ea Changed loading bar to make use of PFH 2015-01-17 18:21:52 +01:00
Nicolás Badano
c851a14da9 common: added execNextFrame function 2015-01-17 13:56:24 -03:00
Nicolás Badano
4926b6970b fixes typos 2015-01-17 13:45:56 -03:00
Nicolás Badano
f165030e3b common: remove the support for code as string 2015-01-17 12:23:03 -03:00
Thomas Kooi
748f4f30be Removed throw for consistency. Not used anywhere else. 2015-01-17 14:26:50 +01:00
Thomas Kooi
42c90074cb Removed duplicate limitSpeed. Already present in vehicles pbo 2015-01-17 14:20:49 +01:00
Thomas Kooi
cdc2373872 Removed foreachDo 2015-01-17 14:14:12 +01:00
Thomas Kooi
781ebaca95 Changed StateUnconscious to "ACE_isUnconscious" 2015-01-17 14:13:37 +01:00
Thomas Kooi
7345cf91cf Minor code clean up 2015-01-17 13:54:44 +01:00
Thomas Kooi
eaa44fce6f Changed some spawns to call 2015-01-17 13:38:26 +01:00
Thomas Kooi
a8e257f7ab Changed setDead to no longer use spawn. 2015-01-17 13:35:15 +01:00
Thomas Kooi
d42b83947d Fixed script errors in limit speed functions (missing [) 2015-01-17 13:35:03 +01:00
Thomas Kooi
38947ba669 Moved sendDisplay & sendMessage functions to GUI instead of common. 2015-01-17 13:03:51 +01:00
Thomas Kooi
e5579f1c32 Removed spawn usage from limit movement speed functions 2015-01-17 12:53:23 +01:00
Glowbal
041a4fccc5 Removed CSE text 
Changed set count to pushback.
 2015-01-17 12:42:10 +01:00
Glowbal
31f0b80659 Fixed CBA macro mistake 2015-01-17 12:40:06 +01:00
Glowbal
6e4a12ff4d Fixed CBA macro mistake 
Fixed an CBA macro mistake.
 2015-01-17 12:39:33 +01:00
Thomas Kooi
83128ad3d2 Fixed minor issues with unconscious & blackout effect. 
Fixed error in XEH_postInit
 2015-01-17 12:35:59 +01:00
Thomas Kooi
8a61f5fbb5 Changed setUnconsciousState to no longer use spawn. 2015-01-17 12:08:11 +01:00
Thomas Kooi
a77082e4f7 Made functions compatible with removed/renamed functions. 2015-01-17 12:07:41 +01:00
Thomas Kooi
45284c7855 Changed customEventHandler_f to raiseScriptedEvent_f 
Should be replaced by the ACE eventhandler at a later stage.
 2015-01-17 12:07:03 +01:00
Thomas Kooi
6509491c19 Removed duplicate functions 2015-01-17 12:06:03 +01:00
Thomas Kooi
f25766d4e4 Moved effect functions to GUI folder 2015-01-17 12:05:07 +01:00
bux578
79695f00e9 Merge remote-tracking branch 'origin' into agmScopesPort 2015-01-17 09:22:34 +01:00
PabstMirror
1783bf4db6 #49 - targetEvent for flashbang 2015-01-17 00:39:46 -06:00
Nicolás Badano
27bd5c5790 hearing: fixes 2015-01-17 03:20:41 -03:00
PabstMirror
853dfba86a Merge branch 'master' into agmGrenadesPort 2015-01-17 00:15:07 -06:00
Nicolás Badano
a7e016fa8f overheating: change addPerFrameHandler to waitAndExecute 2015-01-17 03:13:05 -03:00
Nicolás Badano
fefb599a55 explosives: change addPerFrameHandler to waitAndExecute 2015-01-17 03:09:51 -03:00
Nicolás Badano
8a397f80ef hearing: change addPerFrameHandler to waitAndExecute 2015-01-17 03:02:52 -03:00
Nicolás Badano
2f4f6f3161 common: add waitAndExecute function 2015-01-17 02:58:24 -03:00
Nicolás Badano
c85db9baf9 hearing: fix PFH in case the game is paused 2015-01-17 02:24:28 -03:00
Nicolás Badano
800e16edc5 explosives: fix timer in case the game pauses 2015-01-17 02:14:09 -03:00
Nicolás Badano
1adbe8c6a9 nightvision: make EH calls traceable 2015-01-17 02:12:37 -03:00
Nicolás Badano
7fd578326f Merge pull request #47 from KoffeinFlummi/agmGForcesPort 
Port: AGM_GForces
 2015-01-17 01:15:52 -03:00
Nicolás Badano
402156aecf gforces: renamed function 2015-01-17 01:09:12 -03:00
PabstMirror
4cc57be48c Cleanup debug 2015-01-16 22:07:53 -06:00
Nicolás Badano
e61b828314 gforces: moved stuff out of config.cpp 2015-01-17 01:01:56 -03:00
Nicolás Badano
43b87cda0b gforces: tweaked based on pilot feedback (https://github.com/KoffeinFlummi/AGM/issues/1774#issuecomment-70341573) 2015-01-17 00:59:45 -03:00
Nicolás Badano
f594198eae gforces: port from AGM 2015-01-16 23:01:41 -03:00
PabstMirror
e260ea5314 Merge branch 'master' into agmMapPort 2015-01-16 19:21:03 -06:00
Nou
82d7f4bd5c Typo! Closes #46 2015-01-16 17:12:37 -08:00
Thomas Kooi
ef4248650e Added CSE gui port, minus the radial and configuration menus. 2015-01-17 00:22:37 +01:00
Thomas Kooi
afc103a946 Added CSE common port. 2015-01-17 00:21:47 +01:00
PabstMirror
2483e8f8d8 Merge branch 'master' into agmMapPort 2015-01-16 17:17:48 -06:00
PabstMirror
89654a42d2 Needs Testing 2015-01-16 17:13:26 -06:00
commy2
7678193ca1 remove obsolete stuff 2015-01-16 23:49:29 +01:00
commy2
cd533abd6f inventoryDisplayLoaded eh 2015-01-16 23:48:30 +01:00
commy2
d66b78bdd5 infoDisplayChanged via addEventHandler 2015-01-16 23:13:51 +01:00
Nicolás Badano
46b25e88c0 respawn: fixed actions and self_actions 2015-01-16 18:23:07 -03:00
Nicolás Badano
4445ec6195 nightvision: fix 2015-01-16 17:57:55 -03:00
Nicolás Badano
4a8e9a65b1 nightvision: Fix #42 2015-01-16 17:56:23 -03:00
Nicolás Badano
7c4af1dc17 nightvision: use ACE events to replace a PFH 2015-01-16 17:25:30 -03:00
Nicolás Badano
5f1a6c40e3 common: raise more local ACE events 2015-01-16 17:16:42 -03:00
Nicolás Badano
9654d3b36d ACE events fixes 2015-01-16 16:30:48 -03:00
Nicolás Badano
26325bb943 Throw the zeusDisplayChanged ACE event 2015-01-16 15:39:38 -03:00
Nicolás Badano
223600e689 Throw the playerVisionModeChanged ACE event 2015-01-16 15:39:19 -03:00
Nicolás Badano
8b3c70a16d Add PFH to throw the playerInventoryChanged ACE event 2015-01-16 15:28:37 -03:00
Nicolás Badano
8467013c1a Moved getAllGear function to common module 2015-01-16 15:24:25 -03:00
Nicolás Badano
7883389a53 Merge branch 'master' of git@github.com:KoffeinFlummi/ACE3.git into agmNightVisionPort 2015-01-16 14:35:52 -03:00
Nicolás Badano
5bea43910d Merge pull request #38 from KoffeinFlummi/aceEvents 
Replace some AGM custom events by ACE events
 2015-01-16 14:20:39 -03:00
Nicolás Badano
78cca3c539 interaction: raise "interactionMenuOpened" ACE event locally 2 2015-01-16 12:45:15 -03:00
Nicolás Badano
00e68c4540 interaction: raise "interactionMenuOpened" ACE event locally 2015-01-16 12:42:48 -03:00
Nicolás Badano
bce84d9a2d respawn: raise "killedByFriendly" ACE event globally 2015-01-16 12:38:43 -03:00
Nicolás Badano
e1b1edc961 noradio: ace local event for playerChanged 2015-01-16 12:14:40 -03:00
Nicolás Badano
34135ffdd4 common: ACE local event for playerChanged 2015-01-16 12:14:18 -03:00
commy2
7cd2bc24c8 port magazinerepack 2015-01-16 15:37:32 +01:00
Nicolás Badano
60270d5415 Change the loop that updates ACE_player from BIS to PFH 2015-01-16 11:30:49 -03:00
Nicolás Badano
cf08d8cfa6 Merge branch 'master' of git@github.com:KoffeinFlummi/ACE3.git 2015-01-16 11:02:30 -03:00
Nicolás Badano
96d78d07b9 Merge branch 'agmNoRadio' of git@github.com:KoffeinFlummi/ACE3.git into agmPortNoRadio 2015-01-16 10:48:16 -03:00
commy2
fac9b2f4f4 menu fixes 2015-01-16 14:35:19 +01:00
commy2
9219909ec7 port vehicles 2015-01-16 14:20:41 +01:00
bux578
b13502c5f9 spaces 2015-01-16 13:20:01 +01:00
bux578
b556097896 cbafyied scopes 
still lots of spawns and waitUntils in there
 2015-01-16 13:15:14 +01:00
PabstMirror
687c7e98aa almost done 2015-01-16 02:13:29 -06:00
PabstMirror
644e61f67e Don't always enable effects when exiting zeus 2015-01-15 22:49:46 -06:00
PabstMirror
4c7877f5a4 Fix QGVAR 2015-01-15 22:43:54 -06:00
PabstMirror
4c5912e2f1 More progress 2015-01-15 22:30:04 -06:00
Nicolás Badano
1f99a4dc4a Merge branch 'agmHearingPort' of git@github.com:KoffeinFlummi/ACE3.git 2015-01-16 01:18:06 -03:00
Nicolás Badano
b60dc8999d Merge branch 'master' of git@github.com:KoffeinFlummi/ACE3.git 2015-01-15 23:38:02 -03:00
Nicolás Badano
886ffacb35 overheating: replace last spawn by a PFH 2015-01-15 23:36:58 -03:00
Nicolás Badano
c8811552c8 overheating: add function headers 2015-01-15 23:36:31 -03:00
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
PabstMirror
b12844f175 Converted to CBA style 2015-01-15 15:50:48 -06: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
PabstMirror
f4c84182d4 Progress on Map 2015-01-15 03:51:18 -06:00
PabstMirror
e52457bfbc AGM Map Base 2015-01-15 02:36:48 -06: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
PabstMirror
f352b4cdb5 Use new Event Handlers 
from 9a37538d50
 2015-01-14 14:53:09 -06: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
PabstMirror
a91b409702 newline 2015-01-14 14:43:43 -06:00
PabstMirror
1d083aa072 Convert Spawned/Sleep 2015-01-14 14:40:37 -06: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
PabstMirror
cedb05f8d9 Key Press 2015-01-14 13:48:08 -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
e1c08626be Fix Script Comp 2015-01-14 12:28:44 -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
PabstMirror
9224cd0c2a Work on removing spawned 2015-01-14 05:07:53 -06:00
PabstMirror
19c815f779 Model and Textures 2015-01-14 03:19:25 -06:00
PabstMirror
77065afb02 First Pass 2015-01-14 03:06: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
7ead73bc1f AGM Grenades Base 2015-01-14 01:55:23 -06: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