mirror of
https://github.com/ddnet/ddnet.git
synced 2024-11-10 01:58:19 +00:00
35d16bd58c
Conflicts: src/engine/console.h src/engine/server.h src/engine/server/server.cpp src/engine/shared/config_variables.h src/engine/shared/console.cpp src/engine/shared/console.h src/engine/shared/network_server.cpp src/game/client/components/console.cpp src/game/client/components/console.h src/game/client/components/menus_browser.cpp src/game/client/gameclient.cpp src/game/editor/editor.cpp src/game/editor/editor.h src/game/editor/io.cpp src/game/editor/layer_tiles.cpp src/game/editor/popups.cpp src/game/gamecore.cpp src/game/mapitems.h src/game/server/entities/character.cpp src/game/server/entities/laser.cpp src/game/server/gamecontext.cpp src/game/server/gamecontroller.cpp src/game/server/gamecontroller.h src/game/server/gamemodes/ctf.cpp src/game/server/player.cpp src/game/variables.h
4 lines
101 B
Bash
4 lines
101 B
Bash
echo Generating .fnts...
|
|
../../font_generator/a.out
|
|
python ../scripts/font_converter.py default*.fnt
|