KoffeinFlummi
a78730d387
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
2015-01-18 20:03:59 +01:00
KoffeinFlummi
8872424abe
Merge branch 'fcs-extension'
2015-01-18 20:03:40 +01:00
KoffeinFlummi
4978bb5294
Move FCS calculation to extension
2015-01-18 20:02:37 +01:00
Nicolás Badano
d532caf1a0
fix execNextFrame ( #56 )
2015-01-18 15:26:26 -03:00
Nicolás Badano
d299331f80
Merge branch 'weaponSelecCbaKeyBinds'
2015-01-18 15:24:15 -03:00
Nicolás Badano
1b1e5fd70d
Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into fcsCbaKeyBinds
2015-01-18 15:23:32 -03:00
commy2
67fcb0c7b6
Merge pull request #60 from KoffeinFlummi/vectorZoomFix
...
Zoom level adjustment. fix #58
2015-01-18 17:19:59 +01:00
Nicolás Badano
7bc356008c
fcs: cba keybinds
2015-01-18 12:42:33 -03:00
Nicolás Badano
84fd6de793
fcs: fix to make adjust range up/down work again
2015-01-18 12:40:41 -03:00
VKing
99a31f8ae8
Zoom level adjustment. Ref #58
2015-01-18 16:03:34 +01:00
Nicolás Badano
415df07af4
weaponselect: replace keybinds for cba 2
2015-01-18 11:57:23 -03:00
Nicolás Badano
b867dc04ed
weaponselect: replace keybinds for cba
2015-01-18 11:30:57 -03:00
Nicolás Badano
4d721418fa
Merge pull request #54 from KoffeinFlummi/laserPointerImprovements
...
Laser pointer improvements
2015-01-18 10:03:16 -03:00
PabstMirror
6e8c394903
Standardize Config Version Stuff
2015-01-18 01:32:07 -06:00
bux578
7d35e34626
Merge pull request #37 from KoffeinFlummi/agmScopesPort
...
PORT: AGM_Scopes
2015-01-18 08:19:44 +01:00
bux578
632a3f5e0a
Merge branch 'master' into agmScopesPort
2015-01-18 08:18:24 +01:00
bux578
a1c167844d
fix errors, but still no overlay
...
and lots of spawns
2015-01-18 08:13:37 +01:00
commy2
14745af70b
port difficulties
2015-01-18 08:06:25 +01:00
commy2
06f39aa158
port lock backpacks
2015-01-18 07:56:09 +01:00
commy2
e67602d76e
port movement
2015-01-18 06:45:28 +01:00
Nicolás Badano
74bfc31598
laserpointer: various improvements:
...
- calculate system of reference vectors to offset the laser start.
- as much stuff as possible calculated in ASL, removing all conversions inside loops.
- halved the distance in which men are searched.
- increased the tolerance when calculating distance.
2015-01-17 23:51:31 -03:00
Nicolás Badano
e7ec905892
Cache the units near to the camera instead of the player.
...
Works even when no player exists or is somehow viewing the action remotely.
2015-01-17 23:48:44 -03:00
commy2
8683667d24
add day laser pointer
2015-01-17 23:38:13 +01:00
commy2
fa2acfbb50
vector FOS mode
2015-01-17 22:49:06 +01:00
Nicolás Badano
26409d0f50
Merge pull request #53 from KoffeinFlummi/agmSmallarmsPort
...
Port: Agm_Smallarms
2015-01-17 18:35:37 -03:00
Nicolás Badano
a1cb57f4db
smallarms: port
2015-01-17 18:14:56 -03:00
Nicolás Badano
daec785600
AGM_Smallarms pre CBA
2015-01-17 18:02:03 -03:00
Nicolás Badano
e27bd8db59
Merge pull request #52 from KoffeinFlummi/agmSafeModePort
...
AGM_SafeMode port
2015-01-17 17:35:05 -03:00
Nicolás Badano
489b5de1ad
Merge branch 'agmSafeModePort' of github.com:KoffeinFlummi/ACE3 into agmSafeModePort
...
Conflicts:
addons/safemode/config.cpp
2015-01-17 17:33:26 -03:00
Nicolás Badano
9247bb3411
safemode: port
2015-01-17 17:32:34 -03:00
Nicolás Badano
1c1216a05d
safemode: port
2015-01-17 17:23:15 -03:00
Nicolás Badano
7c41eb04e9
AGM_SafeMode pre CBA
2015-01-17 17:01:47 -03:00
Nicolás Badano
16be448168
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-01-17 16:05:14 -03:00
Nicolás Badano
fd4a2192e9
map: small fixes
2015-01-17 16:04:48 -03:00
commy2
6658eafe3d
vector object height, length mode
2015-01-17 19:25:12 +01:00
Nicolás Badano
9a790a229a
Merge branch 'agmMapPort' of github.com:KoffeinFlummi/ACE3
2015-01-17 15:24:46 -03:00
Nicolás Badano
6abc6073e1
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-01-17 15:19:53 -03:00
Nicolás Badano
3fa6f1b0c9
gforces: fix for when there's no player
2015-01-17 15:18:11 -03:00
bux578
68b56d9161
Merge branch 'master' into agmScopesPort
2015-01-17 19:14:33 +01:00
PabstMirror
1d475111e7
Flashbang Icon Name
2015-01-17 12:12:02 -06:00
Nicolás Badano
6bee456aff
Merge pull request #24 from KoffeinFlummi/agmGrenadesPort
...
Port: AGM Grenades
2015-01-17 15:05:15 -03:00
commy2
7a6d0eefe3
port weapon select
2015-01-17 18:26:51 +01:00
Nicolás Badano
e216a33574
Merge branch 'master' of git@github.com:KoffeinFlummi/ACE3.git
2015-01-17 13:58:36 -03:00
Nicolás Badano
c851a14da9
common: added execNextFrame function
2015-01-17 13:56:24 -03:00
Nicolás Badano
e89d098727
Merge pull request #50 from KoffeinFlummi/waitAndExecute
...
Added waitAndExecute function
2015-01-17 13:50:47 -03:00
Nicolás Badano
4926b6970b
fixes typos
2015-01-17 13:45:56 -03:00
Nicolás Badano
f165030e3b
common: remove the support for code as string
2015-01-17 12:23:03 -03:00
bux578
79695f00e9
Merge remote-tracking branch 'origin' into agmScopesPort
2015-01-17 09:22:34 +01:00
PabstMirror
1783bf4db6
#49 - targetEvent for flashbang
2015-01-17 00:39:46 -06:00
Nicolás Badano
27bd5c5790
hearing: fixes
2015-01-17 03:20:41 -03:00