Commit Graph

6937 Commits

Author SHA1 Message Date
Michael Braun
2bbf631e71 Fixed missing semi-colon in safemode. 2015-08-14 11:39:22 +02:00
jokoho48
bd56d1bb83 ok that is my fault 2015-08-14 00:36:36 +02:00
jokoho48
cb8d009ef0 Woops 2015-08-14 00:31:42 +02:00
PabstMirror
28ac2fbec6 Merge pull request #2147 from jokoho48/codeCleanUpHitReaction
Code cleanup of HitReaction module
2015-08-13 17:11:19 -05:00
jokoho48
d62f00146e Comment CleanUp 2015-08-14 00:02:19 +02:00
jokoho48
0656418cd1 Code cleanup of HuntIR module. 2015-08-14 00:00:34 +02:00
PabstMirror
68517756c4 #2139 and nametag cleanup 2015-08-13 17:00:24 -05:00
jokoho48
e890b310c1 Code cleanup of HitReaction module 2015-08-13 23:50:51 +02:00
jokoho48
27babd351d Merge branch 'master' of https://github.com/acemod/ACE3 into codeCleanupHearing 2015-08-13 23:43:01 +02:00
jokoho48
c6fbdb420c Code cleanup of Hearing module 2015-08-13 23:42:20 +02:00
PabstMirror
2d8261ddb5 Merge pull request #2135 from acemod/nameTagsWhenPaused
Don't draw nametags when escape menu is open
2015-08-13 16:09:32 -05:00
PabstMirror
43e9c420c4 Merge pull request #2136 from acemod/captiveHeliFix
Don't use old Helicopter_F
2015-08-13 16:01:59 -05:00
jokoho48
7bf7066cfd Code cleanup of grenades module. 2015-08-13 22:36:58 +02:00
PabstMirror
7c60375105 Merge pull request #2102 from acemod/disposableFixes
Disposable fixes
2015-08-13 15:13:03 -05:00
PabstMirror
05def2f62b Merge pull request #2016 from jokoho48/codeCleanupBackpack
Code cleanup of the Backpack module.
2015-08-13 15:10:39 -05:00
PabstMirror
8f142e26f8 Merge pull request #2094 from jokoho48/codeCleanupFingering
Code cleanup of Finger module.
2015-08-13 15:09:18 -05:00
jokoho48
acb4e44c19 Code cleanup of Finger module is Incomming(Part 2). 2015-08-13 22:04:35 +02:00
jokoho48
fcd60650b2 PATHTOF dont work with say3d 2015-08-13 21:57:58 +02:00
jokoho48
5597b7e40c Code cleanup of Backpacks module 2015-08-13 21:56:02 +02:00
PabstMirror
a7ad6dafc9 Remove PFEH hack 2015-08-13 14:09:25 -05:00
PabstMirror
4f0dab23b8 Nametag category 2015-08-13 13:27:24 -05:00
PabstMirror
763f793d0e Localize Catagoires in loadSettingsLocalizedText
Minor, but allows us to use CSTRINGS in configs for consistancy
2015-08-13 13:20:37 -05:00
PabstMirror
6ca3761710 AddAction basic param checking 2015-08-13 11:54:26 -05:00
PabstMirror
cfaf046e29 CheckPBO Fix endless waitUntil if checkAll is false 2015-08-13 00:31:29 -05:00
PabstMirror
3425913d27 #2132 - Don't use depreciated Helicopter_F 2015-08-12 23:32:57 -05:00
PabstMirror
b94cb3b85d #2129 - Don't draw nametags when escape menu is open 2015-08-12 16:14:12 -05:00
bux578
3b3d99fd60 fix gienkov's stuff 2015-08-12 18:46:56 +02:00
Glowbal
1a2b99c76c Merge pull request #2124 from acemod/originalToEnglish
replace <Original> with <English>
2015-08-12 10:32:12 +02:00
bux
3dc53ec492 replace <Original> with <English> 2015-08-12 10:25:37 +02:00
Glowbal
a36471eb71 Merge pull request #2123 from MikeMatrix/medicalMenuStringtableFix
Medical Menu stringtable.xml space invalidating xml structure
2015-08-12 10:10:18 +02:00
Michael Braun
58b697e292 Fixed missing space invalidating some xml parsers. 2015-08-12 10:06:45 +02:00
Glowbal
0080335617 Added config attributes for cargo on wheel and tracks 2015-08-11 23:21:44 +02:00
Glowbal
aadddaa2c5 Added wheel as initial cargo when cargo module is enabled 2015-08-11 23:20:25 +02:00
Glowbal
abc732ac35 Added support for cargo configuration on vehicle spawn 2015-08-11 23:18:01 +02:00
Glowbal
3a3dad9688 Merge pull request #2118 from jonpas/extrasClean
Moved slideshow module icon to proper location
2015-08-11 21:43:46 +02:00
Glowbal
c7b7418ae0 Removed "can only remove damaged wheels" 2015-08-11 21:42:20 +02:00
jonpas
d3fda398cb Moved slideshow module icon to proper location 2015-08-11 21:36:26 +02:00
Glowbal
b45aa51d47 hacked approach for repair tracks.
Could probably better go with config entries, but this seems to be a very good value for 90% of the vanilla tracked vehicles. It's also still easily accessible and on an acceptable place for the remaining vehicles.
2015-08-11 21:35:13 +02:00
Glowbal
660f8debf6 Merge branch 'master' into repair 2015-08-11 21:09:44 +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