Commit Graph

5332 Commits

Author SHA1 Message Date
3d744be2a8 Fixes the map grid calculation for negative stepY values:
* On maps like Utes, Chernarus, ...
2015-06-10 15:54:50 +02:00
d2ad0255e9 Fixed DAGR icon size 2015-06-10 13:48:39 +02:00
2a929c4c6b Replaced all spawn, sleep, and fsm code. 2015-06-09 22:46:04 +02:00
fb76cd730f Proper handling of grid boundaries 2015-06-08 14:32:42 +02:00
9fe6f269be More cleanup 2015-06-08 14:31:55 +02:00
264b05e3ec Removed unused privates 2015-06-08 13:42:58 +02:00
29c55a5495 Cleanup 2015-06-08 12:57:16 +02:00
eae8c8cae2 Initial draft of the ACE2 DAGR port 2015-06-07 17:53:37 +02:00
5b3fd31b1b Merge pull request #1525 from acemod/HuntIR
ACE2 HuntIR port
2015-06-07 17:47:27 +02:00
b1b8fe3645 Removed debug output 2015-06-07 14:48:46 +02:00
cb2b120023 Reduced the max. transmission range 2015-06-07 14:47:56 +02:00
618d557227 Layer IDs are now stored in #defines 2015-06-07 13:55:35 +02:00
9ce655dcd2 Fixes stuck camera on remote controlled units. 2015-06-07 13:50:38 +02:00
9561957fd6 Merge pull request #1245 from acemod/ChatColours
Chat visibility enhancement
2015-06-07 13:35:02 +02:00
fb1ddb4dd6 Removed HuntIR explosion sound 2015-06-07 12:48:01 +02:00
665fa55adf Further reduced the container shell timeToLive value. 2015-06-07 12:12:06 +02:00
5e30c88d11 Made use of the += operator 2015-06-07 11:58:56 +02:00
9818f65545 Improved HuntIR descriptions 2015-06-07 11:58:34 +02:00
0f186154c0 Tabs -> Spaces 2015-06-07 11:44:28 +02:00
4339344aee Merge branch 'HuntIR' of https://github.com/KoffeinFlummi/ACE3 into HuntIR 2015-06-07 11:43:42 +02:00
48f8730415 Removed dead code 2015-06-07 11:43:32 +02:00
66193a8c67 Removed duplicate code 2015-06-07 11:36:58 +02:00
c40a2a9a2f Merge pull request #1527 from acemod/r3fCompat
Added R3F compat pbo
2015-06-07 10:18:02 +02:00
6a792a7a82 Merge pull request #1528 from acemod/rangecardGuiFix
Barrel length is now displayed in half inch accuracy.
2015-06-07 10:17:02 +02:00
a9b6af38e1 Barrel length is now displayed in half inch accuracy. 2015-06-07 10:16:30 +02:00
afb2bb45fe Added R3F compat pbo 2015-06-07 10:11:50 +02:00
0f03bef5f1 Merge pull request #1524 from acemod/handleFiredCleanup
Removed some dead code
2015-06-06 23:31:07 -05:00
c75ae71adf Merge pull request #1497 from acemod/Fix-PlayFiremodeChangedSound
Fixed find file extension in playChangefiremode
2015-06-06 21:39:34 +02:00
c47e0ce796 Merge https://github.com/ODK-Bn/ACE3 into russian-merge 2015-06-06 21:13:03 +00:00
a870d5d760 ACE2 HuntIR port 2015-06-06 14:13:34 +02:00
cfc23fe3e7 Removed some dead code 2015-06-06 10:01:30 +02:00
732dbd315a Tripod - use addToInventory 2015-06-05 21:13:33 -05:00
237b5b4e35 Merge pull request #1239 from acemod/laserPointerAsdgConflict
ASDG- Fail gracefully if attachments not compatible
2015-06-05 16:40:49 -05:00
827c51c088 Merge pull request #1488 from acemod/captiveModuleSettings
Captive module settings
2015-06-05 16:40:36 -05:00
b6951b7a13 #1022 - reset hearing deafness on respawn 2015-06-05 16:37:27 -05:00
50b2dd0651 Merge pull request #1410 from Tourorist/patch-2
README: Shields back up
2015-06-05 12:00:40 -05:00
595e4e7529 Merge pull request #1371 from gienkov/pl-translation-1
Polish translations
2015-06-05 17:58:14 +02:00
c22a66bad4 Merge pull request #1515 from acemod/spotting_scope
Ported the ACE2 Spotting Scope
2015-06-05 17:03:14 +02:00
04ae03695b Reverted dragging init. 2015-06-05 17:03:09 +02:00
7fed1085a6 Merge pull request #1509 from acemod/SSWT_Kit
Ported the ACE2 Tripod
2015-06-05 16:53:47 +02:00
3f3ffe117e Inherit ACE_Actions - addToInventory 2015-06-05 03:32:55 -05:00
de13985492 interact_menu translation 2015-06-05 09:55:13 +02:00
c1a7374404 Merge remote-tracking branch 'upstream/master' into pl-translation-1
Conflicts:
	addons/interact_menu/stringtable.xml
2015-06-05 09:40:50 +02:00
993ee2d498 Ported the ACE2 spotting scope 2015-06-05 09:34:27 +02:00
e01ba64683 Fix Missing Strings 2015-06-04 22:51:40 -05:00
04e6acfc6a Merge pull request #1479 from acemod/sandbag
Ported the ACE2 sandbags
2015-06-04 23:02:55 +02:00
52b40a50d9 Merge pull request #1491 from acemod/Yardage450
Ported the ACE2 Yardage 450 laser rangefinder
2015-06-04 23:02:06 +02:00
618e7e6ea1 Added polish translation. 2015-06-04 23:01:07 +02:00
512c8a0da9 Merge pull request #1512 from SzwedzikPL/interact_menu_background
Update authors.txt
2015-06-04 22:57:04 +02:00
3bb16508df Update authors.txt 2015-06-04 22:55:21 +02:00