Alexander Akulich
17222d67bf
Binds: Reorder modifiers according to the convention
...
The modifiers order in the UI and console follows the order
of modifier enum items.
The conventional order of the modifiers is: Ctrl, Alt, Shift, GUI (Win, Meta).
Place Shift after Alt to get proper order, e.g.:
Alt+Shift+R (conventional) instead of Shift+Alt+R (weird)
2022-02-07 01:54:12 +03:00
Alexander Akulich
e0876960fc
CBinds: Remove unused ModifierMatchesKey()
2022-02-07 01:54:12 +03:00
Alexander Akulich
343b2543cc
Client/CBinds: Rename arguments which refers to the ModifierCombination
...
The first dimention of m_aapKeyBindings is ModifierCombination
since commit 4326d00df9
.
Rename the arguments to make it clear when the arg is a combination
(e.g. the arg value '2' refers to '1 << MODIFIER_SHIFT' instead of 'MODIFIER_CTRL')
This is needed to make the code cleaner and the bugs more obvious.
2022-02-07 01:50:14 +03:00
heinrich5991
1820a0e168
Add some checksum functions to the client
...
Let's see if it works out, if not, we can revert it.
2022-01-31 21:31:26 +01:00
heinrich5991
9ef3c8c94a
Mark all component functions overrides with override
2022-01-31 00:53:12 +01:00
def
acf199835d
Support GUI/Cmd key and use it as equivalent to ctrl in default shortcuts
...
like ctrl-f / cmd-f
On macOS all these system shortcuts are done with cmd while on Windows
ctrl is used. Support both now
Added support for cmd key as modifier for binds
2021-12-18 12:23:20 +01:00
Jupeyy
8451775821
Make components member of CGameClient
2021-07-12 12:07:31 +02:00
Alexander Akulich
c2f276cee1
Port CConfig API from the upstream (0.7.5)
...
The old (g_Config) API is kept to not break the stuff.
See commits:
de5859b371
78076761eb
2021-01-10 17:10:19 +03:00
def
3be8a592e5
Run clang-format
...
Purely automatic change. In case of conflict with this change, apply the
other change and rerun the formatting to restore it:
$ python scripts/fix_style.py
2020-09-26 21:50:15 +02:00
plsplsplslol
4326d00df9
fix style and reomved repeated code
2020-09-04 13:49:14 -07:00
plsplsplslol
6782f93419
support multiple modifiers for binds
2020-08-29 17:04:36 -07:00
Learath
66c89eafb2
Allow binding with modifiers in settings
2019-04-28 20:22:19 +03:00
Learath
6b815b2375
Work on compound binds
2019-04-28 16:32:49 +03:00
def
35befec54c
Clean up key binding a bit
2017-07-21 19:32:32 +02:00
Learath
ae23924e81
Add arbitrary length binds. Fixes #642
2017-04-12 10:05:22 +02:00
Learath2
0d4499a027
Rename bind_print to dump_binds.
2017-03-06 18:06:55 +01:00
Learath2
759799953f
Remove dump_binds. Let bind_print dump all. Fixes #634
2017-03-06 15:32:11 +01:00
Marcel Herd
1f58595033
Added command bind_print
2017-01-28 16:29:03 +01:00
GreYFoX
5b27758650
Removed level stuff
...
Removed client ID stuff
Removed console stuff
Resolved merge conflicts
Upgraded Banmaster
Cleaned up
2011-08-13 02:11:06 +02:00
GreYFoX
dad66bffc3
General DDRace binds improvements
2011-04-17 19:45:48 +02:00
GreYFoX
0df6d0541f
Merge branch 'master' of git://github.com/oy/teeworlds into HEAD
...
Conflicts:
bam.lua
src/engine/console.h
src/engine/server.h
src/engine/server/server.cpp
src/engine/shared/config.h
src/engine/shared/config_variables.h
src/engine/shared/console.cpp
src/engine/shared/console.h
src/game/client/components/binds.cpp
src/game/client/components/chat.h
src/game/client/components/console.cpp
src/game/client/components/console.h
src/game/client/components/controls.cpp
src/game/client/components/emoticon.h
src/game/client/components/maplayers.cpp
src/game/client/components/menus.h
src/game/client/components/scoreboard.h
src/game/client/components/spectator.h
src/game/client/components/voting.h
src/game/client/gameclient.cpp
src/game/client/gameclient.h
src/game/client/render.h
src/game/collision.cpp
src/game/editor/ed_layer_tiles.cpp
src/game/gamecore.cpp
src/game/gamecore.h
src/game/layers.cpp
src/game/layers.h
src/game/mapitems.h
src/game/server/entities/character.cpp
src/game/server/entities/laser.cpp
src/game/server/entities/laser.h
src/game/server/entities/pickup.cpp
src/game/server/entities/pickup.h
src/game/server/entities/projectile.cpp
src/game/server/gamecontext.cpp
src/game/server/gamecontroller.cpp
src/game/server/gamecontroller.h
src/game/server/gameworld.cpp
src/game/server/gameworld.h
src/game/server/player.cpp
src/game/variables.h
2011-04-14 01:27:49 +02:00
oy
06115dd49d
added "Whitespace and line Endings cleanup" by GreYFoX
2011-04-13 20:37:12 +02:00
GreYFoXGTi
f83132448d
Merged Oy, Isolated Freeze from Deep Freeze
2011-02-13 19:32:06 +02:00
GreYFoXGTi
1b2703aaba
Refactoring & fixed WEAPONSPEC_GUN in content.py
2011-02-12 21:18:41 +01:00
GreYFoXGTi
5d9ee1736e
made the code so it would have less conflicts in the future and Merged branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
data/languages/dutch.txt
data/languages/french.txt
data/languages/german.txt
data/languages/russian.txt
src/game/server/entities/flag.cpp
src/game/server/entities/flag.h
src/game/server/gamecontext.cpp
src/game/server/gamemodes/ctf.cpp
src/game/server/gamemodes/ctf.h
src/game/server/gamemodes/dm.cpp
src/game/server/gamemodes/dm.h
src/game/server/gamemodes/mod.cpp
src/game/server/gamemodes/tdm.cpp
src/game/server/gamemodes/tdm.h
2010-11-22 00:26:00 +02:00
Sworddragon
fc9211c777
Updated copyrights
2010-11-20 21:26:06 +01:00
btd
909c583d96
End merge
2010-08-26 00:30:21 +04:00
Magnus Auvinen
72c06a2589
copied refactor to trunk
2010-05-29 07:25:38 +00:00