7660 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Glowbal	660f8debf6	Merge branch 'master' into repair	2015-08-11 21:09:44 +02:00
Glowbal	17115b8846	test switch to adv medical handleDamage	2015-08-11 20:58:00 +02:00
voiper	f676f605f3	Fix 00000101.	2015-08-11 11:18:54 -07:00
voiper	f5b6eb5ca9	Git fix Nummer 5.	2015-08-11 11:14:32 -07:00
voiper	4aa28368ad	Git fix numero 5.	2015-08-11 11:10:42 -07:00
voiper	8230dbd272	Git fix #4.	2015-08-11 11:08:01 -07:00
voiper	2d101d064e	Git fix #3.	2015-08-11 10:59:50 -07:00
voiper	e0ed81dc67	Git fix #2.	2015-08-11 10:59:21 -07:00
voiper	2144a56be1	Fix attempt.	2015-08-11 10:49:39 -07:00
Michael Braun	4babfa0bf8	Fixed missing return value description in safemode module	2015-08-11 17:56:46 +02:00
Michael Braun	42e7340b79	Code cleanup of Safemode module	2015-08-11 16:50:05 +02:00
SilentSpike	95aa9f604b	Fix manual pre-setting of spectator camera unit ... If the spectator camera unit was set before the camera had ever opened then the unit list wouldn't be populated and as such the camera would automatically abort to free mode since the unit wasn't available to spectate. So now I'm running the updateUnits function before opening the camera to pre-populate the list.	2015-08-11 13:53:55 +01:00
PabstMirror	a908863317	Use proper lnbXXX commands	2015-08-11 04:15:55 -05:00
PabstMirror	bdca10eac4	Close Client Settings When open Server Settings	2015-08-11 01:38:31 -05:00
PabstMirror	4cce799ace	#2045 - Push SDV sub, cleanup push	2015-08-10 22:08:13 -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
SilentSpike	c30cb45bd6	Optimize spectator UI held key prevention system	2015-08-09 20:59:57 +01: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