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
6,240 Commits 73 Branches 88 Tags 752 MiB
213deeffb4
Commit Graph

5095 Commits

Author SHA1 Message Date
SilentSpike
13201866bd Module icon 2015-07-17 23:31:31 +01:00
PabstMirror
ddc83e0889 #1639 - Apply damage where vehicle is local 2015-07-17 15:43:00 -05:00
SilentSpike
10c1c26c69 Improved unit switching 2015-07-17 20:51:06 +01:00
SilentSpike
832fa1e832 Side filter 2015-07-17 20:51:04 +01:00
SilentSpike
c48719a644 Attribution for F3 project devs 2015-07-17 16:45:16 +01:00
SilentSpike
cfcb9fedb6 Updating ace settings 2015-07-17 16:13:24 +01:00
SilentSpike
6de18416bc Interface tweaks 2015-07-17 13:14:09 +01:00
SilentSpike
3b9a364a26 Expanding the unit tree 2015-07-17 12:57:34 +01:00
Glowbal
015fd1afb0 Merge pull request #1864 from jokoho48/TextureUpdate 
Update IV Blood and Plasma Texture
 2015-07-17 11:06:49 +02:00
Joko
1b9d02a8a5 Update IV Blood and Plasma Texture 2015-07-17 09:40:43 +02:00
Glowbal
0154dfc51e Merge pull request #1799 from jokoho48/3DModelUpdate 
Add and Update Some 3D Object and Textures
 2015-07-17 08:17:42 +02:00
SilentSpike
6540971298 Tweaking a controls group 2015-07-17 02:58:31 +01:00
SilentSpike
27d85180f1 Improve handling of unit tree 2015-07-17 02:38:42 +01:00
SilentSpike
6cb1813527 Fix button y value 2015-07-17 02:16:35 +01:00
SilentSpike
81f87ee13c params for public functions 2015-07-17 02:05:24 +01:00
SilentSpike
78a8149cc2 Viewpoint order UX 2015-07-17 01:52:08 +01:00
SilentSpike
e012fbc7f9 Unit tools control group 2015-07-17 01:47:21 +01:00
SilentSpike
840d766d83 Fixing typos, updating interface 2015-07-17 01:22:38 +01:00
PabstMirror
b6e124d340 #1856 - Close huntIR monitor if item removed 2015-07-16 19:12:11 -05:00
PabstMirror
f845d54290 #1634 - Integrate with DAGR 2015-07-16 18:35:38 -05:00
PabstMirror
f438c6d0c5 Revert "Use new worldSize command instead of whileLoop" 
This reverts commit 7d26519b2e.
 2015-07-16 18:10:10 -05:00
PabstMirror
7d26519b2e Use new worldSize command instead of whileLoop 2015-07-16 17:47:39 -05:00
PabstMirror
b47a17230b Merge branch 'master' into 10digitGrids2 2015-07-16 17:26:19 -05:00
Nicolás Badano
04e137090b Merge pull request #1753 from jonpas/slideshow 
Slideshow
 2015-07-16 18:25:05 -03:00
Nicolás Badano
67d83d0d49 Merge pull request #1862 from acemod/disappearingActionsFix 
Cache the objects actions for nearby objects and set the GVAR(objectA…
 2015-07-16 18:24:55 -03:00
jonpas
77631eb61c Only add ACE_MainActions if one doesn't exist yet, Cleaned comments 2015-07-16 23:16:09 +02:00
SilentSpike
e823ec681d Toggle help key 2015-07-16 21:45:52 +01:00
jonpas
23e7e19100 Fixed macro, Added privates 2015-07-16 22:39:02 +02:00
SilentSpike
78e17c4bdc Fix function calls with switch to params 2015-07-16 21:37:20 +01:00
SilentSpike
a7a87c40f0 Using control groups 2015-07-16 21:33:50 +01:00
esteldunedain
8da43d25c6 Cache the objects actions for nearby objects and set the GVAR(objectActionList) correctly. 2015-07-16 17:28:27 -03:00
jonpas
a136545b85 Merge branch 'master' into slideshow 2015-07-16 22:20:56 +02:00
SilentSpike
723a0f96f6 Improve view switching UX 2015-07-16 19:43:16 +01:00
SilentSpike
20f05d9906 Improve unit switching UX 2015-07-16 18:31:49 +01:00
SilentSpike
458fe363ff Fixing typo 2015-07-16 17:56:50 +01:00
SilentSpike
3895a51f02 Correcting view transition 2015-07-16 17:48:32 +01:00
SilentSpike
e3c9e52fdd Tree events to update camUnit 2015-07-16 17:29:10 +01:00
SilentSpike
549d53d919 Use RscPicture for compass 2015-07-16 15:51:32 +01:00
SilentSpike
d043a471b3 Improving unit list handling 2015-07-16 15:49:02 +01:00
Joko
d92e6af1c2 Add IRStrobe to CfgMagazines 2015-07-16 15:17:09 +02:00
Joko
0ba8a39dc5 Add LoD to Wirecutter 2015-07-16 14:46:08 +02:00
Joko
c9a47ec053 Add LoDs for IVBag 250/500/1000 
Add LoDs for Kestrell
 2015-07-16 14:41:42 +02:00
Joko
b2b7015b8e Remove Unessesary Comments in RVMAT 2015-07-15 21:35:30 +02:00
Joko
9aa0285064 Revert LoD Changes 2015-07-15 21:13:05 +02:00
Joko
fd4d4abb73 Move UAV Battery form models to data 
change LoD Distance
Fix IVBag names(my issue)
 2015-07-15 20:51:06 +02:00
Joko
a72312738e Add to all Objects a LoD with nothing in for "hiding" Objects in Distance 
Remove Old Earplugs
Use 3 Object instead of 9 for IVBag with Using of Model Config
 2015-07-15 20:34:35 +02:00
SilentSpike
7f04164653 Handling the spectatable unit list 2015-07-15 14:58:38 +01:00
SilentSpike
147571c76f Better method of updating camera view 2015-07-15 14:58:08 +01:00
SilentSpike
784865d634 Clear workspace 2015-07-15 13:50:10 +01:00
SilentSpike
5dc4dbeb88 Handle camera attributes 2015-07-15 12:34:44 +01:00
SilentSpike
d2345a398a Handle free cam movement 2015-07-15 12:23:25 +01:00
SilentSpike
90b6fd3d8b Initalize interface 2015-07-15 12:09:28 +01:00
SilentSpike
d7cc309591 setSpectator correct group handling, disable user input 2015-07-15 11:48:49 +01:00
SilentSpike
a02470c341 Unify interface as display 2015-07-15 11:43:09 +01:00
jonpas
e1fb4db63a Fixed chairs inheritance in sitting 2015-07-15 00:42:41 +02:00
jonpas
174ef91b82 Fixed comment typo 2015-07-15 00:36:05 +02:00
jonpas
338aa19aaa Increased ability to look up #1846, Cleaned up new and empty lines in movement 2015-07-15 00:35:12 +02:00
PabstMirror
14eae93f4b #1814 - Save and restore last mortar charge setting 2015-07-13 19:09:55 -05:00
PabstMirror
78d0767051 #1838 - Remove base airFriction test (broke smokes) 2015-07-13 18:42:59 -05:00
SilentSpike
7b88280988 Merge pull request #1852 from jonpas/fixELSTRINGmacroWord 
Fixed ELSTRING macro typo
 2015-07-14 00:02:34 +01:00
jonpas
01ba50bbb2 Fixed ELSTRING macro typo 2015-07-13 22:12:54 +02:00
jonpas
b266effe5b Made object actions dynamic 2015-07-13 22:07:21 +02:00
SzwedzikPL
60641d57d2 Disable hearing in zeus camera 2015-07-13 21:01:41 +02:00
Nicolás Badano
01d8d7957c Merge pull request #1824 from Legolasindar/master 
Update spanish translation
 2015-07-13 15:36:36 -03:00
jonpas
4fa1c7dc0a Moved verification to public function, removed unnecessary str 2015-07-13 19:56:25 +02:00
PabstMirror
061ddbd8de Remove debug testing code 2015-07-12 14:09:27 -05:00
PabstMirror
46cee06f07 #1812 - Show Options on Intro/Outro 2015-07-12 10:26:08 -05:00
PabstMirror
d4f70134e6 medical/setUnconscious header 2015-07-12 10:25:00 -05:00
jonpas
89c5218bbd Fixed module init exit condition 2015-07-12 16:45:09 +02:00
jonpas
b83b161e3d Fixed default duration value in module init, Added error if required fields left empty, Combined 2 lines 2015-07-12 16:32:48 +02:00
PabstMirror
05d98370e4 Handle enableCombatDeafness and/or ringing enabled 2015-07-11 21:00:40 -05:00
PabstMirror
7a204cbdb1 #1843 - HuntIR - Handle Dead Projectile 2015-07-11 19:48:52 -05:00
PabstMirror
6de3df6474 Update README.md 2015-07-11 12:42:19 -05:00
PabstMirror
040f4a92a0 #1696 - Flashbangs make big boom 2015-07-10 21:39:35 -05:00
PabstMirror
c27afca485 DisableEarRinging / Cleanup 2015-07-10 21:30:47 -05:00
PabstMirror
d11fa939e1 Hearing - Merge PFEH (ringing/volume) 2015-07-10 21:01:32 -05:00
jonpas
c90c83831d Removed Tripod PBOPREFIX newline 2015-07-10 23:36:30 +02:00
jonpas
ef18006423 Tripod indentation to 4 spaces, removed empty first lines 2015-07-10 23:34:36 +02:00
SilentSpike
97f3ec4f65 Merge pull request #1835 from jonpas/disableEarRingingOnTheFly 
Exit Ear Ringing PFH when disabled during ringing
 2015-07-10 22:08:53 +01:00
jonpas
4826fd5c1c Exit Ear Rining PFH when disabled during ringing 2015-07-10 22:52:04 +02:00
jonpas
e437fbbacd Removed safety from binoculars/designators 2015-07-10 22:42:40 +02:00
SilentSpike
a1ec2eb7c3 Update handleRespawn to new function parameters 2015-07-09 21:24:45 +01:00
SilentSpike
1e13758ad8 Better group handling, more functional function 2015-07-09 21:20:09 +01:00
SilentSpike
1e8b869117 Reshuffling toolbar tools 2015-07-09 18:08:34 +01:00
SilentSpike
877d4e7cd9 Using common defines, further cleanup 2015-07-09 17:53:22 +01:00
Glowbal
d3bed7aedb fixed -1 to disable the revive timer does not work 2015-07-09 13:02:48 +02:00
PabstMirror
499a63e8e3 External - Move to right of head 2015-07-08 15:53:31 -05:00
Ivan Navarro Cabello
78529af60c Update spanish translation 2015-07-08 20:57:46 +02:00
SilentSpike
46bd42d59e Cleanup interface config 2015-07-08 15:31:54 +01:00
PabstMirror
ba8c9186bb Show leveled azimuth/elevation 2015-07-08 01:00:43 -05:00
jonpas
815b7984aa Fixed event statement arguments, reworded comment 2015-07-07 03:46:54 +02:00
SzwedzikPL
defc82694b Fix for 'Treat at...' option 2015-07-06 21:30:49 +02:00
PabstMirror
f6973c61fa Merge branch 'master' into mk6-fixBISleveling 2015-07-06 01:35:55 -05:00
SilentSpike
98e9245ed9 Basic respawning support 2015-07-05 21:53:09 +01:00
SilentSpike
2aebabdb2c Safeguard against repeat usage 2015-07-05 21:31:26 +01:00
SilentSpike
788c23c940 Allow resetting existing spectators 2015-07-05 21:30:19 +01:00
Joko
fa900452ea Add DAGR (by Blackpixxel) 
Add QuikClot to Medical (by Blackpixxel)
Add QuikClot Litter (by Blackpixxel)
Update Blackpixxel at Author
Fix IRStrobe Texture Path
 2015-07-05 22:21:17 +02:00
PabstMirror
88e0b67364 Merge branch 'master' into fingering 2015-07-05 12:30:31 -05:00
SilentSpike
9026db9b3c Major cleanup 2015-07-05 16:44:16 +01:00
jonpas
cb210f92a0 Prevented sitting on flipped chairs, Stand when chair gets knocked away/otherwise moves 2015-07-05 17:07:34 +02:00
jonpas
34dea7d971 Fixed #1796 sitting above ground level 2015-07-05 13:55:45 +02:00
PabstMirror
6e982018d3 Don't use uiNamespace to store PEFH 2015-07-04 23:14:44 -05:00
PabstMirror
183c03a3a4 Add missing PREP 2015-07-04 22:54:21 -05:00
SilentSpike
069ab2432a Keybinds should always be present 2015-07-05 01:32:06 +01:00
SilentSpike
ad30b28f34 Improved death handling 2015-07-05 01:29:14 +01:00
SilentSpike
bedde2197b Only cache info on death if not a spectator 2015-07-05 01:12:16 +01:00
SilentSpike
950aec38b7 Fixed macro 2015-07-05 01:04:07 +01:00
SilentSpike
01a5ab619e handleKilled and handleRespawn 2015-07-05 00:49:47 +01:00
SilentSpike
6596bbdb0a Coding standards 2015-07-05 00:17:15 +01:00
SilentSpike
83e5309654 Updated side GVAR 2015-07-05 00:11:38 +01:00
SilentSpike
27610b78e1 Blank space cleanup 2015-07-05 00:10:01 +01:00
SilentSpike
5e7c094c98 Cache details on respawn (not at postInit) 2015-07-05 00:09:43 +01:00
Joko
815365fd2e Small Performace Improvement in Nametags 2015-07-04 23:03:16 +02:00
Joko
0c099dc4d1 Add 3D Object IVBag Blood, Plasma and Saline with 1000ml, 500ml, 250ml(Made by PaxJaromeMalues) 
Add PaxJaromeMalues to AUTHORS
 2015-07-04 22:50:32 +02:00
SilentSpike
c09314027f "isNotSpectator" canInteractWith condition 2015-07-04 19:41:18 +01:00
Joko
240b26b9ac Add IRStrobe 3D Object to attach 
Add M57 Clacker to explosives
Add New LowPoly Earplug to Hearing
Add WireCutter to logistics_wirecutter
Reduce UAVBattery Texture Size in logistics_uavbattery
Add MapTools to maptools
 2015-07-04 19:56:54 +02:00
SilentSpike
975bc229c6 Merge branch 'master' into ace_spectator 
Conflicts:
	addons/spectator/stringtable.xml
 2015-07-04 18:53:20 +01:00
SilentSpike
19c16b1f59 Comment out dev branch command 2015-07-04 17:40:23 +01:00
bux578
fcb6383337 remove some empty xml nodes 2015-07-04 16:19:53 +02:00
ProfessorCZ
89a9218e59 CZ Translation - Update 2015-07-04 15:56:00 +02:00
voiper
981c961ce1 -Switched to CBA keybinds. 
-Localized keybinds.
-Removed fnc_cameraIntro.sqf; superfluous.
-Various code clean ups.
-Changed: Condition for mission end now checks allUnits (todo: change to allPlayers when available).
 2015-07-04 01:00:27 -07:00
PabstMirror
ab2ebf5fcf MissleGuidance - Move PARAMS up to top 2015-07-03 21:06:13 -05:00
voiper
d4b5f88a76 Last remnants of view distance. 2015-07-03 15:00:00 -07:00
SilentSpike
909fbb5dc4 Merge pull request #1732 from acemod/checkPBOfix 
CheckPBO should ensure client isn't running any addons the server isn't
 2015-07-03 22:33:17 +01:00
Glowbal
57c4bc453a Merge pull request #1779 from SzwedzikPL/zeus_no_paineffect 
disable pain effect in zeus camera
 2015-07-03 23:20:33 +02:00
Glowbal
44de95ea81 Merge pull request #1790 from acemod/medicalImprovements 
Medical improvements
 2015-07-03 22:21:20 +02:00
Glowbal
fd649aee38 Changed default value for surgical kit. Should be use anytime 2015-07-03 22:17:31 +02:00
Glowbal
9edf1b1adf Implemented use conditions for PAK and SurgicalKit 
It is now possible to only have a treatment action show up for stable (not bleeding) patients
 2015-07-03 22:16:18 +02:00
voiper
206a976013 Merge branch 'ace_spectator' into ace_spectator_dev 
Conflicts:
	addons/spectator/functions/fnc_camera.sqf
 2015-07-03 12:59:47 -07:00
Glowbal
07303633e4 Merge pull request #1692 from acemod/fixVanillaDamageEffectsShowing 
Fix vanilla damage effects
 2015-07-03 21:41:26 +02:00
voiper
81889aef2d Viewdistance dialogue remove. 2015-07-03 12:23:49 -07:00
voiper
56aa87ce8b Removed view distance changing. 2015-07-03 12:14:41 -07:00
SilentSpike
a23f401695 Removing all references to penPos 2015-07-03 19:07:10 +01:00
SilentSpike
58b1c0f3a9 Solve crashing caused by off map position and disableSimulation to stop underwater issues 2015-07-03 18:44:40 +01:00
SilentSpike
bbadc9242b Further zeus actions cleanup 2015-07-03 14:21:21 +01:00
SilentSpike
ca36b62356 Zeus interactions string cleanup 2015-07-03 13:20:32 +01:00
PabstMirror
1c6b12126e Merge branch 'master' into mk6-fixBISleveling 2015-07-02 22:03:25 -05:00
Nicolás Badano
8052dd8ea3 Merge pull request #1782 from gienkov/pl-translation 
PL translation
 2015-07-02 23:06:13 -03:00
SilentSpike
ff4fce3950 Initial enter/exit function implementation 2015-07-03 02:16:23 +01:00
SilentSpike
d036639b46 Adding hideUnit functions to ace_common 2015-07-03 02:14:58 +01:00
SilentSpike
91ca532496 Preserve equipment, added comments 2015-07-02 23:43:33 +01:00
gienkov
70862c5de9 PL translation 2015-07-02 23:55:26 +02:00
SzwedzikPL
13999fdd31 finddisplay into curatorcamera 2015-07-02 19:36:34 +02:00
SilentSpike
8c98f98472 Fixed end mission code on server 2015-07-02 16:42:40 +01:00
SilentSpike
eeeb543424 Simplified default pen position assignment 2015-07-02 16:30:37 +01:00
SilentSpike
4df1738b43 Don't move respawn markers 
Exit on HC
Only run end mission PFH on server
 2015-07-02 16:23:25 +01:00
SilentSpike
3a4a32382d Removed empty stringtables 2015-07-02 15:56:01 +01:00
Nicolás Badano
13f5b08892 Merge pull request #1760 from voiperr/master 
ACE_Spectator
 2015-07-02 10:52:59 -03:00
SzwedzikPL
c2e4ee431f no pain effect in zeus camera 2015-07-02 13:56:56 +02:00
PabstMirror
89305473a2 Add performance note. 2015-07-01 15:50:14 -05:00
PabstMirror
5e80f9d8d3 Merge branch 'master' into userActionPrototype 2015-07-01 15:04:40 -05:00
PabstMirror
b02086ca52 Intersection Check / FOV adjustment 2015-07-01 14:53:59 -05:00
SzwedzikPL
6b4eeedbad headgear influence on hearing 2015-07-01 21:21:09 +02:00
PabstMirror
319e50a9cc Viewdistance - Fix Error Missing ) 2015-07-01 12:39:49 -05:00
Nicolás Badano
10ef88b655 Merge pull request #1596 from SzwedzikPL/interaction_box_inventory 
Open action for boxes
 2015-07-01 12:59:24 -03:00
Nicolás Badano
9d0dcc5ea2 Merge pull request #1757 from Winter259/viewdistance-settings-init 
Viewdistance settingsInitialized
 2015-07-01 12:58:07 -03:00
jonpas
8f0101a1d9 Merge branch 'master' into addEarplugsEnhancement 
Conflicts:
	addons/hearing/functions/fnc_addEarPlugs.sqf
 2015-07-01 17:45:00 +02:00
Nicolás Badano
f175490298 Merge pull request #1772 from acemod/aceModuleSyncronizedObjects 
Ace_modules - Pass synced objects to functions
 2015-07-01 11:33:03 -03:00
Nicolás Badano
f1f31cd94a Merge pull request #1769 from acemod/mapShakePanning 
Allow moving map while shake effect active
 2015-07-01 11:31:31 -03:00
Nicolás Badano
d06ac6cace Merge pull request #1771 from acemod/fixRallyPoint 
Rally point object names
 2015-07-01 11:30:32 -03:00
Nicolás Badano
1e8d4327df Merge pull request #1763 from naizarak/patch-1 
Update fnc_addEarPlugs.sqf
 2015-07-01 11:22:59 -03:00
PabstMirror
57f88fe77a Ace_modules - Pass synced objects to functions 2015-07-01 01:53:15 -05:00
PabstMirror
7eb26c8710 #1699 - Rally point object names 2015-07-01 01:27:06 -05:00
PabstMirror
c58ff8d31d #1736 - Allow moving map while shake effect active 2015-07-01 00:13:55 -05:00
Joko
30111b4f15 Fix Merge Problems 
Use CString Macro
 2015-07-01 03:03:51 +02:00
Joko
a74bc3a748 Merge branch 'master' of https://github.com/acemod/ACE3 into acemod-master 
Conflicts:
	AUTHORS.txt
	addons/parachute/CfgVehicles.hpp
 2015-07-01 02:49:29 +02:00
PabstMirror
c1dd2df57a Move grid funcs and map long,lat,altitude to common 2015-06-30 12:26:51 -05:00
PabstMirror
ccebb4f86a Merge branch 'master' into 10digitGrids2 
Conflicts:
	addons/microdagr/functions/fnc_updateDisplay.sqf
 2015-06-30 11:25:55 -05:00
PabstMirror
923018a9f6 mdagr use getMapPosFromGrid 2015-06-30 11:18:47 -05:00
PabstMirror
1f47ffc5de Error checking, handle out of bounds grids 2015-06-30 11:11:53 -05:00
PabstMirror
1f7994e10f Calc real X and Y offsets 2015-06-29 21:18:21 -05:00
jonpas
f08bd7acc2 Improved Slide Duration module option description 2015-06-29 22:24:16 +02:00
Nicolás Badano
a284cc3f6b Merge pull request #1755 from ToasterBR/master 
Translation to Brazilian Portuguese (PT-BR)
 2015-06-29 17:22:38 -03:00
jonpas
a9c6e3c065 Disabled debug 2015-06-29 22:14:38 +02:00
jonpas
bb3495468e Replaced PFH for waitAndExecute with PFH-like handling 2015-06-29 22:13:28 +02:00
jonpas
9ee75dbb21 Multiple modules support 2015-06-29 21:54:40 +02:00
jonpas
3ac520eb3e Corrected typo 2015-06-29 21:23:47 +02:00
naizarak
75e322e6ae Update fnc_addEarPlugs.sqf 
Do not automatically add earplugs to units if combat deafness is disabled.
 2015-06-29 12:23:32 -07:00
jonpas
038de8b5cf Added Slideshow module icon 2015-06-29 21:22:59 +02:00
jonpas
7e200afa04 Added automatic slide transitions with custom duration 2015-06-29 21:07:51 +02:00
voiper
0d3601da47 Tiny fix to description. 2015-06-29 09:51:19 -07:00
SilentSpike
873936dc31 Simplify addon checking code 2015-06-29 14:15:46 +01:00
voiper
3dab207b65 Add Spectator. 2015-06-28 19:34:21 -07:00
jonpas
475e4673eb Fixed typo 2015-06-28 22:28:26 +02:00
jonpas
9e6ce52fb6 Added check to addEarplugs if earplugs are used 2015-06-28 21:25:01 +02:00
Simon AM
8bdf243ab9 Removed extra ] 2015-06-28 10:19:21 +02:00
Simon AM
0e7c6a8e19 Set Viewdistance to start on settingsInitialized 2015-06-28 10:18:53 +02:00
ToasterBR
f4a51d57ef Translation to Brazilian Portuguese (PT-BR) 
Made all remaining translations, including new ones like the sitting
module, for example.
 2015-06-27 15:48:39 -03:00
SilentSpike
f2e5f729e8 Merge branch 'master' into gm_revamp 2015-06-27 18:26:30 +01:00
jonpas
34b270d89d Added Flat TV support 2015-06-27 04:23:21 +02:00
jonpas
a7d58f3b9f Fixed project name 2015-06-27 04:13:20 +02:00
jonpas
77cb278f61 Added Slideshow mission tool 2015-06-27 04:11:57 +02:00
PabstMirror
6bb235f38a Merge pull request #1711 from acemod/mdagr-ambientBrightness 
mdagr use ambientBrightness
 2015-06-26 20:23:32 -05:00
PabstMirror
ca145cce26 Merge pull request #1705 from acemod/animSourceAmmoBox 
#1704 - Add missing AnimationSources
 2015-06-26 20:23:09 -05:00
ulteq
241e8acdd9 Merge pull request #1541 from jonpas/sitting 
Sitting
 2015-06-26 21:34:34 +02:00
jonpas
c8c1f76e7d Macro usage, privates fix 2015-06-26 21:31:48 +02:00
ulteq
b78ece7114 Merge pull request #1706 from jonpas/settingsBFT 
Blue Force Tracking ACE_Settings
 2015-06-26 20:06:20 +02:00
SilentSpike
5e38ba9b20 Correcting some spacing 2015-06-24 17:09:43 +01:00
ViperMaul
7e6be08153 Improved unloading on roof tops 
Less chance of patient being unloaded directly to the ground instead of the roof top where the helo has landed.
Probably not fool proof yet due to randomness. #1728
 2015-06-23 16:11:00 -07:00
SilentSpike
e4f89a96b7 CheckPBO should ensure client isn't running any addons the server isn't 2015-06-23 15:01:55 +01:00
ViperMaul
6b6ad93848 Fix for unable to unload from driver seat. 
Improvement for helo's on roof tops and boats.
#1728
 2015-06-22 19:48:28 -07:00
PabstMirror
d5757c090a Calc gridOffsets at mission start. 2015-06-22 20:36:37 -05:00
jonpas
293fa4f16b Coding standards applied to common/CfgVehicles.hpp 2015-06-22 19:29:19 +02:00
jonpas
ec5cc606c3 Fixed CheckPBOs Whitelist default value in module 2015-06-22 19:24:10 +02:00
jonpas
922e88d31e Fixed handcuffing not breaking sitting animation 2015-06-22 15:25:10 +02:00
SilentSpike
27a4ecd747 Expanded readme 2015-06-22 00:43:39 +01:00
SilentSpike
378b39db77 Merge remote-tracking branch 'upstream/master' 2015-06-22 00:37:28 +01:00
SilentSpike
398f1c768f Fix the module on dedicated servers 2015-06-22 00:17:29 +01:00
SilentSpike
e3e415c727 Added readme 2015-06-21 23:46:23 +01:00
jonpas
2e50261bd3 Exit entire map Client XEH on Headless 2015-06-21 21:10:50 +02:00
jonpas
a7d9489555 Fixed map module init, Prevented BFT execution on Headless, Changed BFT Enabled string 2015-06-21 21:08:37 +02:00
PabstMirror
2d6e862237 Merge branch 'master' into 10digitGrids2 2015-06-21 13:07:58 -05:00
PabstMirror
ce2a617c7b #1709 - Remove ACE_Comanche_Test from zeus 2015-06-21 13:00:51 -05:00
PabstMirror
f0adf256a8 #573 - mdagr use ambientBrightness 2015-06-21 12:25:16 -05:00
jonpas
4f35e10afa Changed BFT_Enabled to module option for proper ACE_Settings handling 2015-06-21 04:46:55 +02:00
jonpas
10602f10c6 Fixed BFT ACE_Settings, Fixed Map Module Initialized diag_log 2015-06-21 04:19:12 +02:00
PabstMirror
4570f77249 Privates / Cleanup 2015-06-20 20:40:17 -05:00
PabstMirror
2c64abb816 #1704 - Add missing AnimationSources 2015-06-20 20:17:27 -05:00
Glowbal
e153e47bb2 Disabled litter on treatment failure. #1403 
We give back the items, so litter does not make sense at the moment.

In the future we need to expand this with conditions for success/failure.
 2015-06-20 12:54:00 +02:00
Glowbal
9e00fc479b CPR local is now also only executed when the target is still alive. 
Otherwise it's quite useless
 2015-06-20 12:51:42 +02:00
Glowbal
c4283404e8 Changed CPR to be available for all unconscious units 
Including dead
 2015-06-20 12:51:01 +02:00
Glowbal
ea0be1f563 Only execute the local handling of CPR when in a valid state 2015-06-20 12:46:26 +02:00
Glowbal
385baf1331 Using CPR while in revive state will extend the life timer 2015-06-20 12:44:52 +02:00
Glowbal
9795647d9c While in revive state, ensure vitals are never above 0 for adv medical 2015-06-20 12:44:29 +02:00
Glowbal
3f5a050745 Fixed #1693 2015-06-20 12:38:12 +02:00
Glowbal
c3e2d1bf9c Removed always unconscious for basic medical 2015-06-20 12:23:40 +02:00
ulteq
8d1d0c5480 Merge pull request #1672 from acemod/hearingAmmoClassCaching 
Improved config caching
 2015-06-20 09:48:07 +02:00
Macusercom
cac8dd8b02 German translations fixes 2015-06-20 02:16:30 +02:00
Glowbal
5887c59c05 Made fix properly for advanced medical 2015-06-19 23:03:31 +02:00
Glowbal
300a33ea0a Initial work 2015-06-19 22:53:25 +02:00
PabstMirror
25df7aad09 Attach use purely virtual object (no setPos) 2015-06-19 13:32:42 -05:00
ulteq
474e694309 Enable interaction with explosives while swimming 2015-06-19 11:49:38 +02:00
PabstMirror
6c7ba7b5ae Zeus module on dedicated server 2015-06-18 22:43:49 -05:00
PabstMirror
375c81d9b0 Connect Zeus module to Frag 2015-06-18 22:13:06 -05:00
PabstMirror
9c0478ddfd Cleanup 2015-06-18 22:04:48 -05:00
PabstMirror
e235ebcc15 Fix frag always killing thrower 2015-06-18 21:48:23 -05:00
ViperMaul
394bcafc4a Set version to 3.1.2 2015-06-18 15:49:27 -07:00
PabstMirror
d7717448fa #1670 - Laser pointer - pass _brightness to drawFnc 2015-06-18 17:16:53 -05:00
ulteq
5d2905ca42 Improved config caching 2015-06-18 11:56:58 +02:00
ulteq
c3fea42bce Merge pull request #1622 from acemod/huntirHitpoints 
Added 'parachute' and 'camera' hitpoints to the HuntIR model:
 2015-06-18 11:03:15 +02:00
ulteq
bb877bc54c Added HuntIR and tactical ladder to ACE_Box_Misc 2015-06-18 11:02:04 +02:00
Glowbal
0631a6ae7d Merge pull request #1647 from acemod/medicalStringtableFix 
Fixes: #1646
 2015-06-18 08:34:42 +02:00
Glowbal
160d659523 Merge pull request #1656 from acemod/wireCutterCwire 
Add concertinawire to wirecutters
 2015-06-18 08:34:02 +02:00
ViperMaul
85c40a4cf2 Merge pull request #1668 from acemod/release 
Release v3.1.1 merge into Master
 2015-06-17 19:15:35 -07:00
Macusercom
500504d93b Further improvements as suggested for German translation 2015-06-18 00:43:23 +02:00
jonpas
083d34b62b Removed redundant GVAR 2015-06-18 00:21:56 +02:00
ViperMaul
bab33bfbe2 Bump the build number from 0 to 1 2015-06-17 08:15:19 -07:00
ViperMaul
e5a5832cac Merge branch 'release' of https://github.com/KoffeinFlummi/ACE3 into release 2015-06-16 22:43:46 -07:00
ViperMaul
47ef53201a Set version number to 3.1.1 2015-06-16 22:41:04 -07:00
Glowbal
a8998690ea Merge pull request #1650 from acemod/tacticalladderFixes 
Fixed model.cfg and requiredAddons
 2015-06-17 07:36:01 +02:00