Commit Graph

2749 Commits

Author SHA1 Message Date
PabstMirror
2f4335d3c2 #344 - Ignore missing ace_serverconfig on client 2015-04-07 17:14:27 -05:00
KoffeinFlummi
490df5930e Add build number to release build 2015-04-08 00:13:58 +02:00
KoffeinFlummi
4d001642dc Merge remote-tracking branch 'origin/master' into tools-cleanup 2015-04-07 23:42:47 +02: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
esteldunedain
2d211e839f Further remove standalone { on code 2015-04-07 18:09:32 -03:00
commy2
2e66e57535 manual merge 2015-04-07 23:08:17 +02:00
esteldunedain
24750781aa Remove { on newlines 2015-04-07 18:03:30 -03:00
commy2
d1b8595c0e light intensity from object: handle campfires 2015-04-07 23:02:54 +02:00
ulteq
5dba9f7b3f Fixed inconsistent tabulation 2015-04-07 22:53:20 +02:00
PabstMirror
d060b13bbe #86 - Stretch gps info box to support 8 digits 2015-04-07 15:47:12 -05:00
ulteq
b5f4105738 Added official manual 2015-04-07 22:46:28 +02:00
ulteq
31b19a4ef3 Replaced tabs with spaces 2015-04-07 22:44:26 +02:00
ulteq
45e7194117 Fixed Readme 2015-04-07 22:40:27 +02:00
ulteq
4ea91d832e Fixed incorrect canShow function 2015-04-07 22:37:47 +02:00
commy2
b6c278e7d3 fix using efunc vs func 2015-04-07 22:33:35 +02:00
ulteq
07e6c89267 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ATragMX 2015-04-07 22:27:13 +02:00
ulteq
c3fbd8a195 Removed the old Kestrel module 2015-04-07 22:22:41 +02:00
commy2
96268b6407 directional light for map effects 2015-04-07 22:19:03 +02:00
KoffeinFlummi
7398c7a8ed Make build.bat a python script 2015-04-07 22:16:22 +02:00
ulteq
b60a8f2547 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into AdvancedBallistics 2015-04-07 22:13:20 +02:00
ulteq
183034183e Resolved a minor issue between protractor and wind info 2015-04-07 22:02:38 +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
ulteq
2a619b5aeb Merge branch 'abIntegration' into AdvancedBallistics
Conflicts:
	addons/advanced_ballistics/functions/fnc_displayProtractor.sqf
	addons/advanced_ballistics/functions/fnc_displayWindInfo.sqf
2015-04-07 21:59:28 +02:00
ulteq
ef3205e078 Replaced all <floats> with <NUMBER> 2015-04-07 21:54:29 +02:00
ulteq
c9ad2b279d Commented all advanced ballistics functions 2015-04-07 21:46:43 +02: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
KoffeinFlummi
37935c014d Add release folder and cache files to gitignore 2015-04-07 21:40:26 +02:00
KoffeinFlummi
b2de6a0013 Move syntax highlighting to extras/ 2015-04-07 21:39:49 +02:00
KoffeinFlummi
d0009cd38a Remove unneeded scripts 2015-04-07 21:39:22 +02:00
PabstMirror
2ad9193475 Use DrawIcon for map tools 2015-04-07 14:38:35 -05:00
KoffeinFlummi
93b31af2d3 Properly indent stringtable scripts 2015-04-07 21:38:27 +02:00
KoffeinFlummi
6b73713585 Make Pabst's make.py the default 2015-04-07 21:38:03 +02:00
jaynus
d3d5554c49 Laser designation information localized to vehicle. 2015-04-07 12:35:34 -07:00
ulteq
a8cbcb14d3 Replaced tabs with spaces 2015-04-07 21:27:04 +02:00
ulteq
650c9592c8 Updated the readme 2015-04-07 21:24:09 +02:00
ulteq
26c8f9588a AdvancedBallistics is now always using the dll extension 2015-04-07 21:22:58 +02: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
ulteq
2a458f2e3d Removed Altitude and Latitude negation 2015-04-07 21:03:17 +02:00
ulteq
9fb640195a Removed weather hack 2015-04-07 21:02:57 +02:00
ulteq
b5b962bd4a Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into abIntegration 2015-04-07 20:59:37 +02:00
ulteq
5443d46f7b Default Altitude and Latitude are now read from the config 2015-04-07 20:59:05 +02:00
commy2
ba618a69ec Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-07 20:54:45 +02:00