commy2
0064f5739c
manual merge
2015-03-15 09:30:26 +01:00
commy2
4dab0b73d5
add conditions on post init
2015-03-15 09:26:16 +01:00
commy2
876424695e
solve canInteract conflicts, fix #198
2015-03-15 09:02:11 +01:00
bux578
e13ab9e7fa
add logo and mod.cpp
2015-03-15 07:23:18 +01:00
PabstMirror
5a2d7d59b6
Maptools - Use MACRO_ADDITEM from Main
2015-03-14 21:38:16 -05:00
KoffeinFlummi
99899d6562
Move advanced bloodloss handling to advanced
2015-03-15 03:26:10 +01:00
KoffeinFlummi
4cc1b08196
Add basic bleeding
2015-03-15 03:26:00 +01:00
KoffeinFlummi
d640367ff2
Add isInMedicalVehicle function
2015-03-15 03:25:31 +01:00
KoffeinFlummi
77ae997993
Don't handle unit vitals when game is paused
2015-03-15 01:48:50 +01:00
KoffeinFlummi
7f19ab7750
Only run JIP updates for wounds in advanced
2015-03-15 01:46:23 +01:00
Glowbal
62460e8b79
Fixes for animations and script error
2015-03-15 01:12:02 +01:00
Glowbal
74874904ed
Merge pull request #171 from KoffeinFlummi/SettingsMenuImprovements
...
Settings menu improvements & fixes
2015-03-15 00:49:48 +01:00
Glowbal
4f08d0d006
Merge branch 'master' into SettingsMenuImprovements
...
Conflicts:
addons/optionsmenu/functions/fnc_onListBoxSettingsChanged.sqf
addons/optionsmenu/functions/fnc_onListBoxShowSelectionChanged.sqf
addons/optionsmenu/functions/fnc_onSettingsMenuOpen.sqf
addons/optionsmenu/functions/fnc_onSliderPosChanged.sqf
addons/optionsmenu/functions/fnc_resetSettings.sqf
addons/optionsmenu/functions/fnc_settingsMenuUpdateKeyView.sqf
addons/optionsmenu/functions/fnc_settingsMenuUpdateList.sqf
addons/optionsmenu/functions/fnc_updateSetting.sqf
addons/optionsmenu/gui/settingsMenu.hpp
2015-03-15 00:46:14 +01:00
Nicolás Badano
5264819fd4
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
...
Conflicts:
addons/map/CfgVehicles.hpp
2015-03-14 17:22:25 -03:00
Nicolás Badano
096b270b83
Merge branch 'mapContours' into mapfx
...
Conflicts:
addons/map/config.cpp
2015-03-14 17:20:25 -03:00
Nicolás Badano
618c021f7e
Tab to space plus comments for the spawns
2015-03-14 17:15:28 -03:00
Nicolás Badano
5b74f99f10
Merge branch 'mapfx' of github.com:KoffeinFlummi/ACE3 into mapfx
...
Conflicts:
addons/mapfx/XEH_preInit.sqf
addons/mapfx/functions/fnc_determineMapLight.sqf
2015-03-14 17:01:34 -03:00
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
commy2
1b3dcfc07b
A3 check if gunlight is turned on
2015-03-14 11:26:52 +01:00
commy2
97776c168b
use chemlights common parent class to reduce nearObjects calls
2015-03-14 10:48:53 +01:00
Glowbal
2bee533a8c
Added AGM stringtables for drag, carry, load & unload
2015-03-14 09:51:08 +01:00
Glowbal
dcf3a73518
Added copyDeadBody function
2015-03-14 09:48:16 +01:00
Glowbal
99b1986059
Added setting for allowing movement of dead bodies
2015-03-14 09:37:19 +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
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
Glowbal
4ce524ed3c
First draft of carry and drop unit
2015-03-12 21:16:49 +01:00
bux578
e86270d03b
fix eps
2015-03-12 14:50:25 +01:00
bux578
f8c11cbb1b
Update README.md
2015-03-12 10:29:22 +01:00
bux578
0e9ae66000
Update README.md
2015-03-12 10:27:25 +01:00
bux578
192934e3b1
add logo variants
...
red: #ba2619
2015-03-12 10:22:23 +01:00
KoffeinFlummi
82f73117f4
Merge branch 'master' into medical-basic
2015-03-12 07:35:57 +01:00
KoffeinFlummi
a3069e3356
Fix wrong pain variable in patient information
2015-03-12 07:35:29 +01:00
KoffeinFlummi
ef491a7c76
Add basic information to dialog
2015-03-12 07:34:29 +01:00
