PabstMirror
|
095252ef76
|
Cleanup
revert `format ["'%1'", QGVAR()];` as it crashes the game
|
2015-11-25 10:16:37 -06:00 |
|
jokoho48
|
fd1c38c612
|
Merge branch 'master' of https://github.com/acemod/ACE3 into handSignals
|
2015-11-24 22:44:32 +01:00 |
|
jokoho48
|
352db4cb66
|
remove some crap code
replace some variables with macros
|
2015-11-24 22:43:42 +01:00 |
|
PabstMirror
|
cfefb1c40e
|
Cleanup spotting scope configs
|
2015-11-24 15:24:14 -06:00 |
|
PabstMirror
|
2c6cfcf294
|
Merge pull request #2832 from p1nga/Spotting-Scope-Update
Updated spotting scope model.
|
2015-11-24 15:23:12 -06:00 |
|
PabstMirror
|
9ecffcd133
|
Merge pull request #2746 from acemod/fixFlashlightPrivates
fix privates in Map module
|
2015-11-24 15:18:38 -06:00 |
|
PabstMirror
|
2c76bc3b10
|
Merge pull request #2605 from TheNiner/master
Fixed Laser Update Position Bug
|
2015-11-24 13:43:53 -06:00 |
|
PabstMirror
|
51a463de24
|
Fix tap shoulder msg display
Missing efunc on displayTextStructured
Calculate a shoulder side when using keybind
|
2015-11-24 11:25:56 -06:00 |
|
PabstMirror
|
86f7ee2ad2
|
Merge pull request #2834 from acemod/addEarPlugsLoudness
Hearing - Add earplugs based on loudness and give to MGs and fix respawn issues
|
2015-11-24 10:52:11 -06:00 |
|
PabstMirror
|
ddc8b16db2
|
Merge pull request #2857 from acemod/invResize154
Inventory Resize UI - changes for 154 GL-Mags
|
2015-11-24 10:24:06 -06:00 |
|
PabstMirror
|
4ae209ab44
|
Merge pull request #2865 from acemod/154UBC
Fix UBC for 1.54
|
2015-11-24 10:23:48 -06:00 |
|
jokoho48
|
773b30df33
|
Merge branch 'master' of https://github.com/acemod/ACE3 into handSignals
|
2015-11-24 15:14:30 +01:00 |
|
PabstMirror
|
7981faad64
|
private -> local
|
2015-11-23 17:47:58 -06:00 |
|
PabstMirror
|
0273dd1d4d
|
Merge branch 'master' into fixFlashlightPrivates
|
2015-11-23 17:45:41 -06:00 |
|
commy2
|
3be60a2f6e
|
Merge pull request #2842 from acemod/fcsUpdateDisplay
Update FCS display after distance adjust
|
2015-11-23 16:34:09 +01:00 |
|
SilentSpike
|
f07f06c843
|
Merge pull request #2760 from acemod/spectatorUpdates
Spectator updates
|
2015-11-21 15:00:44 +00:00 |
|
PabstMirror
|
c2564de5ef
|
Fix UBC for 1.54
Soldiers no longer inherit hitpoints from CaManBase
Adds a macro to deal with them
|
2015-11-20 23:27:29 -06:00 |
|
Glowbal
|
d0cb09196d
|
Merge branch 'master' of github.com:acemod/ACE3
|
2015-11-20 23:29:33 +01:00 |
|
Glowbal
|
67345b0178
|
Fix incorrect variable
_items was the old variable name.
|
2015-11-20 23:28:52 +01:00 |
|
PabstMirror
|
979ff8b479
|
Local -> private
|
2015-11-20 16:13:20 -06:00 |
|
PabstMirror
|
0f62168250
|
Merge pull request #2840 from acemod/fixOverpressure
Overpresure - Misc fixes
|
2015-11-20 15:38:24 -06:00 |
|
PabstMirror
|
08813c1b75
|
Convert local keywords to private
|
2015-11-20 15:36:37 -06:00 |
|
Thomas Kooi
|
801120fb39
|
Merge pull request #2841 from acemod/medicalAiBandage
Move bandage log before basic exit
|
2015-11-20 22:28:55 +01:00 |
|
Thomas Kooi
|
4a19fcc5a5
|
Merge pull request #2771 from BaerMitUmlaut/inWater-deprecation
inWater -> isUnderwater
|
2015-11-20 22:28:43 +01:00 |
|
Thomas Kooi
|
a652be8248
|
Merge pull request #2847 from BaerMitUmlaut/cleanup-moduleAmbianceSound
Cleanup ambient sounds module
|
2015-11-20 22:27:57 +01:00 |
|
PabstMirror
|
063042cb36
|
Merge pull request #2777 from acemod/interactionAnimationSetting
Interaction Menu Animation Setting And PreExpand First Level
|
2015-11-20 14:56:37 -06:00 |
|
PabstMirror
|
7b526a99a3
|
Cleanup
|
2015-11-20 14:53:16 -06:00 |
|
PabstMirror
|
f9a77a62ab
|
Merge pull request #2766 from acemod/settingsErrorChecking
Add Error Checking to Settings + MapGesture Settings
|
2015-11-20 14:51:31 -06:00 |
|
PabstMirror
|
c4117e1283
|
Merge branch 'master' into settingsErrorChecking
Conflicts:
addons/map_gestures/stringtable.xml
|
2015-11-20 14:37:23 -06:00 |
|
PabstMirror
|
dd7c71eeee
|
Merge pull request #2852 from acemod/updateMakepy
make.py - update for new mikros tools
|
2015-11-20 10:34:48 -06:00 |
|
PabstMirror
|
9a9029fa49
|
Merge pull request #2839 from acemod/abFixTwist
AB - Fix ACE_twistDirection
|
2015-11-20 10:32:28 -06:00 |
|
PabstMirror
|
e81dd0729e
|
Inventory Resize UI - changes for 154 GL-Mags
|
2015-11-19 15:54:43 -06:00 |
|
PabstMirror
|
cf9235c926
|
make.py - update for new mikros tools
|
2015-11-19 00:28:28 -06:00 |
|
SilentSpike
|
f8e293d04d
|
Localise spectator hotkeys in help window
|
2015-11-18 15:18:21 +00:00 |
|
SilentSpike
|
0567d1c2a1
|
Fix spectator unit list key press handling
By setting maxHistroyDelay really high, the unit list shouldn't be messed with via key press very often.
|
2015-11-18 15:02:17 +00:00 |
|
SilentSpike
|
0110ada1b5
|
Fix zeus waypoint formation actions
|
2015-11-18 14:54:17 +00:00 |
|
bux578
|
3b2b7fd78d
|
Merge pull request #2821 from dudakov/master
Russian Translations - Update
|
2015-11-18 08:30:46 +01:00 |
|
PabstMirror
|
ebbf2b373a
|
goggles - prevent CBA PFEH warning
fix "x\cba\addons\common\fnc_removePerFrameHandler.sqf:30","WARNING:
Invalid or not existing PFH ID."
|
2015-11-17 23:44:50 -06:00 |
|
kaban
|
da16fc1038
|
\addons\captives\stringtable.xml - resolving conflicts.
|
2015-11-18 06:50:00 +03:00 |
|
kaban
|
f8481ae5f2
|
Merge branch 'master' of https://github.com/acemod/ACE3.git into develop
Conflicts:
addons/captives/stringtable.xml
|
2015-11-18 06:39:58 +03:00 |
|
PabstMirror
|
d6000ae985
|
local -> private
|
2015-11-17 14:33:17 -06:00 |
|
PabstMirror
|
3ec9fca73e
|
local -> private
|
2015-11-17 14:06:12 -06:00 |
|
PabstMirror
|
75d80be143
|
Merge branch 'master' into interactionAnimationSetting
|
2015-11-17 14:05:31 -06:00 |
|
PabstMirror
|
5cbfe4f2a5
|
local -> private
|
2015-11-17 14:02:20 -06:00 |
|
PabstMirror
|
896615beb1
|
Merge pull request #2826 from acemod/settingsParamsArray
Read settings from paramsArray (params in description.ext)
|
2015-11-17 14:01:16 -06:00 |
|
PabstMirror
|
5823749f0c
|
Merge branch 'master' into settingsErrorChecking
|
2015-11-17 14:00:22 -06:00 |
|
commy2
|
a7b5945a12
|
Merge pull request #2849 from acemod/localtoprivate
replace local keyword with private
|
2015-11-17 19:37:38 +01:00 |
|
commy2
|
a57d1bca75
|
replace local keyword with private
|
2015-11-17 17:43:07 +01:00 |
|
SilentSpike
|
23e110d7ce
|
Remove depreciated spectator hotkey
|
2015-11-17 15:26:34 +00:00 |
|
commy2
|
b6f9a2b776
|
Merge pull request #2703 from jonpas/removeAdjustedProneOptics
Remove enable optics in adjusted prone stances
|
2015-11-17 16:24:27 +01:00 |
|