132 Commits

Author	SHA1	Message	Date
Ozan Eğitmen	fd1888be36	Add 'uniforms' Component (#4435)	2016-10-27 19:34:25 +02:00
commy2	5047d95086	add some authors	2016-06-26 00:23:43 +02:00
Glowbal	8dc8926960	Merge branch 'master' into fix-c4996 ... Conflicts: extensions/parse_imagepath/ace_parse_imagepath.cpp	2016-06-12 17:30:29 +02:00
PabstMirror	980da16826	FastRope Sounds - Fix Config, Merge PFEH, Add CC Attribution	2016-05-10 10:09:52 -05:00
looter	2f6b932511	Merge branch 'master' into c4996	2016-04-08 07:33:21 -05:00
bux578	ada519a59c	sort people	2016-03-29 20:35:34 +02:00
FFAAMOD	67695286c7	Added FFAAMOD to AUTHORS.txt	2016-03-02 20:01:41 +01:00
jonpas	f7d89479f5	Move jonpas to Core Team in AUTHORS.txt and remove typo	2016-02-22 22:08:10 +01:00
Thomas Kooi	8055eae580	Merge pull request #3210 from acemod/taggingX ... Tagging X	2016-02-20 17:05:02 +01:00
looterz	dffc087a50	Update AUTHORS.txt	2016-02-17 17:41:17 -06:00
Thomas Kooi	f47b51c0cb	Merge pull request #3070 from dixon13/newCivInteraction ... Changes to civilian interaction	2016-02-05 09:14:45 +01:00
Nicolás Badano	dadec15948	Merge pull request #2104 from acemod/trenches ... Trenches	2016-02-04 23:43:06 -03:00
Joko	a6d84eca8e	add GitHawk to AUTHORS	2016-02-04 21:08:34 +01:00
esteldunedain	2d45a28863	Merge branch 'master' into trenches	2016-02-04 17:04:09 -03:00
Thomas Kooi	f26fb9e9da	Merge pull request #3107 from jonpas/headless ... Add Dynamic AI Group Tranferring to Headless Clients	2016-02-04 20:00:16 +01:00
fr89k	bd9587981d	Added email address for fr89k	2016-01-29 13:58:01 +01:00
fr89k	ddd63bf1a8	AUTHORS.txt now in alphabetical order	2016-01-29 13:54:57 +01:00
fr89k	d2296411d8	As bux578 requested: Added myself to AUTHORS.txt ... Forgot to change the AUTHORS.txt in the last pull request	2016-01-29 13:45:52 +01:00
esteldunedain	1d886ac624	Merge branch 'master' into trenches ... Conflicts: AUTHORS.txt	2016-01-23 17:39:54 -03:00
esteldunedain	e113853395	Merge branch 'master' into tagging	2016-01-20 18:51:41 -03:00
jonpas	971d8d1e02	Add @System98 to AUTHORS.txt	2016-01-02 14:35:39 +01:00
dixon13	16fdde3500	Update AUTHORS.txt	2015-12-23 19:18:23 -07:00
kaban	fd06472f4d	Russian Translations - Update	2015-12-10 20:32:16 +03:00
voiper	675006a22f	Add name to authors.txt	2015-11-29 16:56:48 -08:00
Thomas Kooi	c132ef86cf	Merge pull request #2133 from jonpas/dynamicViewDistance ... Mk 1 eyeballs Integration	2015-11-28 20:40:29 +01:00
Broström.A | Evul	de90960127	Update AUTHORS.txt	2015-10-29 22:51:06 +01:00
Glowbal	8e4bc264cc	Merge branch 'master' into map_gestures ... Conflicts: AUTHORS.txt	2015-10-18 12:20:54 +02:00
[OMCB]kaban	085b60bddd	Added some name to AUTHORS.txt	2015-09-05 05:45:25 +03:00
BaerMitUmlaut	01c37f5bb5	Merge fix	2015-09-02 20:00:17 +02:00
Glowbal	2b3957324c	Merge pull request #2262 from jonpas/readmeFix ... Updated README.md files	2015-08-29 22:37:40 +02:00
Michael Braun	fa4ae6c9a8	Merge branch 'master' of https://github.com/acemod/ACE3 into map_gestures ... Conflicts: AUTHORS.txt	2015-08-29 22:22:16 +02:00
jonpas	ea79e5ef01	Updated DE readme, Fixed issues, ACE to ACE3	2015-08-25 19:30:34 +02:00
bux578	329c3591e4	add head's email address	2015-08-24 16:37:07 +02:00
bux	e7bf803056	fix order of authors, move joko to core	2015-08-24 13:19:18 +02:00
jonpas	b6a24fdb1e	Added Arkhir's email to AUTHORS.txt	2015-08-12 22:38:39 +02:00
jonpas	936e6868bc	Added README.md to viewdistance and Arkhir to AUTHORS.txt	2015-08-12 22:34:16 +02:00
Glowbal	800b254004	Merge branch 'master' into trenches ... Conflicts: AUTHORS.txt	2015-08-10 23:48:07 +02:00
Michael Braun	90e4d005ee	Give credit where credit is due	2015-08-10 08:45:43 +02:00
Michael Braun	bd79a7b8f5	Updated AUTHOR file	2015-08-02 03:30:19 +02:00
PabstMirror	bf4e95e750	Merge pull request #1548 from acemod/fingering ... Fingering	2015-07-26 16:47:41 -05:00
bux578	bd6cff2e37	fix conflict	2015-07-26 21:29:53 +02:00
SilentSpike	159937dc45	Merge branch 'master' into ace_spectator ... Conflicts: addons/explosives/stringtable.xml addons/interact_menu/stringtable.xml addons/interaction/stringtable.xml addons/map/stringtable.xml addons/medical/stringtable.xml addons/sitting/stringtable.xml addons/spectator/stringtable.xml extras/assets/icons/Icons_Modules.psd	2015-07-26 14:15:24 +01:00
PabstMirror	c6f21f48a4	Merge branch 'master' into fingering	2015-07-25 17:28:22 -05:00
Glowbal	f0a2c7c454	Merge pull request #1854 from jonpas/lookUp ... Increased ability to look up	2015-07-25 20:41:46 +02:00
SilentSpike	c48719a644	Attribution for F3 project devs	2015-07-17 16:45:16 +01:00
jonpas	a25ee37762	Added @Karneck to authors	2015-07-15 03:29:20 +02:00
BaerMitUmlaut	0d2db27b17	Merge remote-tracking branch 'upstream/master' into tagging ... Conflicts: AUTHORS.txt	2015-07-08 19:15:57 +02:00
BaerMitUmlaut	86fbe3c423	Added myself to contributors	2015-07-07 17:31:40 +02:00
Joko	fa900452ea	Add DAGR (by Blackpixxel) ... Add QuikClot to Medical (by Blackpixxel) Add QuikClot Litter (by Blackpixxel) Update Blackpixxel at Author Fix IRStrobe Texture Path	2015-07-05 22:21:17 +02:00
PabstMirror	88e0b67364	Merge branch 'master' into fingering	2015-07-05 12:30:31 -05:00