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
1,330 Commits 73 Branches 88 Tags 752 MiB
81836d1bc1
Commit Graph

1215 Commits

Author SHA1 Message Date
Nicolás Badano
518010be36 Reordered the map, mapfx and pbos: 
- mapfx moved inside map
- everything related to map tools and drawing moved to it's own pbo called ace_maptools

Also fixed a couple of bugs in BFT
- Only a single marker was being drawn
- The BFT_HideAi parameter had the opposite effect
 2015-03-14 16:58:05 -03:00
PabstMirror
bab1984782 Merge pull request #194 from KoffeinFlummi/captivesMedicalInegration 
Captives medical inegration
 2015-03-14 13:11:31 -05:00
PabstMirror
ebbebea6f2 Merge pull request #187 from KoffeinFlummi/wirecuttersInerationTest 
Wirecutters Interaction
 2015-03-14 13:11:17 -05:00
PabstMirror
da337fff3e Merge pull request #184 from KoffeinFlummi/InventoryResize 
Dynamic Inventory Resize
 2015-03-14 13:10:56 -05:00
PabstMirror
a92389f450 optMenu - remove 'fix anim' button and add headers 2015-03-14 13:10:25 -05:00
commy2
b79978116d some functions 2015-03-14 18:38:44 +01:00
Nicolás Badano
c03115b564 Refactored mapfx code, make the three features optional 2015-03-14 13:46:10 -03:00
commy2
f3f20439c8 config stuff, functions to make objects dragable 2015-03-14 13:51:23 +01:00
commy2
58212f5ce0 add PBO to drag objects 2015-03-14 12:05:43 +01:00
Nicolás Badano
69fa51cfeb Calculate map illumination based on ambientBrightness 2015-03-13 22:27:38 -03:00
Nicolás Badano
80e7117ead Tweak ambientBrightness to take into acount the cloud coverage 2015-03-13 22:27:14 -03:00
Nicolás Badano
7e2e6999bd Ported from ACE2: 
- Bring scale legend to ingame map
- Tweak map colors to make them exactly the same as ACE2 (had to import road colors directly from Arma 2, cause ACE just used defaults).
- Hide bushes and trees from the ingame map (they remain visible on the editor)
- Keep sattelite texture toogable, but with a opacity of 50%.
 2015-03-13 19:34:56 -03:00
commy2
db6e0fe99b hpps for realistic names 2015-03-13 19:10:24 +01:00
commy2
25fc24a419 fix cfgPatches in laserpointer 2015-03-13 18:52:30 +01:00
Glowbal
5390c3668e Added icon microDAGR 2015-03-13 18:43:21 +01:00
commy2
1e731ee425 fix vector cfg patches 2015-03-13 18:34:13 +01:00
PabstMirror
93262f3b92 Use ace_isUnconscious in anim changed EH 2015-03-13 00:45:12 -05:00
Nicolás Badano
86c16953ea Refactor and tweak map illumination to: 
- add tint depending on time of day.
- make it slightly less dark at night, so it's usable under any condition.
Temporarily remove light creation.
 2015-03-13 01:35:45 -03:00
Nicolás Badano
a4ea5fb724 Cache the call to determineMapLight 2015-03-13 01:01:00 -03:00
PabstMirror
55fcc60453 Merge branch 'master' into captivesMedicalInegration 2015-03-12 22:44:24 -05:00
Nicolás Badano
8d0cc787b0 Initial port/reimplementation of ace_mapfx, providing: 
- dynamic map illumination
- shacking maps when on the move
- optional max zoom
 2015-03-12 21:04:10 -03:00
PabstMirror
c1c3325368 Fix missing display error. 2015-03-12 13:02:04 -05:00
PabstMirror
da87425df3 Vector intergration (Hold Tab+R) 2015-03-12 12:57:44 -05:00
PabstMirror
58029101b8 readme 2015-03-12 12:41:04 -05:00
PabstMirror
f33da5928c Icon Size 2015-03-12 12:31:21 -05:00
PabstMirror
5197a5c453 Date display to info screen 2015-03-12 12:28:52 -05:00
PabstMirror
ec6d2c44bc Fix mappos not saving 2015-03-12 12:16:33 -05:00
PabstMirror
777e088484 Ambient light levels for background fading 2015-03-12 12:09:35 -05:00
PabstMirror
862a758e3b Merge branch 'master' into microDAGR 2015-03-12 11:39:12 -05:00
KoffeinFlummi
a3069e3356 Fix wrong pain variable in patient information 2015-03-12 07:35:29 +01:00
PabstMirror
3febb1e770 WindDef - Convert to use FiredBIS 2015-03-12 00:28:33 -05:00
PabstMirror
86441ce6c5 WindDef - Enable Eventhandler 2015-03-12 00:18:18 -05:00
PabstMirror
f64abcd583 Respawn - Module icon filenames 2015-03-12 00:12:19 -05:00
PabstMirror
aaeb5a3392 Parachute - Move unused p3d back to TOMERGE 2015-03-12 00:07:28 -05:00
PabstMirror
82ea87d1de Parachute - Config Division/Formating 2015-03-12 00:05:28 -05:00
PabstMirror
dd026cea0f Medical - add tourniquet p3d and other missing tex 
Ported tourniquet from cse
add missing textures for other items
fix paths in rvmats
 2015-03-11 23:52:58 -05:00
PabstMirror
bed312dcee Use MACRO_ADDITEM from main instead of redefining 2015-03-11 17:36:40 -05:00
Nicolás Badano
d02b5d2125 Ensure the class actions are compiled from config before adding them from the API 2015-03-11 16:26:58 -03:00
PabstMirror
5ab9ad87f9 QGVAR typo 2015-03-11 13:33:45 -05:00
PabstMirror
3a7c7f7cee Fix interactMenuClosed event 2015-03-11 12:48:17 -05:00
PabstMirror
858e5def5a Interact menu event consistant 
"interactMenuOpened",  to match event from #191
 2015-03-11 12:45:01 -05:00
PabstMirror
95d59a1b3a Headers 2015-03-11 02:06:07 -05:00
Nicolás Badano
8c7a51eac7 Added addClassAction and removeClassAction functions 2015-03-11 01:43:37 -03:00
Nicolás Badano
3dfef439e5 Delay the interactMenuClosed event until after the statement is executed, just in case it's needed to clean up afterwards. 2015-03-11 00:49:46 -03:00
Nicolás Badano
28929df32d Avoid submenus running statements when they open. Instead just check if the hovering action should runOnHover 2015-03-11 00:39:23 -03:00
Nicolás Badano
c573b1048d Made medical diagnosis statements run on hover 2015-03-11 00:38:31 -03:00
Nicolás Badano
f12e4ab751 Add the runOnHover parameter 2015-03-11 00:37:59 -03:00
Nicolás Badano
7138fadd71 Support additional parameters for addAction API 2015-03-11 00:25:45 -03:00
Nicolás Badano
722f49acc4 Execute statement when hovering over actions that open submenus 2015-03-11 00:21:05 -03:00
PabstMirror
d6e7775cac Can Show: Hide when gun up 2015-03-10 22:11:25 -05:00
PabstMirror
13e6ae60b2 Settings Menu, Mils, Localization 2015-03-10 21:48:57 -05:00
Nicolás Badano
b33127d3b0 Renamed variable 2015-03-10 23:45:46 -03:00
Nicolás Badano
e97467b3e3 Throw an event when the interact menu is closed 2015-03-10 23:36:28 -03:00
Nicolás Badano
14b97de930 Cache the generation of active action trees for action points. This sensibly cuts down the execution of action conditions. 2015-03-10 23:23:13 -03:00
Nicolás Badano
fab81c8701 Added helper function to cache generic function calls for a given time 2015-03-10 23:20:05 -03:00
commy2
cad5456010 function to check if an object is alive 2015-03-10 23:35:05 +01:00
PabstMirror
794a1f9922 Wirecutter handles interact event 
adds helper objects to all fences that have actions
 2015-03-10 16:01:46 -05:00
PabstMirror
49cef030d5 Add "interact_keyDown" local event to interactMenu 2015-03-10 15:48:08 -05:00
jaynus
59db61e192 Performance counter macros 2015-03-10 12:59:40 -07:00
Glowbal
45dbb0524c Merge pull request #181 from KoffeinFlummi/Additional_UI_Client_settings 
Additional ui client settings #177
 2015-03-10 19:55:44 +01:00
Glowbal
a4d73e1b01 DEFUNC -> DFUNC 2015-03-10 19:51:51 +01:00
PabstMirror
1dd270812d Finish keybind conversion for old interact 2015-03-10 12:47:58 -05:00
PabstMirror
7173037cb0 Fix 2 broken keybinds 2015-03-10 12:45:08 -05:00
commy2
b2e8ca5dbc zipper sounds for opening backpacks 2015-03-10 17:48:24 +01:00
commy2
025c45dccc remove lockbackpacks code, add sound and camshake, ref #178 2015-03-10 17:18:21 +01:00
PabstMirror
3f32627d61 Implement Unconc Event Handler 2015-03-10 11:08:15 -05:00
PabstMirror
93a1cdaab6 setCaptivityStatus in setUnconsicous 2015-03-10 10:35:00 -05:00
commy2
eeb07f2bf6 rename lockbackpacks to backpacks 2015-03-10 15:58:29 +01:00
PabstMirror
6ac83b7702 Cleanup 2015-03-09 18:53:19 -05:00
PabstMirror
35f72e0fda Dynamic Inventory Size 2015-03-09 18:46:51 -05:00
Glowbal
e741c8a12b Config stuff 2015-03-09 22:36:25 +01:00
PabstMirror
1cf8843cae Show Waypoints on map 2015-03-09 16:28:29 -05:00
Glowbal
4b171f9507 Indentation 2015-03-09 22:27:01 +01:00
Glowbal
6b91cefb90 Minor fixes and added pain status 2015-03-09 22:23:37 +01:00
PabstMirror
ce5595e107 BIS_fnc_gridToPos 2015-03-09 16:09:00 -05:00
Glowbal
8cc0361cb4 localization and displayText fixes 2015-03-09 22:08:43 +01:00
Glowbal
8a3eac2aa0 Added medical actions to sub menu 
Added statements
 2015-03-09 22:08:32 +01:00
Glowbal
f62335f71c Fixed custom conditions 2015-03-09 21:42:09 +01:00
Glowbal
5afc651519 fixed incorrect tourniquet classname 2015-03-09 21:41:58 +01:00
Glowbal
6aae11944b config fixes 2015-03-09 21:41:43 +01:00
Glowbal
a37afec70e fixed inheritance of treatment classes 2015-03-09 21:14:39 +01:00
Glowbal
9b856ea38b Merge branch 'master' into Medical_Improvements 2015-03-09 21:08:18 +01:00
Glowbal
f7159084c3 Made the menu slightly wider 2015-03-09 21:05:11 +01:00
Glowbal
aeb4c91792 Added interaction menu actions for advanced medical 2015-03-09 21:05:01 +01:00
Glowbal
f6fbef980a Added support for bandaging a specific injury class on a selection 2015-03-09 20:03:17 +01:00
PabstMirror
0fd49d179d doh 2015-03-09 13:55:07 -05:00
PabstMirror
29bd613445 canShow base 2015-03-09 13:53:49 -05:00
PabstMirror
1d6cfbf6b7 Various Changes 2015-03-09 13:52:15 -05:00
Glowbal
c7ede12b99 Removed weapon select, is now just grenade throw 2015-03-09 19:03:55 +01:00
PabstMirror
f387da1475 Working Base MicroDAGR 2015-03-09 10:46:59 -05:00
commy2
107fec4245 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-03-08 19:52:12 +01:00
commy2
55f49eaa1c fix shitty initSpeed definitions breaking SD mags, fix #182 2015-03-08 19:51:52 +01:00
Glowbal
fc1a52d48b Added events for unconscious 2015-03-08 17:52:40 +01:00
Glowbal
85cbe5eb5f Added support for locality switch and killed units 2015-03-08 17:50:06 +01:00
Glowbal
445ee87067 Merge branch 'master' into Additional_UI_Client_settings 2015-03-08 17:13:40 +01:00
Glowbal
252663fd81 Readded checkBloodPressure and checkPulse actions. 2015-03-08 17:13:17 +01:00
Glowbal
f08f8beeff Merge branch 'master' into Additional_UI_Client_settings 
Conflicts:
	addons/reload/CfgEventHandlers.hpp
	addons/reload/functions/fnc_checkAmmo.sqf
 2015-03-08 17:03:25 +01:00
Glowbal
2250255d65 Clientside display text option for weapon jamming 2015-03-08 16:57:06 +01:00
Glowbal
d919c2436d Clientside display text option for weapon reload 2015-03-08 16:56:57 +01:00
Glowbal
358a95381b Clientside display text option for weapon grenades 2015-03-08 16:56:47 +01:00