licht-im-Norden87
2c7df9da6a
Stringtable: German additions
2015-04-09 23:02:28 +02:00
Glowbal
84c8e02328
Merge pull request #396 from KoffeinFlummi/medicalCleanup
...
Medical cleanup
2015-04-09 22:13:31 +02:00
jaynus
198d4f3540
Fixed private variable overrides and timing failure.
2015-04-09 13:03:28 -07:00
PabstMirror
253614d442
Explosives: cancel placement when opening interact
...
"zoomtemp" doesn't work for me, so this gives an additional way to
cancel. It was also possible to start planting multiple explosives.
made a small change to make QGVAR(PlantingExplosive) always reset
2015-04-09 14:48:27 -05:00
jaynus
01535c7f5c
Merge remote-tracking branch 'origin/master' into allTheMissiles
...
Conflicts:
addons/wep_javelin/config.cpp
2015-04-09 12:41:09 -07:00
Glowbal
d94943a9ff
getting hitpoint damage on non existing hitpoint returns type instead of bool
2015-04-09 21:38:35 +02:00
Glowbal
093d340ee7
Changed: Dragging/carrying now works for units with broken legs
...
Added unload and load of unconscious units
2015-04-09 21:23:10 +02:00
Glowbal
0926397ab4
Removed deadcode and obvious comments
2015-04-09 20:13:46 +02:00
Glowbal
39cbf21278
Removed deprecated carry functions
2015-04-09 20:12:30 +02:00
commy2
a6a19e956b
flashsupressors for new weapons, #264
2015-04-09 19:59:08 +02:00
jaynus
fe147c4986
Config expansion.
2015-04-09 09:39:23 -07:00
commy2
2d265ec6c2
prevent ai fro being stuck, #290
2015-04-09 16:54:50 +02:00
commy2
b41c6280ba
prvent falling ai from being stcuk, fix #290
2015-04-09 16:52:59 +02:00
commy2
147fcdfa0c
Merge pull request #392 from KoffeinFlummi/requiredaddons
...
sorting out required addons for modularity
2015-04-09 16:37:47 +02:00
esteldunedain
f0cc0941e5
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-04-09 10:05:38 -03:00
esteldunedain
8519bb04b7
Merge remote-tracking branch 'origin/removeRecoil'
...
Conflicts:
addons/recoil/config.cpp
2015-04-09 10:05:14 -03:00
Nicolás Badano
c57044fd4a
Merge pull request #390 from KoffeinFlummi/betterMapColors
...
Improve map colors by taking them from A2
2015-04-09 09:52:06 -03:00
esteldunedain
6447b39d1a
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
...
Conflicts:
addons/scopes/XEH_postInit.sqf
2015-04-09 09:32:58 -03:00
esteldunedain
34639c153c
Allow holding scope adjustment keys
2015-04-09 09:31:18 -03:00
KoffeinFlummi
3a871eed58
Merge branch 'master' into tools-cleanup
2015-04-09 13:37:19 +02:00
commy2
5ea35a01bb
sorting out required addons for modularity
2015-04-09 13:23:29 +02:00
esteldunedain
99aa439561
Improve map colors taking them from A2
2015-04-09 01:28:36 -03:00
jaynus
bbfd28586b
Apply ace_missileguidance to Titan. (Direct only) This is testing the extensible framework for mod makers.
2015-04-08 19:51:21 -07:00
PabstMirror
2033676e81
another undef to Make PBO-Project Happy
2015-04-08 18:20:00 -05:00
jaynus
5a9a8d239c
Remove test parameters, timing correct. Attack profile selection working.
2015-04-08 15:52:58 -07:00
jaynus
0a1aae8553
Work save, timing correction.
2015-04-08 15:41:26 -07:00
jaynus
97230c2252
compensate for FPS lag.
2015-04-08 15:34:59 -07:00
jaynus
c89df1b04f
Dir arc created.
2015-04-08 14:51:19 -07:00
jaynus
97febd6207
Disable debug, wtf math
2015-04-08 14:31:44 -07:00
jaynus
04b0efb22b
Safer calling, build out attack profiles.
2015-04-08 13:57:08 -07:00
jaynus
cf876116a9
Working configuration based guidance framework.
2015-04-08 13:45:43 -07:00
commy2
3e3390750d
manual merge
2015-04-08 22:01:41 +02:00
commy2
c5b38c8942
manual merge
2015-04-08 21:51:42 +02:00
commy2
1ae69d56ff
Merge pull request #377 from KoffeinFlummi/142light
...
142 directional light for map effects
2015-04-08 21:46:48 +02:00
commy2
7346c194f4
Merge pull request #306 from KoffeinFlummi/optics
...
Taosenai's Animated Optics req 1.42
2015-04-08 21:41:12 +02:00
PabstMirror
c3564ee883
undef to Make PBO-Project Happy
2015-04-08 14:38:29 -05:00
jaynus
6f9203262a
tweak default deflection values for testing
2015-04-08 12:32:33 -07:00
Glowbal
3702679ee4
fixed wrong value for radio disabled on waking up
2015-04-08 21:31:59 +02:00
jaynus
d2e3ea347a
Merge remote-tracking branch 'origin/master' into allTheMissiles
2015-04-08 12:17:46 -07:00
PabstMirror
a4af1fcb30
Fix Marker Placement on UAV Map
2015-04-08 13:55:29 -05:00
jaynus
3946ee32d2
Fixes left/right issue.
2015-04-08 11:27:30 -07:00
commy2
3de3432664
Merge pull request #271 from KoffeinFlummi/142resting
...
1.42 - Remove scripted weapon resting
2015-04-08 20:26:13 +02:00
PabstMirror
2bc0976979
Merge pull request #277 from KoffeinFlummi/revert-276-revert-272-142menudeploy
...
Revert "Revert "1.42 - cursor mode when bipod deployed""
2015-04-08 13:26:05 -05:00
PabstMirror
023a2d2202
Merge pull request #267 from KoffeinFlummi/142Markers
...
1.42 Marker Placement
2015-04-08 13:24:55 -05:00
PabstMirror
176a39e86c
Merge pull request #265 from KoffeinFlummi/142InventoryConfig
...
1.42 Inventory Config
2015-04-08 13:22:12 -05:00
PabstMirror
007e4fc234
Merge pull request #274 from KoffeinFlummi/142requiredaddons
...
1.42 ensure ace is loaded after marksmen configs
2015-04-08 13:21:33 -05:00
jaynus
bc7943d729
added todo
2015-04-08 09:18:11 -07:00
jaynus
87dac2c2ad
Merge remote-tracking branch 'origin/master' into allTheMissiles
2015-04-08 08:55:14 -07:00
jaynus
177be598d7
Fixes: Laser designator now uses strongest ray result.
2015-04-08 08:48:08 -07:00
jaynus
64724737cd
Code passing cleanup.
2015-04-08 08:35:24 -07:00
PabstMirror
af3d6a5113
#386 - Ace Options Menu on main menu
...
Same limitations as CBA controls, needs a intro or mission loaded
Doesn't work with -skipintro command line.
2015-04-08 10:33:12 -05:00
jaynus
61f5324d29
ACE_Settings entry for guidance.
2015-04-08 08:19:19 -07:00
jaynus
104dd2258e
Guidance framework working.
2015-04-08 08:01:39 -07:00
commy2
01a9374a26
Merge pull request #382 from KoffeinFlummi/disablebs
...
disable cursor showing map position
2015-04-08 10:48:31 +02:00
commy2
deece11689
remove debug
2015-04-08 10:47:56 +02:00
commy2
a47cdb9738
disable map cursor coordinates in mp
2015-04-08 10:45:57 +02:00
esteldunedain
b18bcf8835
Add option to turn on/off cursor coordinates
2015-04-08 01:49:56 -03:00
commy2
691ab012b4
fix map loaded on preInit
2015-04-08 00:44:14 +02:00
commy2
4834facccf
moving it to map
2015-04-08 00:30:36 +02:00
KoffeinFlummi
ce45237989
Report full version number in RPT for debugging
2015-04-08 00:27:00 +02:00
commy2
50dbbda8eb
disable cursor showing map position
2015-04-08 00:20:43 +02:00
esteldunedain
ed3ac637d2
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-04-07 19:19:46 -03:00
PabstMirror
2f4335d3c2
#344 - Ignore missing ace_serverconfig on client
2015-04-07 17:14:27 -05:00
commy2
949c5d4333
manual merge
2015-04-07 23:26:16 +02:00
commy2
518c704db6
manual merge
2015-04-07 23:18:31 +02:00
commy2
2e66e57535
manual merge
2015-04-07 23:08:17 +02:00
commy2
d1b8595c0e
light intensity from object: handle campfires
2015-04-07 23:02:54 +02:00
PabstMirror
d060b13bbe
#86 - Stretch gps info box to support 8 digits
2015-04-07 15:47:12 -05:00
commy2
b6c278e7d3
fix using efunc vs func
2015-04-07 22:33:35 +02:00
commy2
96268b6407
directional light for map effects
2015-04-07 22:19:03 +02:00
PabstMirror
6b0fb84f65
Cleanup / Headers
2015-04-07 15:01:44 -05:00
jaynus
bf70a9ba77
Tracers and colors
2015-04-07 12:59:35 -07:00
jaynus
fa9cf0280c
script error
2015-04-07 12:44:15 -07:00
commy2
88a5519465
cache the frames
2015-04-07 21:42:08 +02:00
PabstMirror
2ad9193475
Use DrawIcon for map tools
2015-04-07 14:38:35 -05:00
jaynus
d3d5554c49
Laser designation information localized to vehicle.
2015-04-07 12:35:34 -07:00
commy2
14718eb5b4
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
2015-04-07 21:22:21 +02:00
commy2
d825505aa0
cache light config properties
2015-04-07 21:22:00 +02:00
jaynus
0c3b51c28b
Merge remote-tracking branch 'origin/master' into allTheMissiles
2015-04-07 12:12:05 -07:00
jaynus
2ea7ecdbf7
Working save.
2015-04-07 12:11:28 -07:00
Glowbal
14906c68c0
Merge pull request #374 from KoffeinFlummi/medicalImprovements
...
Medical improvements
2015-04-07 21:07:28 +02:00
Glowbal
ffbe9f0c71
Setting for getting rid of hitpoint damage after adv medical damage
2015-04-07 21:06:48 +02:00
commy2
ba618a69ec
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
2015-04-07 20:54:45 +02:00
commy2
722c2af4dc
lightIntensity, handle soldier flashlights
2015-04-07 20:54:25 +02:00
Glowbal
c823826f17
Merge branch 'master' into medicalImprovements
2015-04-07 20:53:24 +02:00
Glowbal
2b341c2a8b
left over CSE function calls removed
2015-04-07 20:50:44 +02:00
Glowbal
545014b073
missing return value
2015-04-07 20:47:36 +02:00
Glowbal
ac3bda3135
improvements to displayPatientInformation. Bandaged wounds should be more clear now
2015-04-07 20:19:32 +02:00
esteldunedain
04d94bb7be
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-04-07 15:01:53 -03:00
esteldunedain
765ae4ee64
Merge branch 'master' into tabCleanup
...
Conflicts:
addons/explosives/functions/fnc_addClacker.sqf
addons/explosives/functions/fnc_detonateExplosive.sqf
addons/explosives/functions/fnc_getPlacedExplosives.sqf
addons/explosives/functions/fnc_openDetonateUI.sqf
addons/explosives/functions/fnc_openPlaceUI.sqf
addons/explosives/functions/fnc_openTransmitterUI.sqf
addons/explosives/functions/fnc_openTriggerSelectionUI.sqf
addons/explosives/functions/fnc_placeExplosive.sqf
addons/explosives/functions/fnc_place_Approve.sqf
addons/explosives/functions/fnc_setPosition.sqf
2015-04-07 15:00:56 -03:00
Glowbal
526e24f133
formatting
2015-04-07 19:56:54 +02:00
Glowbal
3d82cb8eac
Removed deprecated onTreatmentCompleted event
2015-04-07 19:54:24 +02:00
commy2
d34cfdb003
fix: day laser when being captured
2015-04-07 19:38:19 +02:00
Glowbal
7fb3ac6740
Added _x_ca suffixes to all item pictures
2015-04-07 19:16:56 +02:00
commy2
98f7125171
function to return light intensity recieved from another object
2015-04-07 18:54:53 +02:00
jaynus
6deff125ce
Self designation lockdown and cleanup
2015-04-07 09:05:19 -07:00
jaynus
f973505746
DAGR and Hellfire modified config values.
2015-04-07 08:53:47 -07:00
commy2
deabbcd840
add function that returns config properties of a vehicles light
2015-04-07 15:43:23 +02:00
commy2
5df25cf44d
function to return all turned on lights of any objects
2015-04-07 15:06:27 +02:00
commy2
0d126dc562
function to return object's lights
2015-04-07 14:44:34 +02:00
commy2
bb8762f4b9
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
2015-04-07 13:55:09 +02:00
commy2
ad5aad60c7
fix: ambient brightness can return values greater 1
2015-04-07 13:54:33 +02:00
Pierre Humberdroz (meat)
4c49765c8f
translation changes
...
#370
2015-04-07 10:39:41 +02:00
bux578
92da20ce62
translations
...
#367
2015-04-07 10:02:33 +02:00
bux578
9ce2e38814
removed <orignal> language entry
2015-04-07 09:27:26 +02:00
KoffeinFlummi
8d5bdd2c01
Revert "fix shitty initSpeed definitions breaking SD mags, fix #182 "
...
This reverts commit 55f49eaa1c
2015-04-07 09:04:17 +02:00
jaynus
9aa84322c7
Magazine, Ammo and Missile breakout.
2015-04-06 23:15:26 -07:00
jaynus
2d019abede
WIP Guidance rewrites.
2015-04-06 22:38:34 -07:00
jaynus
99008ac729
Merge pull request #332 from KoffeinFlummi/medicalBox
...
Added: Generic placeholder medical box.
2015-04-06 19:09:16 -07:00
jaynus
eb6fdc2e34
cleaner LOAL DAGR
2015-04-06 19:03:11 -07:00
jaynus
a744896b20
Fixed: jaynus fucked up.
2015-04-06 18:51:08 -07:00
jaynus
34444ebb32
Fixed: github merge error fixed.
2015-04-06 18:37:05 -07:00
jaynus
27caff5564
Fixed: Add platform velocity to FCS calculations; resolves #361
2015-04-06 18:36:39 -07:00
Glowbal
12493f8595
Improved wounds configuration (missing maxDamage values added)
2015-04-07 00:57:05 +02:00
Glowbal
c7549a13a4
Improved pain reduction
2015-04-07 00:41:53 +02:00
jaynus
446a30e4fc
Merge pull request #352 from KoffeinFlummi/comancheFixes
...
Goes along with FCS fixes, merging quickly due to overall fixes.
2015-04-06 15:07:09 -07:00
jaynus
4a8f24b59c
Merge pull request #356 from KoffeinFlummi/fcsMadness
...
Fcs madness
2015-04-06 15:00:24 -07:00
jaynus
e0605f9e81
Remove default hint for FCS but play sound, Resolves #317
2015-04-06 14:57:07 -07:00
jaynus
7fa8365d51
Remove debug, new Release build of extension.
2015-04-06 14:50:22 -07:00
esteldunedain
09461d94ef
Rewritten changeProjectileDirection
2015-04-06 18:10:17 -03:00
esteldunedain
aec9962121
Fix changeProjectileDirection
2015-04-06 18:02:08 -03:00
esteldunedain
35129a7a41
Debug stuff for the velocity correction
2015-04-06 17:37:18 -03:00
Garth L-H de Wet
513ab25f54
Merge branch 'master' into explosiveInteraction
...
Conflicts:
addons/explosives/functions/fnc_placeExplosive.sqf
2015-04-06 22:30:27 +02:00
Garth L-H de Wet
9d7d71b1b1
Changed the tabs to 4 spaces. Hopefully.
2015-04-06 22:20:11 +02:00
Garth "L-H" de Wet
e0b4efd9f1
Merge pull request #280 from KoffeinFlummi/explosiveInteraction
...
Explosive interaction
2015-04-06 22:12:04 +02:00
Garth L-H de Wet
44c597f7c5
Explosives, 2 spaces to 4 space tab.
2015-04-06 22:10:00 +02:00
jaynus
acf683e621
Call every 10th of a second.
2015-04-06 12:58:53 -07:00
jaynus
906612f954
Fixed: Gunner FOV, explosive rounds and FPS drop.
2015-04-06 12:54:06 -07:00
esteldunedain
04e9f28734
Make function handle negative numbers
2015-04-06 16:12:38 -03:00
commy2
c1799616c7
add function to convert numbers to string
2015-04-06 20:47:11 +02:00
jaynus
d6cf07a3b6
Changed: FCS update was not being delayed for laser. Delay of 0.5s added.
2015-04-06 11:44:17 -07:00
Glowbal
bdb5c8e728
Merge pull request #349 from KoffeinFlummi/medicalBugFixes
...
Exit displayPatientInformation PFH when a different selection is selected.
2015-04-06 19:49:12 +02:00
Glowbal
4c6dad69f9
Should fix #347 . Could not reproduce but this at least fixes some issues (which most likely caused the error)
2015-04-06 19:43:27 +02:00
jaynus
1bb6be5654
Cleaning up of all tabs in source code files.
2015-04-06 09:22:43 -07:00
jaynus
bdcec243a8
Changed: Comanche Gatling HEDP effects and dispersion.
2015-04-06 09:14:56 -07:00
PabstMirror
c1abb2669d
#340 - Fix stringtables
2015-04-06 11:03:04 -05:00
jaynus
c3dbcf1351
increase frequency of laser update.
2015-04-06 07:40:20 -07:00
commy2
796a430292
Merge pull request #326 from KoffeinFlummi/VectorFOSfix
...
Fix for Vector Fall-of-Shot display
2015-04-06 16:20:13 +02:00
commy2
1e497c228c
switch sides of add/drop left/right
2015-04-06 16:18:59 +02:00
Glowbal
1c28e82725
Merge pull request #341 from KoffeinFlummi/medicalFixes
...
Fixes for bodybag and support for radio mods in medical
2015-04-06 16:17:08 +02:00
commy2
ebd1e555a3
fix: derp when switching control numbers
2015-04-06 16:07:52 +02:00
Glowbal
76ad6b8294
Added missing main actions
2015-04-06 15:46:50 +02:00
Glowbal
ce4cdd3722
staged bodybag fixes
2015-04-06 15:11:54 +02:00
Glowbal
661d93e82c
Working commit
2015-04-06 14:51:17 +02:00
Glowbal
8e176eff55
Fixed treatment locations
2015-04-06 14:32:37 +02:00
Glowbal
43b3190202
config fix
2015-04-06 14:14:00 +02:00
Glowbal
10a1108aae
Added support for customizable treatment location limitation
2015-04-06 14:11:10 +02:00
Glowbal
2657677bd8
Added support for TFR/ACRE on unconscious
2015-04-06 14:09:59 +02:00
esteldunedain
be81e16c71
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-04-06 09:07:20 -03:00
esteldunedain
4cf2410622
Fix duplicated laser designator actions
2015-04-06 09:06:56 -03:00
Glowbal
0bcb7f76dc
This should not be here
2015-04-06 13:12:40 +02:00
Glowbal
83c670576b
fixed typeOf instead of typeName
2015-04-06 11:58:52 +02:00
Glowbal
befb52e855
Merge pull request #260 from KoffeinFlummi/serverConfig
...
Server Config support
2015-04-06 01:42:33 +02:00
jaynus
c87f2f8bcc
Added: Generic placeholder medical box.
2015-04-05 15:16:32 -07:00
jaynus
8fa6ab38fd
Merge branch 'serverConfig' of github.com:KoffeinFlummi/ACE3 into serverConfig
2015-04-05 14:08:54 -07:00
jaynus
d6632a0e45
Module should default to true.
2015-04-05 14:08:42 -07:00
jaynus
e3ad83e109
Merge pull request #286 from KoffeinFlummi/lasers
...
Self designating lasers, Javelin Guidance, DAGR laser guidance, Comanche updated HUDS
2015-04-05 13:26:54 -07:00
VKing
8255ff666d
Fix long-standing typo (get it?)
2015-04-05 22:18:28 +02:00
VKing
8ad202b039
Fix Fall-of-Shot units being inverted
2015-04-05 22:16:47 +02:00
Glowbal
9e3bb8ac95
fixed triage card
2015-04-05 22:07:38 +02:00
jaynus
7d5fca3c5a
DIR guidance on Javelin missiles/Titan. TODO: The guidance codes need re-works.
2015-04-05 12:55:17 -07:00
Glowbal
12d10b8bf7
Blood loss for basic (from AGM medical)
2015-04-05 21:38:15 +02:00
jaynus
788487baa5
Debug disable
2015-04-05 11:54:00 -07:00
jaynus
34b834e700
Rudimentary hold-tab lock on titan, sounds added, jink removed, state tracking.
2015-04-05 11:51:39 -07:00
Glowbal
147bb92541
Added setting to disable variable sync (recommended on)
2015-04-05 20:23:07 +02:00
Glowbal
7ffd690a71
Changed: IVs are now synced and medics can see a unit is receiving an IV
2015-04-05 20:11:54 +02:00
jaynus
278ffe7d65
save
2015-04-05 10:45:09 -07:00
Glowbal
89015c94d4
Removed rouge system chat and diag_log messages
2015-04-05 19:42:55 +02:00
Glowbal
ae2adc17b9
changed all medical items to inherit from ACE_ItemCore
2015-04-05 19:37:07 +02:00
Glowbal
2c0bec2b07
disabled injury visualization for bandaged wounds
2015-04-05 19:36:40 +02:00
Glowbal
171ebf827a
No litter created when in vehicle
2015-04-05 19:28:57 +02:00
Glowbal
a0bbbdb0b7
fixed place in bodybag
2015-04-05 19:27:53 +02:00
Glowbal
f52891436a
oops
2015-04-05 19:27:40 +02:00
Glowbal
ecf84ae039
Updated module classname to be inline with others
2015-04-05 19:27:28 +02:00
Glowbal
0f52059249
Fixed CPR script error
2015-04-05 19:27:09 +02:00
Glowbal
dca75c5557
Implemented bandaged wounds setting (adv)
2015-04-05 19:26:33 +02:00
Glowbal
e3e17d8fcb
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-04-05 15:51:42 +02:00
Glowbal
c210efcef0
fixed #312 Error occurred with undefined damageTypes. In this case; getting run over by a vehicle.
2015-04-05 15:51:28 +02:00
Glowbal
c514fde5d3
Not necessary here. Makes it only work once.
2015-04-05 15:13:34 +02:00
Glowbal
bae3826bdf
Polished server config export
2015-04-05 14:48:23 +02:00
Glowbal
b6b880fba0
Merge pull request #310 from KoffeinFlummi/medicalActionsWhileBoarded
...
Add medical actions while boarded.
2015-04-05 14:36:17 +02:00
Glowbal
92bdae9321
Removed diag_log spam
2015-04-05 13:25:53 +02:00
Glowbal
32625b446b
fixed animation being reset even when inside a vehicle
2015-04-05 13:03:09 +02:00
Glowbal
cf1f641424
Moved selfActions to a separate hpp file
2015-04-05 13:02:55 +02:00
Glowbal
f1a3d588ba
Changed initialization order of config settings.
...
ACE_Settings should never force any setting by default. Loading it first ensures that all settings from ACE_Settings exist. This way, ACE_ServerSettings will override ACE_Settings, even if no force is used. Mission settings will override the server config settings, if no force is used.
This ensures that all settings are of their correct type, in case an outdated or corrupt server config is used, as well as have their correct localized display name and description
2015-04-05 12:38:10 +02:00
Glowbal
279641787d
Added checks for enforce usage only in SP with settings enabled
2015-04-05 11:11:54 +02:00
Glowbal
202904f1f9
Using 1 and 0 instead of true and false for config export
2015-04-05 10:32:40 +02:00
jaynus
6288a809f7
actually final terminal decent. woops.
2015-04-04 22:36:09 -07:00
Glowbal
d487092d84
formatting
2015-04-05 02:33:45 +02:00
Glowbal
110635df7b
improved formatting
2015-04-05 02:33:11 +02:00
Glowbal
a0af055917
export config should force the settings
2015-04-05 02:22:24 +02:00
Glowbal
7928ca71a5
Server side config export
2015-04-05 02:17:43 +02:00
jaynus
583acf6558
ctrlShow is not operational on ControlGroups in RscOptics.
2015-04-04 17:15:59 -07:00
jaynus
ab0d289762
Merge remote-tracking branch 'origin/master' into lasers
2015-04-04 16:56:03 -07:00
jaynus
aee7eb9406
Working save.
2015-04-04 16:55:53 -07:00
PabstMirror
75351f2a5b
TapShoulder - fix hint message
2015-04-04 17:54:15 -05:00
esteldunedain
f417fa2285
Add medical actions while boarded.
2015-04-04 19:41:12 -03:00
PabstMirror
e03d3ed619
Merge pull request #284 from KoffeinFlummi/beltRepacking
...
MagRepack - Belt Repacking / Child Actions
2015-04-04 17:18:53 -05:00
esteldunedain
848b5133ef
Remove debug chats for interact_menu
2015-04-04 19:15:29 -03:00
Glowbal
044d2551ce
Merge branch 'master' into serverConfig
2015-04-04 23:00:47 +02:00
