commy2
|
2731ac360a
|
more goggles code cleanup
|
2015-09-29 16:56:10 +02:00 |
|
commy2
|
d25d79c485
|
Goggles Code refactoring initial commit
|
2015-09-29 16:22:57 +02:00 |
|
Derek Sauer
|
954fad615a
|
Reformatted to follow ACE3 coding guidelines.
|
2015-09-29 06:36:36 -04:00 |
|
Derek Sauer
|
8619f02538
|
Take into account wounds that do no cause blood loss.
|
2015-09-29 06:19:49 -04:00 |
|
PabstMirror
|
6e24d2868c
|
Fix playerChanged event
|
2015-09-28 22:41:45 -05:00 |
|
Derek Sauer
|
a864a3411c
|
Clarified a comment.
|
2015-09-28 21:32:04 -04:00 |
|
commy2
|
1ec4556bb8
|
fix zeus forced interface broken, fix #2642
|
2015-09-29 02:48:22 +02:00 |
|
Derek Sauer
|
488541bba6
|
Fix for Arma wounds not being healed with healHitPointAfterAdvBandage.
|
2015-09-28 20:08:07 -04:00 |
|
commy2
|
e375dbe0d7
|
Merge pull request #2598 from acemod/340modifierkey2
rework modifier key, cleanup sandbags, tripod, ladder, fix #2590
|
2015-09-28 21:20:19 +02:00 |
|
commy2
|
19131f001d
|
fix error in handleplayerchanged for tacticl ladder
|
2015-09-28 21:16:13 +02:00 |
|
commy2
|
bc8cefa5e7
|
manual merge
|
2015-09-28 21:06:40 +02:00 |
|
commy2
|
34793ce044
|
Merge pull request #2635 from acemod/340interactcleanup
Code Cleanup Interaction
|
2015-09-28 21:04:28 +02:00 |
|
commy2
|
6c968d8bc7
|
per frame handler for incremental door opening
|
2015-09-28 20:07:01 +02:00 |
|
commy2
|
443cbf8be3
|
fix compile error when trying to open a locked door by shortcut
|
2015-09-28 19:03:37 +02:00 |
|
commy2
|
6f64fcd0fb
|
search for door in geometry lod (lineintersectssurface)
|
2015-09-28 18:45:10 +02:00 |
|
commy2
|
6289a0cadb
|
Merge pull request #2626 from acemod/340weaponselectcleanup
Code Cleanup WeaponSelect
|
2015-09-28 18:10:16 +02:00 |
|
commy2
|
5a3a32f236
|
more interaction cleanup
|
2015-09-28 18:06:25 +02:00 |
|
commy2
|
9bf7b68d76
|
fix errors on game start
|
2015-09-28 17:28:51 +02:00 |
|
commy2
|
5c5a65443b
|
more interaction cleanup
|
2015-09-28 17:20:56 +02:00 |
|
commy2
|
f48636e633
|
more interaction cleanup, remove dead code
|
2015-09-28 17:11:53 +02:00 |
|
Glowbal
|
e1bbc06ef8
|
Merge pull request #2613 from jonpas/improveSlideshowParams
Improved Slideshow API
|
2015-09-28 16:38:00 +02:00 |
|
jonpas
|
4521df0a57
|
Add synchronizedObjects vehicle support to assignObjectsInList with an optional parameter
|
2015-09-28 16:17:12 +02:00 |
|
jonpas
|
db2572acfd
|
Merge branch 'master' into parseList
Conflicts:
addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf
|
2015-09-28 16:06:32 +02:00 |
|
jonpas
|
e4d8f13c89
|
Change may to must in slideshow error log
|
2015-09-28 16:02:18 +02:00 |
|
Glowbal
|
7215dd9082
|
Merge pull request #2368 from jonpas/removeVignetteAndCleanUI
Removed Vignette and Cleaned up UI component
|
2015-09-28 15:56:34 +02:00 |
|
commy2
|
9189148b3f
|
more interaction cleanup
|
2015-09-28 15:37:18 +02:00 |
|
Glowbal
|
74805caa5d
|
Merge pull request #2565 from acemod/medVehAssignFix
assign vehicle module fix for prefilled veh
|
2015-09-28 15:02:48 +02:00 |
|
commy2
|
4b536425b1
|
Code Cleanup Interaction
|
2015-09-28 14:36:51 +02:00 |
|
commy2
|
e9770fcb97
|
remove obsolete functions
|
2015-09-27 17:15:59 +02:00 |
|
commy2
|
1613ce3ff6
|
correct comment
|
2015-09-27 16:55:43 +02:00 |
|
commy2
|
b6532a05cc
|
new function to select a grenade
|
2015-09-27 16:47:02 +02:00 |
|
commy2
|
f8819d3ee4
|
WeaponSelect cleanup
|
2015-09-27 14:55:36 +02:00 |
|
commy2
|
e3b926296f
|
Merge branch 'master' of https://github.com/acemod/ACE3 into 340weaponselectcleanup
|
2015-09-27 13:53:00 +02:00 |
|
commy2
|
af24428363
|
Merge pull request #2607 from acemod/340cleanupBackpacks
Code cleanup Backpacks
|
2015-09-27 13:50:20 +02:00 |
|
commy2
|
1a5f65ec5a
|
Merge pull request #2625 from acemod/340safetymodecleanup
Code Cleanup SafetyMode, also fixes "cannot load sound .wss" RPT error
|
2015-09-27 13:50:11 +02:00 |
|
commy2
|
92ae1da660
|
Merge pull request #2622 from jonpas/aliveCommand
Replaced isAlive function with alive command
|
2015-09-27 13:49:58 +02:00 |
|
commy2
|
5387700460
|
Merge pull request #2610 from acemod/340cleanupNoRadio
Code Cleanup NoRadio
|
2015-09-27 13:49:08 +02:00 |
|
commy2
|
0500d4385d
|
Merge pull request #2611 from acemod/340cleanupHitReactions
Code Cleanup HitReactions
|
2015-09-27 13:48:57 +02:00 |
|
commy2
|
fbe157614b
|
Merge pull request #2612 from acemod/340cleanupGrenades
Code Cleanup Grenades, fix dedicated server AI thrown flasbangs do nothing
|
2015-09-27 13:48:46 +02:00 |
|
commy2
|
3211e6432e
|
Merge pull request #2614 from jonpas/loadCargoOptionalHint
Optionalized Cargo Loaded Hint
|
2015-09-27 13:48:27 +02:00 |
|
commy2
|
a078d73230
|
Code Cleanup WeaponSelect
|
2015-09-27 08:51:42 +02:00 |
|
commy2
|
50046decf3
|
Code Cleanup SafetyMode
|
2015-09-27 08:28:55 +02:00 |
|
PabstMirror
|
4a935eb129
|
Remove debug
|
2015-09-26 22:02:44 -05:00 |
|
PabstMirror
|
174d8ac306
|
#2486 - Run color setup on settingsInit
|
2015-09-26 22:02:05 -05:00 |
|
jonpas
|
2ab58ab9ce
|
Replaced common,isAlive function with alive command
|
2015-09-27 02:23:56 +02:00 |
|
jonpas
|
f35b13bf29
|
Merge branch 'master' into sittingFramework
|
2015-09-27 02:16:51 +02:00 |
|
jonpas
|
ae07a71b0d
|
Minimized XEH to ThingX config level
|
2015-09-27 02:13:32 +02:00 |
|
jonpas
|
cd510c8ff7
|
Added carrying to chairs
|
2015-09-27 02:05:38 +02:00 |
|
jonpas
|
85cff04e0c
|
Stored scroll-wheel action ID into already existing player setVariable instead of having 2
|
2015-09-27 01:37:19 +02:00 |
|
jonpas
|
dbd0beb514
|
Stored a global variable in player setVariable
|
2015-09-27 01:31:23 +02:00 |
|