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
771 Commits 73 Branches 88 Tags 752 MiB
444f88eb05
Commit Graph

684 Commits

Author SHA1 Message Date
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
PabstMirror
0647a80aad Wirecutter - Self->Equipment Action 2015-01-28 03:22:39 -06:00
PabstMirror
39a4977efe Port: Wirecutting from AGM 
by gpgpgpgp, edited by commy2

Doesn't really work as well as I'd like (some fences are uncuttable)
 2015-01-27 22:42:45 -06:00
PabstMirror
3b3944b56c ProgressBar - Check canInteract (w/ exceptions) 2015-01-27 20:51:12 -06:00
PabstMirror
c14514a3f9 VehLock - canInteract check 2015-01-27 20:11:06 -06:00
PabstMirror
5bfaf7da7d VehLock - new progessBar 2015-01-27 19:49:21 -06:00
PabstMirror
c0e76dd3c7 Merge pull request #91 from KoffeinFlummi/agmVehicleLock 
Port: Vehicle Lock
 2015-01-27 19:30:46 -06:00
PabstMirror
bf791e32c4 Merge pull request #93 from KoffeinFlummi/progresBarNew 
#87 - New Progress Bar
 2015-01-27 19:28:51 -06:00
Nicolás Badano
d42be7b5f8 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-01-27 19:26:32 -03:00
Nicolás Badano
7a08bd3722 common: fixed fnc_addLineToDebugDraw 2015-01-27 19:26:09 -03:00
Nicolás Badano
8bc92482f3 common: function for drawing debug lines 2015-01-27 19:26:06 -03:00
Nicolás Badano
60fa6dfbe6 gforces: fixed prefix for config entries 2015-01-27 19:25:37 -03:00
Thomas Kooi
f52417cc3b Added readme file 2015-01-27 17:10:16 +01:00
Glowbal
c57cf88965 Merge pull request #85 from KoffeinFlummi/cse_medical_port 
PORT: CSE Medical
 2015-01-27 17:06:22 +01:00
bux578
f0c06beb23 fix #95 & add ADDON = bool 2015-01-27 09:01:57 +01:00
KoffeinFlummi
c407553d49 Add remaining READMEs, add helper script 2015-01-26 14:34:48 +01:00
Felix Wiegand
0f027e7e09 Create README.md 2015-01-26 13:56:37 +01:00
Felix Wiegand
7c1703ae11 Create README.md 2015-01-26 13:46:21 +01:00
Felix Wiegand
59563a934c Create README.md 2015-01-26 13:45:24 +01:00
Felix Wiegand
91bdd36268 Create README.md 2015-01-26 13:44:05 +01:00
Felix Wiegand
bf452b2c24 Create README.md 2015-01-26 13:42:07 +01:00
Felix Wiegand
6037f8e05b Create README.md 2015-01-26 13:40:31 +01:00
Felix Wiegand
3ed88ca17a Create README.md 2015-01-26 13:37:41 +01:00
Felix Wiegand
8d24c9fdbd Create README.md 2015-01-26 13:35:31 +01:00
KoffeinFlummi
3e00ebd12b Add README for ballistics 2015-01-26 07:36:45 +01:00
PabstMirror
5e932f8c71 Replace calls to progressBar 
Mag repack
Defuse
Swap Barrel
 2015-01-26 00:24:33 -06:00
PabstMirror
7c9dd335e7 Formating 2015-01-25 18:53:08 -06:00
PabstMirror
ce8e0fd938 New Progress Bar 2015-01-25 18:48:32 -06:00
Thomas Kooi
b28fa367cb Fixed unconscious. Now functions properly again after move from common to medical. 2015-01-25 16:40:47 +01:00
Thomas Kooi
3c60af5a14 Fixed: Changed medicClass to isMedic. 2015-01-25 16:05:09 +01:00
Thomas Kooi
69c45cf54d Fixed assignMedicalEquipment module 2015-01-25 16:02:49 +01:00
Thomas Kooi
5f8a00a45f Removed last remaining spawns and sleeps in medical. 2015-01-25 15:41:29 +01:00
Thomas Kooi
8045ebb6ab Fixed damage parsing for AI & non medical enabled units 2015-01-25 15:02:14 +01:00
Thomas Kooi
73d3869a04 Minor improvements made to handleDamage functions 2015-01-25 14:00:51 +01:00
PabstMirror
c07120c439 Fix Googles Macros 2015-01-25 00:55:35 -06:00
Thomas Kooi
95cfe5ce3a Minor code refactor 2015-01-24 21:16:51 +01:00
commy2
7e4407b9f5 Merge pull request #89 from KoffeinFlummi/byebyeAgmKeys 
Remove AGM key handling routines and remaining stuff from AGM options menu
 2015-01-24 20:17:57 +01:00
PabstMirror
a419587042 remove testing debug 2015-01-24 13:14:43 -06:00
PabstMirror
69893a7e99 Attach-use waitAndExecute 2015-01-24 13:14:01 -06:00
PabstMirror
0ca2cb34ea setVariable names 2015-01-24 12:58:01 -06:00
PabstMirror
09eb5d6c65 Update readme.md 2015-01-24 12:48:28 -06:00
PabstMirror
04d4d5b9ec Readme 2015-01-24 12:45:11 -06:00
Nicolás Badano
f3dac73fa2 interaction: removed debug info 2015-01-24 15:40:41 -03:00
Nicolás Badano
fc7f778d3e Reverted deletion of HintConfig.hpp 2015-01-24 15:35:58 -03:00
Nicolás Badano
b8abc85051 Merge branch 'byebyeAgmKeys' of github.com:KoffeinFlummi/ACE3 into byebyeAgmKeys 2015-01-24 15:34:48 -03:00
Nicolás Badano
30b97d7b6b common: removed commented stuff 2015-01-24 15:34:27 -03:00
Nicolás Badano
33485f6d3f common: remove AGM key handling routines and remaining stuff from AGM options menu 2015-01-24 15:32:06 -03:00
Nicolás Badano
be550836ea common: remove AGM key handling routines and remaining stuff from AGM options menu 2015-01-24 15:25:03 -03:00
Felix Wiegand
1c074e8096 Create README.md 2015-01-24 19:13:02 +01:00
Felix Wiegand
232420d21e Create README.md 2015-01-24 18:53:41 +01:00
Felix Wiegand
b356e3f5ba Create README.md 2015-01-24 18:51:43 +01:00
Felix Wiegand
bdd9532c24 Add README.md for ai 2015-01-24 18:50:42 +01:00
Nicolás Badano
8affcc0a2e fixes 2015-01-24 14:30:30 -03:00
Nicolás Badano
dc55ea517e interaction: cba keybinds 2015-01-24 14:02:47 -03:00
Thomas Kooi
8d34f98909 Moved relevant functions from common to medical. 
Removed unnecessary event function.
 2015-01-24 17:18:38 +01:00
Thomas Kooi
e06c5010bb Moved GUI functionality to medical 2015-01-24 16:34:39 +01:00
PabstMirror
4e31a4b57f First Pass 2015-01-23 16:40:39 -06:00
PabstMirror
5c8614f11c Port Vehicle Lock Inital 2015-01-23 16:14:22 -06:00
PabstMirror
47e8282d98 Movement/Climb Keybind 2015-01-23 16:05:14 -06:00
PabstMirror
75c87dfd9b Option Menu Tweaks 2015-01-23 02:43:43 -06:00
PabstMirror
8a27a49d31 #84 - goggles option error 2015-01-22 16:58:11 -06:00
Thomas Kooi
5234bb984f Fixed default debug values 2015-01-22 23:49:04 +01:00
Thomas Kooi
80f90751cd Removed some spawns 2015-01-22 23:47:06 +01:00
Thomas Kooi
dce0b61d57 Added damage threshold module 
Removed debug prints
 2015-01-22 23:29:18 +01:00
Thomas Kooi
dc1098233e Added broadcast flag to addOpenWounds, so we can stack call it followed by a broadcast. 
Improvements made to assignOpenWounds, now better results for single hits.
 2015-01-22 22:28:04 +01:00
Thomas Kooi
b173b21c51 Fixed advancedLocal treatment function. Now also selects primary weapon of caller when performing treatment. 2015-01-22 22:25:59 +01:00
Thomas Kooi
e7ebcbe3fb Added new unconscious condition for bleeding 2015-01-22 22:25:24 +01:00
Thomas Kooi
8137080bbc Minor code clean up 2015-01-22 22:00:37 +01:00
Thomas Kooi
68ab7b5143 Added AGM handleDamage caching 2015-01-22 22:00:04 +01:00
Thomas Kooi
23f8b8a9ad Added AGM config changes 2015-01-22 21:59:34 +01:00
Thomas Kooi
183b36d55e Menu now opens for ACE_player instead of player 2015-01-22 13:33:12 +01:00
Thomas Kooi
0c221c2912 Changed effects only display while in curator view 2015-01-22 13:28:45 +01:00
Thomas Kooi
ae5996bcd2 Fixed animations for carry/drag 2015-01-22 13:12:46 +01:00
PabstMirror
47c3ad1e5e Remove debug config 2015-01-22 00:17:31 -06:00
Nicolás Badano
14d2a6ee69 Merge pull request #83 from KoffeinFlummi/cseOptionsMenu 
Port: CSE options menu
 2015-01-22 02:57:34 -03:00
Nicolás Badano
0d24ddf994 optionsMenu: tweak columns 2015-01-22 02:56:11 -03:00
Nicolás Badano
0c3c0b0e33 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 
Conflicts:
	addons/weather/XEH_postInit.sqf
 2015-01-22 02:48:48 -03:00
Nicolás Badano
58db703db7 weather: small fix 2015-01-22 02:47:02 -03:00
Nicolás Badano
86e841bc64 optionsMenu: matched the size and font style of the main menu buttons 2015-01-22 02:45:27 -03:00
Nicolás Badano
96289b6395 optionsMenu: added localization to menu name 2015-01-22 02:44:45 -03:00
jaynus
0df7f86d66 Merge pull request #74 from KoffeinFlummi/lasers 
laser_selfdesginate commit for commanche
 2015-01-21 21:39:17 -08:00
Nicolás Badano
f73a456fb0 optionmenu: increase size 2015-01-22 02:33:51 -03:00
jaynus
81ae9e6e8f Javelin fixed and firing TDA terminal kill. Direct selection needs to be completed. 2015-01-21 21:31:58 -08:00
Nicolás Badano
b6f35cc015 define all sizes and offsets through macros 2015-01-22 01:48:39 -03:00
Nicolás Badano
91f066b84d remove quotes 2015-01-22 01:40:17 -03:00
jaynus
eaa157b4c5 Fixed script error on launch missing ; 2015-01-21 20:35:27 -08:00
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