Commit graph

183 commits

Author SHA1 Message Date
GreYFoX 9397c4a55f some make release changes for adding sql server files
Servers are no longer build with SQL by default.
fixed compilation on Mac OS X 10.5
2011-04-15 04:32:53 +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
heinrich5991 c83c7b1a19 reworked IConsole::PrintResponse to IResult::Print (and obviously CConsole::PrintResponse to CResult::Print) 2011-04-14 00:34:10 +02:00
oy 06115dd49d added "Whitespace and line Endings cleanup" by GreYFoX 2011-04-13 20:37:12 +02:00
oy 1a5d70450f added "reimplemented menu music by teetow-the-great-teetow" by Choupom 2011-04-13 20:00:54 +02:00
Choupom 2179ae0113 fixed need restart warning in settings 2011-04-13 17:49:31 +02:00
Johannes Loher 2e09bd6b9d Extended the control settings so spectate_next and spectate_previous can be set there. 2011-04-13 17:32:32 +02:00
GreYFoX 32a85dabe3 Fixed some merge mistakes, NOTE: This will be be buggy to say the least 2011-04-09 23:01:10 +02:00
GreYFoX f7f6058a92 Merged Oy, Cleaned up, removed some useless features and code parts
Added Icon by landil
alot more...
2011-04-09 22:32:17 +02:00
oy 5c6e274a88 added more and resized flags by Crises and made them show up smaller and less of an eye-catcher. Closes #566 2011-04-04 20:37:12 +02:00
oy 401543c7a9 added some space for colour channel translations in the graphic settings as well 2011-04-02 19:34:02 +02:00
oy 2c9b454fb8 added some more space for the translations of the colour channels 2011-04-02 12:13:23 +02:00
oy 593a8ee6ec improved settings menu. Closes #564 2011-04-01 19:36:44 +02:00
oy 9a4426779d decreased the font size for some menu buttons and tabs to give translations more room 2011-04-01 17:57:04 +02:00
oy 0e6aca2b28 fixed a missing translation 2011-03-31 18:24:02 +02:00
oy 67b026f65f added an option to disable ingame HUD. Closes #523 2011-03-27 14:40:15 +02:00
oy edf10b8b13 added an option to disable team colors for name plates. Closes #544 2011-03-27 14:30:59 +02:00
oy 05244d4dad decreased the size of the "reset to defaults"-button in the settings menu 2011-03-22 00:40:43 +01:00
oy 3d63afacc2 fixed a problem with the country flag selector, changed a localisation and the format of a file 2011-03-19 19:31:00 +01:00
oy b4bec53359 added clan name and country flag selector to the player settings 2011-03-16 21:31:55 +01:00
GreYFoX 87cde802b1 Added a new entities_clear
Fixed cl_ddrace_cheats not controlling cl_show_entities
attempted to make cl_show_entities show other layers than the game layer
2011-03-16 19:48:16 +02:00
GreYFoX 3bae74f21d Added Ability to predict old hook through tiles from DDMax
fixed a warning
2011-03-16 17:36:54 +02:00
GreYFoX 0cbcdd027a Removed Helper made Moderators able to moderate only
Enumerated levels
http://ddrace.info/forum/showthread.php?t=528
or modify the server and change the game type to something other than DDRace thank you
2011-03-16 16:27:30 +02:00
GreYFoX ee178d5a48 Client Cheat showing entities in game 2011-03-16 14:48:16 +02:00
oy ee2f625754 added extended spectator mode. Closes #28 2011-03-10 10:08:14 +01:00
GreYFoX 90d93ba7b2 Client showothers 2011-02-23 22:22:05 +02:00
GreYFoX 0e5ef2e4f4 Fixed show ids
Fixed missing letter
2011-02-23 18:12:34 +02:00
GreYFoX 5571ec70fa More Settings in the Settings tab 2011-02-23 08:36:14 +02:00
GreYFoXGTi 6904956a14 Added some DDRace Menu Items
Enforced cl_ddrace_cheats on zoom
2011-02-16 11:20:27 +02:00
GreYFoXGTi 335a8f69c2 Morning Cleanup 2011-02-16 10:21:23 +02:00
GreYFoXGTi 2fd0ff1b85 Added Show IDs
and altered last commit
2011-02-15 03:14:32 +02:00
XXLTomate f0201597c6 DDRace Settings-tab
Checkbox for DDRace Scoreboard
2011-02-15 02:36:22 +02:00
GreYFoXGTi f83132448d Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02:00
oy 0c119ba99b fixed possible problem with localisations if the linereader flushes its memory between reading the origin and the replacement string 2011-02-10 12:07:00 +01:00
SushiTee c0b905f852 -fixed compiler warnings
-fixed mac compiling
2011-01-26 14:45:44 +02:00
oy 418dd8eccc added fix by CarmineZ for missing option in the control settings. Closes #395 2011-01-06 13:17:54 +01:00
oy 2992d9a6c6 scale control settings as well 2011-01-05 12:19:06 +01:00
Damian Kaczmarek 073044747b -Working ui_scale parameter.
(doing it properly would require lots of framework/interface job ...)
2011-01-05 12:14:36 +01:00
oy 67f86e3547 added option to change nameplates size by RushPL 2011-01-04 13:11:01 +01:00
oy c0530b0d09 added language popup on first start. Closes #336 2010-12-12 19:20:30 +01:00
oy c75a75b64f made it possible to automatically take game over screenshots. Closes #339 2010-12-12 16:48:13 +01:00
oy a0985314c9 made it possible to "recycle" auto recorded demos 2010-12-11 18:55:28 +01:00
oy 4756c031c5 save auto recorded demos in a separate folder and added an option to enable/disable it in the settings menu 2010-12-08 01:55:13 +01:00
oy e6698b1118 apply custom colour to blood colour. Closes #314 2010-11-24 01:11:56 +01:00
Sworddragon fc9211c777 Updated copyrights 2010-11-20 21:26:06 +01:00
Choupom d2519f7ab9 small ui fixes 2010-10-25 18:59:33 +02:00
oy 662f43919c fixed overlapping restart warning 2010-10-16 11:27:49 +02:00
oy 639c32d661 do not show the restart warning in the settings if you change back to actual settings. Closes #90 2010-10-16 11:24:42 +02:00
oy 3a98f7a048 added mod system. Closes #34 2010-10-06 23:07:35 +02:00
oy 27425facff fixed last commit 2010-09-24 13:21:03 +02:00
oy 0905b7755d localised the language names. Closes #153 2010-09-16 13:32:56 +02:00
oy c52ee7baa9 unbind a key with right mouse button in the controls menu. Closes #67 2010-09-12 17:15:09 +02:00
oy 5437513a0d use escape key to abort binding a control key in the menu 2010-09-12 13:40:24 +02:00
oy cabecb7fa9 added output level for console print function, categorised the debug messages and merged them into the new functionality. Closes #8 2010-08-18 00:06:00 +02:00
oy d471663913 added localisation fixes by fujnky 2010-08-09 00:35:37 +02:00
oy 4322113435 fixed overlapping skin name in the player settings 2010-08-07 20:52:33 +02:00
SushiTee e79bfb243c struct LANGUAGE should be a class CLanguage 2010-08-06 01:48:06 +08:00
Tom Adams 651cd062e6 fixed english localisation bug 2010-05-31 11:07:58 +00:00
Thomas 361380d630 *some esthetic changes
*split "CHud::RenderGoals()"
*added "reload" command
*added the ability to show last chat lines (+show_chat)
*updated french.txt
2010-05-30 12:01:11 +00:00
Tom Adams e16fdc3f3e added clipping to editboxes (#773) and made their cursors blink 2010-05-29 15:53:57 +00:00
Magnus Auvinen 72c06a2589 copied refactor to trunk 2010-05-29 07:25:38 +00:00
Magnus Auvinen 878ede3080 major update with stuff 2009-10-27 14:38:53 +00:00
Magnus Auvinen b3c1bae2e9 cleaned up localization. fixed motd so it shows when connecting to a server 2009-06-15 09:46:25 +00:00
Magnus Auvinen 307cf4aa64 done language selector 2009-06-15 08:15:53 +00:00
Magnus Auvinen ab171f8f30 updated localization 2009-06-15 07:34:25 +00:00
Magnus Auvinen 6309d7ad56 continued with localization 2009-06-15 06:45:44 +00:00
Magnus Auvinen bc20e9c433 localization update 2009-06-13 17:18:06 +00:00
Magnus Auvinen 6d9ccee95d base for the localization system 2009-06-13 16:54:04 +00:00
Magnus Auvinen 0c9dfd81fd fixed vsync option 2009-01-21 20:55:07 +00:00
Magnus Auvinen d0bcf50ef5 fixed fsaa sampling and reduction of fsaa if gfx init fails 2009-01-11 12:13:18 +00:00
Magnus Auvinen bd5b2b9f85 removed glfw and portaudio. SDL is now a requirement 2008-10-23 16:18:33 +00:00
Magnus Auvinen d15860e44f renamed gc_render* to render* 2008-10-20 23:46:39 +00:00
Magnus Auvinen 6224fc7763 fixed sending of new player info when player changes something in the info 2008-10-20 23:38:23 +00:00
Magnus Auvinen da473cf614 fixed various issues with binding keys like enter and f1-f15 2008-10-20 23:10:00 +00:00
Magnus Auvinen e76e0e6f7e fixed so that the gui removes previous key binding if you change it 2008-10-20 22:46:58 +00:00
Dominik Geyer a4e922cf5a decreased width of slidebars in graphics-tab to fit 2008-10-17 15:26:02 +00:00
Alfred Eriksson 78d129c051 major restructuring of the controls settings page 2008-10-05 18:27:20 +00:00
Dominik Geyer 35a1252607 minor: fixed formatting 2008-10-05 15:59:36 +00:00
Dominik Geyer 2f1fa5f292 added option for scoreboard-bind to controls-page 2008-10-05 15:56:58 +00:00
Magnus Auvinen 6d44adb711 fixed keybindings. reworked the voting a bit. added vote spamming protection. added ingame voting hud. 2008-09-25 14:04:02 +00:00
Magnus Auvinen 0a48454a55 removed the GAMETYPE_ enum 2008-08-31 14:37:35 +00:00
Magnus Auvinen 432602c4ca renamed gc_ui.* to ui.* 2008-08-30 21:31:01 +00:00
Magnus Auvinen dfe499248f major commit. game client restructure. not complete, loads of stuff not working, but the structure is there 2008-08-27 15:48:50 +00:00