6736 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
PabstMirror	bdca10eac4	Close Client Settings When open Server Settings	2015-08-11 01:38:31 -05:00
PabstMirror	2565a80a22	#2098 - Option Menu Fixes for categories ... Use lbValue to store the index of the filtered selection	2015-08-10 17:19:30 -05:00
Glowbal	d70b8f88be	Merge pull request #2092 from jokoho48/repair ... Add New Model for Repair	2015-08-10 23:40:57 +02:00
Glowbal	ffa476bee2	Improved action display text	2015-08-10 23:16:58 +02:00
Glowbal	c016d01414	Initial load in cargo module	2015-08-10 23:07:47 +02:00
PabstMirror	4377bbeb75	Delete unused file	2015-08-10 15:26:44 -05:00
PabstMirror	512011a756	Remove Debug Code	2015-08-10 15:16:16 -05:00
PabstMirror	47b18b2b39	Cleanup disposables also fix #2090 (alt add for AI)	2015-08-10 15:12:42 -05:00
Glowbal	27a57d89f8	Merge branch 'master' into cargo	2015-08-10 17:59:19 +02:00
Glowbal	e5eaefafdb	fixed #2097 - script error because of global variable in params	2015-08-10 09:51:14 +02:00
bux578	416d8dca6a	and remove height ... d'oh	2015-08-10 09:04:05 +02:00
bux578	1e32132cf9	add width to logo	2015-08-10 09:01:44 +02:00
jokoho48	f3fbf0c5ff	Code cleanup of Finger module is Incomming.	2015-08-10 00:19:27 +02:00
Glowbal	0c2c71e70e	Merge pull request #2056 from MikeMatrix/codeCleanupSandbag ... Code cleanup of Sandbag module	2015-08-09 23:56:25 +02:00
jokoho48	5db5e34edf	Fix Git Shit	2015-08-09 23:50:02 +02:00
gienkov	1c537c6739	fix captives again	2015-08-09 23:04:16 +02:00
gienkov	0914193e14	fix captives module	2015-08-09 22:45:01 +02:00
jokoho48	a3fd072328	Make New Model	2015-08-09 22:44:39 +02:00
gienkov	be787883f2	captives translation	2015-08-09 22:38:34 +02:00
gienkov	49668a25f8	Merge remote-tracking branch 'origin/master' into pl-translation-5	2015-08-09 22:36:41 +02:00
PabstMirror	dc06927418	missing ;	2015-08-09 13:57:39 -05:00
PabstMirror	b57ca91f69	Merge branch 'master' into virtualExplosivesPlace	2015-08-09 13:45:51 -05:00
PabstMirror	6755b8766a	Merge pull request #2085 from jokoho48/codeCleanupDisposable ... Code cleanup of Disposable module	2015-08-09 13:24:18 -05:00
Glowbal	2d7e057acd	Merge pull request #2088 from acemod/fixes-medical-menu ... Fixes for the medical menu	2015-08-09 20:14:20 +02:00
Glowbal	9c8a03b0b3	fixes #2070 - medication is not translated on activity log	2015-08-09 20:12:31 +02:00
Glowbal	aa4840d860	fixes #2075 - menu doesn't show which bodypart is selected on Basic medical	2015-08-09 20:08:45 +02:00
Glowbal	298f64a7bf	fixes #2078 ... 1. Fixed incorrect activity string for tourniquet 2. Fixed incorrect macro usage, should have grabbed variables from medical module.	2015-08-09 20:07:06 +02:00
PabstMirror	207c002f3a	params	2015-08-09 13:02:08 -05:00
PabstMirror	5723c5eaac	Merge branch 'master' into addMainAction	2015-08-09 13:00:56 -05:00
jokoho48	fb56517099	Merge branch 'master' of https://github.com/acemod/ACE3 into repair	2015-08-09 18:58:02 +02:00
Glowbal	e4abf7c8cc	added spare wheel to config	2015-08-09 18:26:49 +02:00
Glowbal	ed6a53a402	Attempt at repairing tracks. Improved repair wheel actions	2015-08-09 18:08:53 +02:00
Glowbal	872d026cd0	All repair actions are now functional	2015-08-09 17:23:32 +02:00
Glowbal	9adbb07367	Moved replace and repair wheel actions into the repair action framework	2015-08-09 15:53:52 +02:00
jokoho48	fab0eee5dd	corrected some small point	2015-08-09 15:28:11 +02:00
Glowbal	3cac137851	Fixed #1893 - Menu closes when patient is more as 10 meters away	2015-08-09 09:14:42 +02:00
Glowbal	58fc69c2a6	Updated litter configuration. Closes #2002	2015-08-09 08:59:04 +02:00
PabstMirror	ec97cd2edd	Fix wheel texture	2015-08-09 01:58:49 -05:00
PabstMirror	4b603ff46f	Localization, params	2015-08-09 01:54:44 -05:00
PabstMirror	0e17bebd23	Merge branch 'master' into repair	2015-08-09 00:33:08 -05:00
jokoho48	b23f9c0de2	Code cleanup of Disposable module	2015-08-09 05:25:19 +02:00
jokoho48	156609aab2	Code cleanup of Disarming module	2015-08-09 05:18:26 +02:00
PabstMirror	7624a459eb	Merge pull request #2010 from jokoho48/codeCleanupInteractMenu ... Code cleanup Interact_menu module	2015-08-08 21:35:54 -05:00
PabstMirror	95d88b920e	#2079 - RemoveTourniquet doesn't require any items	2015-08-08 21:25:36 -05:00
PabstMirror	5628ce1bcd	#2074 - Medical Menu Module not unique	2015-08-08 20:27:56 -05:00
PabstMirror	879826de8b	Merge pull request #2077 from jonpas/fixNametagsString ... Fixed incorrect string path in nametags	2015-08-08 19:58:52 -05:00
PabstMirror	c949daae1f	OptionMenu C->LStrings	2015-08-08 19:57:57 -05:00
gienkov	ce99404200	move english strings from original to english, remove original	2015-08-09 01:52:22 +02:00
gienkov	1c0a6fb457	PL translation of common, medical_menu, optionsmenu	2015-08-09 01:47:55 +02:00
jonpas	7d36d80072	Fixed incorrect string path in nametags	2015-08-09 01:23:20 +02:00