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
800 Commits 73 Branches 88 Tags 752 MiB
ac54e8dfd7
Commit Graph

713 Commits

Author SHA1 Message Date
Nicolás Badano
bedf059af5 Merge branch 'PFH_SwitchUnits' of github.com:KoffeinFlummi/ACE3 into PFH_SwitchUnits 
Conflicts:
	addons/switchunits/functions/fnc_module.sqf
 2015-02-08 19:17:07 -03:00
Nicolás Badano
8a26fbc957 ace_settings: remove debug stuff 2015-02-08 18:36:00 -03:00
Nicolás Badano
1b9d0aa635 ACE_Settings: do not load client settings on dedi servers or HC 2015-02-08 18:29:49 -03:00
PabstMirror
3f6ffa6ac2 Mag Repack - Keep Progress prototype 
Ideas from AGM and CSE
Keeps Progress While Repacking if interrupted
Added sounds from CSE
 2015-02-08 13:48:53 -06:00
PabstMirror
6d534e8846 #130 - Surrender Module Prototype 2015-02-07 15:20:51 -06:00
Nicolás Badano
1717d75a20 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into aceSettings 2015-02-07 10:49:26 -03:00
PabstMirror
fcf39a3916 #118 Sound Effect from CSE 2015-02-06 23:23:33 -06:00
PabstMirror
ed3f28ec6d Minor Cleanup 2015-02-06 22:24:27 -06:00
PabstMirror
c117e9bf16 Header Examples 2015-02-06 17:03:56 -06:00
PabstMirror
98564fae68 Surrendering 2015-02-06 15:54:26 -06:00
PabstMirror
7a3029b9fd replace spawns 2015-02-06 03:38:27 -06:00
PabstMirror
82a8fc8ca3 exceptions 2015-02-05 23:11:28 -06:00
PabstMirror
122a38a6aa More Refactoring 2015-02-05 16:39:45 -06:00
commy2
350741918b Merge pull request #121 from KoffeinFlummi/moduleSounds 
Module sounds
 2015-02-05 01:49:38 +01:00
PabstMirror
435b3b8b86 Move Code out of CfgVehicles 2015-02-04 13:16:19 -06:00
PabstMirror
11cd426b87 Redo XEH 2015-02-04 00:35:51 -06:00
PabstMirror
24ab11a1e2 More work 2015-02-03 23:56:51 -06:00
PabstMirror
4c727fbff5 remoteFncs -> events 2015-02-03 23:13:44 -06:00
commy2
49f0b79962 fcs for turrets 2015-02-04 03:20:55 +01:00
commy2
47d5befd12 fcs per turrets 2015-02-03 23:03:43 +01:00
Nicolás Badano
18fa6f9850 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into aceSettings 2015-02-03 17:48:24 -03:00
bux578
509bfefff1 fixed SwitchUnits 
needed to wait in initPlayer
 2015-02-03 21:47:48 +01:00
Nicolás Badano
d65a740b7a WindDeflection using ace_settings 2015-02-03 17:47:25 -03:00
Nicolás Badano
e57a135750 Missing prep 2015-02-03 16:49:40 -03:00
bux578
903c41308c works in singleplayer 2015-02-03 20:33:15 +01:00
Nicolás Badano
146e87f02e nametags: slightly changed module options to use the new ACE_Settings 2015-02-03 15:47:17 -03:00
Nicolás Badano
b119d5246b fix in setsettings 2015-02-03 15:46:33 -03:00
commy2
4185299efd rename agm burst mode to ace burst mode (ai) 2015-02-03 19:38:49 +01:00
Nicolás Badano
9773f7b838 Merge pull request #124 from KoffeinFlummi/GogglesHeaderFix 
Updated headers of the goggles to be as required.
 2015-02-03 15:12:30 -03:00
Nicolás Badano
91d2a8c343 Merge pull request #125 from KoffeinFlummi/agmParachutePort 
Agm parachute port
 2015-02-03 15:12:12 -03:00
Nicolás Badano
eee5ff604a Merge pull request #122 from KoffeinFlummi/ExplosivesHeaderFix 
Fixed the headers of the explosives system to be the correct style.
 2015-02-03 15:12:00 -03:00
Garth L-H de Wet
9c20706c83 Added a event handler for player vehicle changing. As well as covered the canInteract in key handler. 2015-02-03 11:51:16 +02:00
Garth L-H de Wet
b4d1d6b230 Removed the PFH when the player vehicle is no longer a parachute. 2015-02-03 11:50:33 +02:00
Garth L-H de Wet
c08494cc43 Made use of time instead of diag_ticktime, to take care of time acceleration and so forth. 2015-02-03 11:50:11 +02:00
PabstMirror
4156143ecf Captives Progress 2015-02-03 00:42:34 -06:00
Nicolás Badano
74d0ae95ff Change ACE_Settings from modules 2015-02-03 02:53:02 -03:00
Nicolás Badano
92d21af8c6 ACE_Settings: function for updating settings from modules 2015-02-03 02:52:07 -03:00
Nicolás Badano
66045b8d51 ACE_Settings: setSettings tab to space, casting 2015-02-03 02:51:41 -03:00
Nicolás Badano
051ad00806 ACE_Settings: added function to add settings at runtime 2015-02-03 02:37:38 -03:00
Nicolás Badano
658f30b9a2 ACE_Settings: various fixes 2015-02-03 02:37:13 -03:00
Nicolás Badano
2c0d2013d4 ACE_Settings: Added a function to change settings on runtime (e.g. for modules) 2015-02-03 01:45:04 -03:00
Nicolás Badano
857b45453a ACE_Settings: fix option to reset user setable settings to default 2015-02-03 01:03:26 -03:00
Nicolás Badano
99cf0a75ee Merge branch 'master' of git@github.com:KoffeinFlummi/ACE3.git into aceSettings 2015-02-03 00:45:29 -03:00
Nicolás Badano
91cfb40e6f ACE_Settings: updated optionsmenu to use the the new system 2015-02-03 00:44:34 -03:00
Nicolás Badano
173169bc3d Fix in goggles 2015-02-03 00:44:06 -03:00
Nicolás Badano
354b261677 ACE_Settings: added sample setting entry for documentation 2015-02-03 00:43:53 -03:00
Nicolás Badano
67f7842722 ACE_Settings: store settings data on a list 2015-02-03 00:43:23 -03:00
PabstMirror
b38bd016f5 Semicolon and bad p3d data paths 
P3d's had bad \data\ folder, Models not actually used anywhere, but
pboProject complains
 2015-02-02 20:15:45 -06:00
PabstMirror
982f3b230a Captives First Pass 2015-02-02 20:04:50 -06:00
PabstMirror
3865598095 AGM_Captives 2015-02-02 19:48:33 -06:00
Nicolás Badano
37199f2ba2 Load client setable settings from profile 2015-02-02 21:14:16 -03:00
Nicolás Badano
0600a72147 Fixes 2015-02-02 21:13:31 -03:00
bux578
d339b9567d add header & PFH 
WIP
 2015-02-02 23:28:27 +01:00
Garth L-H de Wet
9e1cd9a194 Fixed headers to be more consistent with ACE. 2015-02-03 00:05:03 +02:00
Garth L-H de Wet
aca1c0c6cf Converted to use CBA PFH's and MACROs. 2015-02-02 23:58:24 +02:00
Garth L-H de Wet
966cb6ffdf Performed initial conversion from AGM to ACE. Added necessary boilerplate files. 2015-02-02 22:52:08 +02:00
Garth L-H de Wet
03cef93ac7 Initiated AGM_Parachute merge. 2015-02-02 22:31:48 +02:00
Garth L-H de Wet
c96882dd02 Fixed incorrect header comment for explosives. 2015-02-02 11:42:14 +02:00
Garth L-H de Wet
7acd7854b7 Updated headers of the goggles to be as required. 2015-02-02 11:04:53 +02:00
Garth L-H de Wet
2440e4fa69 Fixed incorrect indenting with headers in explosives. 2015-02-02 10:35:17 +02:00
PabstMirror
fa002b4db6 Formating and Headers 2015-02-01 14:56:19 -06:00
PabstMirror
01ee35d6c5 Geforces: Fix "Error Zero divisor" 
Adds some simple checks before dividing.
Before dropping uniform or playing as a dog would throw script error.
 2015-02-01 13:09:17 -06:00
Garth L-H de Wet
eafc9e659c Fixed the headers of the explosives system to be the correct style. 2015-02-01 20:38:15 +02:00
PabstMirror
1921c73ee8 Merge pull request #99 from KoffeinFlummi/agmUAVRechargePort 
Port AGM: Logistics-UAV refuel/recharage
 2015-02-01 11:59:40 -06:00
PabstMirror
42bc8eff1a wirecutter typenames to lowercase 2015-02-01 11:56:54 -06:00
PabstMirror
58a71e6a66 Merge pull request #97 from KoffeinFlummi/agmWirecutterPort 
Port: AGM Wirecutters
 2015-02-01 11:03:20 -06:00
Glowbal
0419b7cbe5 Formatting 2015-02-01 11:17:15 +01:00
Glowbal
96e0d0e758 Removed rouge debug code & dead code 2015-02-01 11:14:21 +01:00
Glowbal
3f0b6650e0 Added weapon resting & weapon jam sounds 2015-02-01 11:11:51 +01:00
PabstMirror
8ceb2aabc1 Attach Stuff 2015-01-31 11:43:58 -06:00
PabstMirror
3f9d96abd3 Placement rewrite 2015-01-31 03:05:07 -06:00
Nicolás Badano
96b7c0d30c ACE_Settings: replace all ACE_Options 2015-01-30 19:19:45 -03:00
PabstMirror
7519fefee9 Fix Interaction 2015-01-30 16:11:16 -06:00
Nicolás Badano
981978d043 ACE_Settings: replace all ACE_Parameters 2015-01-30 19:06:25 -03:00
Nicolás Badano
e277b05aff ace_settings: first draft 2015-01-30 18:56:45 -03:00
PabstMirror
08763b6b9f Initial port of old pull 
Still some problem with interaction...
 2015-01-30 14:32:21 -06:00
Thomas Kooi
b2b6591fdd Merge branch 'master' into cseBasicBallisticsPort 2015-01-30 12:33:00 +01:00
Thomas Kooi
27798fbe8f Minor optimizations 
Renamed from basic ballistics to wind deflection
 2015-01-29 13:58:22 +01:00
PabstMirror
9631154926 Set ADDON variable in XEH_preInit 2015-01-29 01:38:46 -06:00
PabstMirror
aabae5a3bc ace_interaction to required 2015-01-29 01:01:58 -06:00
PabstMirror
3581ab480c ace_interaction to required 2015-01-29 01:01:00 -06:00
KoffeinFlummi
bb48d1234c Merge remote-tracking branch 'origin/interact_menu' 2015-01-28 22:17:27 +01:00
PabstMirror
3bb8775bd2 readme 2015-01-28 14:39:36 -06:00
PabstMirror
9a616a85fc VehicleSetFuel event 
setFuel says it needs to be local, so switching to event.
Put event in common
 2015-01-28 14:38:04 -06:00
PabstMirror
4b1e40570e Port AGM: Logistics-UAV refuel/recharage 2015-01-28 14:29:43 -06:00
Nou
5dfa4304d3 Tweaks 2015-01-28 12:03:30 -08:00
PabstMirror
54ab834e5c Fix stringtable 2015-01-28 12:54:14 -06:00
Nou
26f353b94d Merge branch 'master' into interact_menu 2015-01-28 10:19:58 -08:00
Nou
984fee03ac Merge branch 'interact_menu' of https://github.com/KoffeinFlummi/ACE3 into interact_menu 2015-01-28 10:19:30 -08:00
Nou
8e9883a111 Make sure object actions are set. 2015-01-28 10:18:19 -08:00
PabstMirror
719e308f9b readme 2015-01-28 12:04:30 -06:00
PabstMirror
bb473f95f0 Func Headers 2015-01-28 12:01:40 -06:00
PabstMirror
d62595e76d Added some AIA fences 2015-01-28 11:51:42 -06:00
Thomas Kooi
794379c774 Fixed incorrect classname CfgAddons 2015-01-28 18:51:27 +01:00
Thomas Kooi
2e05e5ac39 Replaced isPlayer by EFUNC(common,isPlayer) 2015-01-28 18:02:49 +01:00
Thomas Kooi
44997e1d4a Removed bullet database concept 2015-01-28 17:58:28 +01:00
Thomas Kooi
8014da1407 Added ACE_weather dependency 2015-01-28 17:48:49 +01:00
Thomas Kooi
b092ecf280 Replaced wind by ACE_wind 2015-01-28 17:48:36 +01:00
Thomas Kooi
a5cef8da3d Added readme file 2015-01-28 17:38:33 +01:00
Thomas Kooi
2def603a58 Finalized port of basic ballistics 2015-01-28 17:36:47 +01:00