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 |
|
jonpas
|
a7a716ca8d
|
Better sitting framework in terms of interactions
|
2015-09-27 01:20:40 +02:00 |
|
jonpas
|
e3985dce3e
|
Cleanup sitRotation as it's no longer needed
|
2015-09-27 00:40:59 +02:00 |
|
jonpas
|
151903ace4
|
Expanded optional hint to addCargoItem and AddCargoByClass event
|
2015-09-27 00:31:23 +02:00 |
|
jonpas
|
b345db4ae9
|
Added Zeus modules for adding Spare Tracks and Wheels
|
2015-09-27 00:29:19 +02:00 |
|
jonpas
|
30544dc757
|
Make cargo loaded hint optional, disable it when not loading manually
|
2015-09-26 23:16:05 +02:00 |
|
jonpas
|
498dddcc26
|
Used isEqualTo
|
2015-09-26 23:06:35 +02:00 |
|
jonpas
|
b787286837
|
Fixed allowed data types
|
2015-09-26 23:02:18 +02:00 |
|
jonpas
|
4a5d6cade1
|
Bracket to Brace
|
2015-09-26 22:54:31 +02:00 |
|
jonpas
|
64d6a172c7
|
Improved public function parameter handling, Fixed issue with synchronized objects
|
2015-09-26 22:53:49 +02:00 |
|
commy2
|
cd839a0ddc
|
remove superfluous brackets
|
2015-09-26 22:42:47 +02:00 |
|
commy2
|
6cc920dc34
|
Code Cleanup Grenades, fix dedicated server AI thrown flasbangs do nothing
|
2015-09-26 22:39:12 +02:00 |
|
commy2
|
028aa404e9
|
change description in function header
|
2015-09-26 21:27:00 +02:00 |
|
commy2
|
c12584e15c
|
Code Cleanup HitReactions
|
2015-09-26 21:23:18 +02:00 |
|
commy2
|
0509e26690
|
Code Cleanup NoRadio
|
2015-09-26 20:45:19 +02:00 |
|
commy2
|
9ae215704c
|
Code cleanup Backpacks
|
2015-09-26 20:29:08 +02:00 |
|
commy2
|
f77242fce3
|
Merge pull request #2604 from acemod/340fixunconaftersettngsinit
delay setUnconscious until the settings are inited
|
2015-09-26 19:54:09 +02:00 |
|
commy2
|
07774647e9
|
delay setUnconscious until the settings are inited, fix #148
|
2015-09-26 19:30:13 +02:00 |
|
commy2
|
93114802d2
|
Merge pull request #2603 from acemod/340fixcargodestroyed
dont access cargo of destroyed vehicles, fix #2523
|
2015-09-26 18:29:56 +02:00 |
|
commy2
|
8affae9f7a
|
dont access cargo of destroyed vehicles, fix #2523
|
2015-09-26 18:16:38 +02:00 |
|
commy2
|
777ac05d16
|
Merge pull request #2602 from acemod/340respawncleanup
Code cleanup respawn module, close #2184
|
2015-09-26 17:58:17 +02:00 |
|
commy2
|
6d9943ff2e
|
fix wrong macro, missing ;
|
2015-09-26 16:45:39 +02:00 |
|
commy2
|
b1fb7befe8
|
remove wrong isServer check
|
2015-09-26 16:32:29 +02:00 |
|
commy2
|
5425836e47
|
cleanup respawn module, close #2184
|
2015-09-26 16:28:18 +02:00 |
|
commy2
|
f0584adeff
|
Merge pull request #2601 from acemod/340fixfixfloatingSelections
fix fixFloating resetting reflector hitpoints, close #2279
|
2015-09-26 14:45:50 +02:00 |
|
commy2
|
dc7d24a3fd
|
fix fixFloating resetting reflector hitpoints, close #2279
|
2015-09-26 14:38:50 +02:00 |
|
Glowbal
|
e257827a69
|
Merge branch 'master' of github.com:acemod/ACE3
|
2015-09-26 10:13:02 +02:00 |
|
PabstMirror
|
8bb5f71ba1
|
Macro for non spawned CBA Debug Logging
|
2015-09-25 22:30:57 -05:00 |
|
commy2
|
2fe142032e
|
rework modifier key, cleanup sandbags, tripod, ladder, fix #2590
|
2015-09-26 03:16:55 +02:00 |
|
SilentSpike
|
5f7c30dd7c
|
Merge pull request #2597 from Cuel/delay-spectator
fix spectator view if called instantly
|
2015-09-25 13:34:37 +01:00 |
|
jokoho48
|
4ad16ed938
|
fix that waitUntilAndExecute have a return
|
2015-09-25 13:29:39 +02:00 |
|
jokoho48
|
998fbcc403
|
Merge remote-tracking branch 'remotes/acemod/master' into waitUntilAndExecute
Conflicts:
addons/common/XEH_postInit.sqf
|
2015-09-25 13:19:19 +02:00 |
|
Cuel
|
dcbf977d6d
|
fix spectator view if called instantly
If you call setSpectator directly from init.sqf you'll be put into some
weird limbo mode with borders and spectator not working. This should fix
it
|
2015-09-25 12:51:13 +02:00 |
|
commy2
|
43cdfaecc0
|
Merge branch 'master' of https://github.com/acemod/ACE3
|
2015-09-25 11:15:46 +02:00 |
|