Commit graph

1250 commits

Author SHA1 Message Date
SushiTee d3f642a641 -removed color depth config variable
-updated fake list of resolutions
-make sure resolutions are sorted in menu
2012-08-18 17:51:47 +02:00
SushiTee e3da49eac3 Merge branch 'master' of git://github.com/teeworlds/teeworlds
Conflicts:
	src/engine/client/graphics_threaded.h
2012-08-18 15:39:23 +02:00
oy d8d259a166 made the client handle callvote and teamchange cases even more and let the server be more silent on faulty tries 2012-08-18 11:21:54 +02:00
SushiTee 87da295f6e remade settings->Tee menu 2012-08-17 18:05:45 +02:00
BeaR 3e387634c8 Set value higher 2012-08-17 10:44:51 +02:00
SushiTee 37638fcf6b fixed copy&paste mistake 2012-08-16 22:28:30 +02:00
Magnus Auvinen 700d3780bb added missing flush to SendStartIfno 2012-08-16 20:33:07 +02:00
SushiTee bdfbf00190 render background map always in high detail 2012-08-16 19:03:12 +02:00
SushiTee 197bd83fd5 remade Demo menu 2012-08-16 15:36:38 +02:00
oy 80cb4e15a4 improved callvote handling on the client, merged its messages and made the server be more silent on faulty tries 2012-08-16 12:03:44 +02:00
SushiTee 49c13ddf40 little changes on lists and headlines 2012-08-16 01:33:28 +02:00
SushiTee fe5e393308 remade settings->controls menu 2012-08-15 22:03:35 +02:00
oy dc22f9fa1c merged vote start/end messages 2012-08-14 00:16:54 +02:00
BeaR 3effd73596 Fix Renderingbug:
If u change the alpha value inside a colorenvelope, the tileset-/quad-rendering is messed sometimes
http://i.solidfiles.net/580a9699c4.png(map: run_exchange by delo)
2012-08-13 12:57:40 +02:00
oy d2924b5ad6 cleaned up core events 2012-08-13 10:36:01 +02:00
SushiTee 06a56df3e6 fixed button mouseover to use the same alpha like the tabs 2012-08-12 22:20:57 +02:00
SushiTee 9a1f8899b7 finished graphics menu (for now) 2012-08-12 18:51:35 +02:00
SushiTee 37c970bc49 changed some stupid things 2012-08-12 18:41:49 +02:00
SushiTee 0b739d0404 Merge branch 'master' of git://github.com/teeworlds/teeworlds 2012-08-12 15:57:19 +02:00
Magnus Auvinen 563f1d0c52 removed the operator int() from IGraphics::CTextureHandle and ISound::CSampleHandle in order to catch more bugs 2012-08-12 14:02:50 +02:00
Magnus Auvinen dfcbe85488 introduced ISound::CSampleHandle to add more typesafty 2012-08-12 13:56:35 +02:00
Magnus Auvinen b47fb66393 removed ugly g_GameClient stuff from the game client files 2012-08-12 13:05:22 +02:00
Magnus Auvinen cb95e8dfe8 more typesafty in the graphics. introduced the IGraphics::CTextureHandle 2012-08-12 12:41:50 +02:00
SushiTee 6b279c770f -remade settings->graphics menu
-added menu checkbox images
2012-08-11 23:51:46 +02:00
SushiTee b8c1fa5812 -fixed saving menu page
-remade restart warning design
2012-08-11 16:27:56 +02:00
oy 6c530b2926 made ingame notifications for players simple game messages and let the client handle/localise them 2012-08-11 12:34:03 +02:00
SushiTee dc40af95be remade settings->sound menu and added reset buttons 2012-08-10 22:13:16 +02:00
SushiTee a4e13330f6 Merge branch 'master' of git://github.com/teeworlds/teeworlds 2012-08-10 19:01:28 +02:00
SushiTee 5d10047b8c remade seetings->player menu 2012-08-10 18:54:52 +02:00
SushiTee 02d64ed331 fixed team colors 2012-08-10 17:35:17 +02:00
SushiTee aa2f4c9353 removed ui color and ui scale config variables 2012-08-10 17:35:07 +02:00
SushiTee 61cbb27177 remade settings->general menu 2012-08-09 22:57:11 +02:00
SushiTee 8aed4c2de9 removed "local server" button from startmenu for now 2012-08-09 02:28:05 +02:00
SushiTee a631ed3be6 finished start menu 2012-08-09 02:13:16 +02:00
SushiTee d88b35980f fixed team colors 2012-08-08 17:05:08 +02:00
SushiTee c3b4a5c240 removed ui color and ui scale config variables 2012-08-08 14:31:16 +02:00
oy 93c169c71d show enter/leave team change messages in demos 2012-08-04 17:45:16 +02:00
oy 4333f832f7 fixed demo recording/playing, clientinfo for server dummies and wrong team colours in scoreboard 2012-08-04 12:50:45 +02:00
oy 525825c215 fixed some warnings with gcc 2012-08-03 19:28:15 +02:00
BeaR a1d039f8e9 Embedded textures weren't load correctly ingame 2012-08-03 19:13:26 +02:00
oy 55a3ee1b16 fixed shape of the refresh icon in the server browser 2012-08-03 19:10:23 +02:00
oy ab5ce4a492 fixed that internet/lan tab doesn't work as fresh button 2012-08-03 18:53:46 +02:00
oy f364fd7cf4 skip player prediction when the game/round is over 2012-08-03 18:47:04 +02:00
oy d61d25677b cleaned up PlayerInfo check/usage in the gameclient 2012-08-03 18:46:49 +02:00
oy 65448ea7b0 cleaned up gameclients player/team calculation 2012-08-03 18:46:41 +02:00
oy b1d28c5740 cleaned up updating the friend state 2012-08-03 18:46:33 +02:00
oy 8971497029 finished client enter/leave events, removed client changes 2012-08-03 18:46:25 +02:00
oy 280fdb34a4 fixed netobj corrections on gametstatetimer, ticks and fixed team in clientinfo 2012-08-03 18:46:10 +02:00
oy a55a7dfef0 cleaned up types within network data 2012-08-03 18:46:01 +02:00
oy 719867271f fixed updating skin colour on team change and made player team work event based 2012-07-30 23:59:29 +02:00
oy c808d48f20 handle some network snapshot data as messages/events and add them locally for demo recording 2012-07-29 11:54:29 +02:00
BeaR 2c4bcf8874 grey out text color of non-active gui elements. Closes #867. 2012-07-21 19:28:03 +02:00
oy a9165cd7a0 removed no longer needed server dummy commands 2012-07-21 18:34:24 +02:00
oy f8e114ff5a fixed problems with RGB images in maps. Closes #962 2012-07-21 11:38:26 +02:00
oy 0e28755475 show ninja powerup status in the hud. Closes #955 2012-07-21 11:06:18 +02:00
oy 5c2534969c fixed saved skin files and cleaned up writing newlines 2012-07-19 11:57:20 +02:00
oy cc90329689 "Bug fix - When mousing over "Show only chat messages from friends" an 'x' appears without selecting but goes away when highlight fades. Added default variable to 0, like others in menu." by theanomaly18 2012-07-19 11:11:14 +02:00
oy 63fe5a70da removed duplicate particle handling. Closes #975 2012-07-19 11:02:45 +02:00
oy ae6d2b6fdb auto-refresh the demo browser when opening it 2012-07-19 10:56:23 +02:00
oy b69417f3aa let the demoplayer check for the correct net version (prevents crash) and show the reason within the error popup 2012-07-19 10:51:04 +02:00
oy 42f689f5f3 added missing newline at end of file 2012-07-18 00:26:40 +02:00
SushiTee fea5e1316c -changed tab color -fixed general button 2012-07-17 22:08:32 +02:00
SushiTee 0f7b734aff moved tab bar to edge of menu 2012-07-17 22:07:39 +02:00
SushiTee c6d6328353 changed in game menu (divided game stuff from settings) 2012-07-17 22:07:13 +02:00
SushiTee 8df2d0140c don't render empty filters 2012-07-17 22:04:31 +02:00
SushiTee 97e43c744c don't load internet server list when it should be LAN 2012-07-17 22:04:03 +02:00
Choupom 4961d9dfa8 fixed custom color menu overlaps other menu 2012-07-17 22:02:57 +02:00
SushiTee 1072cc5509 fixed selecting servers with mouse 2012-07-17 22:02:19 +02:00
SushiTee 1cafa808b9 reintegrate settings into in game menu 2012-07-17 22:01:27 +02:00
Choupom be2c055775 tweaked the skin files syntax a bit 2012-07-17 21:59:44 +02:00
Choupom 22fd41289f fixed so we can change our skin from the console correctly 2012-07-17 21:58:38 +02:00
Choupom 93943acced made some functions const 2012-07-17 21:56:01 +02:00
Choupom 3c02b896fa fixed display of custom color should be removed if there is nothing chosen for the current selection 2012-07-17 21:54:26 +02:00
Choupom ccbb82fd80 fixed client info resend on team gametypes 2012-07-17 21:53:28 +02:00
oy be6fff32a3 fixed last commit 2012-07-17 21:51:40 +02:00
Choupom e548308bbb merged skin system 2012-07-17 21:51:01 +02:00
SushiTee 052f4b5514 fixed overlapping in controls settings page (fixes #3) 2012-07-17 13:16:10 +02:00
SushiTee 4b57161752 -integrated popups into menu -made filter editable 2012-07-17 13:10:11 +02:00
SushiTee 1220bafb0e continued rearranging server browser 2012-07-17 13:00:42 +02:00
SushiTee 6b1256799a fixed top right corner of settings 2012-07-17 12:59:37 +02:00
SushiTee 8e09a80e22 - new browser icon - fixed overlay - colorizing ping 2012-07-17 12:55:47 +02:00
SushiTee e1152c25e5 added buttons to header and changed sizes a bit 2012-07-17 12:24:39 +02:00
SushiTee 4019c42ac3 added some stuff to filter header 2012-07-17 12:18:47 +02:00
SushiTee 8ce18b32c1 marking hot entries 2012-07-17 12:13:02 +02:00
oy 6a4b68db95 fixed last commit 2012-07-17 12:11:04 +02:00
SushiTee 9bbfa8a943 more work on serverbrowser. selecting and scrolling works fine now 2012-07-17 12:09:15 +02:00
SushiTee 8a79f18805 continued working on server browser 2012-07-17 11:59:24 +02:00
SushiTee 80e7da8f63 made serverbrowser able to have more filters (TODO: redo it after the rendering of it is done) 2012-07-17 11:19:12 +02:00
SushiTee d135117135 began with server browser filters 2012-07-17 11:03:43 +02:00
oy c7938ced97 fixed last commit 2012-07-16 19:20:52 +02:00
SushiTee 65cc8f7fd9 rearranged settings pages 2012-07-16 19:15:10 +02:00
SushiTee ec29a5f104 made menu the same size on every resolution 2012-07-16 18:15:22 +02:00
SushiTee 6757e667e7 added server browser tabs 2012-07-16 18:11:05 +02:00
SushiTee 74053427e5 -began to rearrange menu pages -added ESC shortcut to return to start menu 2012-07-15 19:10:07 +02:00
SushiTee d3cc755d0e - new settings.png - added possibility to invert rect edges 2012-07-15 19:02:21 +02:00
SushiTee 0e3c8e4bba -fixed fade in graphics settings menu -added version to start menu 2012-07-15 18:56:08 +02:00
SushiTee 5bfcbb3e17 fixed friend list 2012-07-15 18:51:32 +02:00
SushiTee a95ec67ac8 fixed demo playback 2012-07-15 18:50:43 +02:00
SushiTee 2d32a65e2a fixed zoom 2012-07-15 18:50:12 +02:00
SushiTee bf4a637d1f fixed rendering envelopes 2012-07-15 18:48:18 +02:00
SushiTee 43be558ebc forgot one static into for button mouse sense scrollbar 2012-07-15 18:41:04 +02:00
SushiTee 16879384d4 -default grey -new gui logo 2012-07-15 18:40:19 +02:00
SushiTee f9df5c32bd fixed camera 2012-07-15 18:38:09 +02:00
SushiTee d6030e7084 some security 2012-07-15 18:36:51 +02:00
oy d147653185 fixed last commit 2012-07-15 18:36:06 +02:00
SushiTee 4f9cd3bf14 changed way of loading the menu map (not save yet) 2012-07-15 18:35:47 +02:00
oy 608cd3b4a8 fixed compiling 2012-07-15 13:03:00 +02:00
SushiTee ae64b8c2f5 lets fade it all :) -added missing images 2012-07-15 13:02:32 +02:00
SushiTee faa7c0f073 added 0.5 sec image fade 2012-07-15 12:51:20 +02:00
SushiTee 248124c4d6 made images always fit into buttons with correct ratio 2012-07-15 12:48:54 +02:00
SushiTee 07dd9c1e97 added all images 2012-07-15 12:45:38 +02:00
SushiTee 1d480f34bd -added images to startmenu -changed way to load menu image 2012-07-15 12:42:22 +02:00
oy 1f76649bd1 fixed compiling 2012-07-15 11:45:04 +02:00
SushiTee 4aeb552506 started with start menu 2012-07-15 11:42:03 +02:00
SushiTee 7d7d20cf8b added some configuration 2012-07-15 11:21:16 +02:00
SushiTee f7b52619b5 some more animation 2012-07-15 11:07:51 +02:00
SushiTee 350a2e92ea fixed various things 2012-07-15 10:58:17 +02:00
oy bd6705bd74 fixed last commit 2012-07-15 10:52:38 +02:00
SushiTee fcabed11b4 started writing map background in menu 2012-07-15 10:50:05 +02:00
oy a7992085b8 cleaned up pure gametype/map check in the server browser and made pure gametypes 'more equal' 2012-07-07 18:35:08 +02:00
oy c059c09bbd added more case insensitive ordering by cinaera 2012-07-06 19:32:40 +02:00
heinrich5991 75d97810bb Added borderless window functionality
This might become handy for users with multiple monitors,
	might resolve other issues aswell
2012-06-27 11:46:11 +02:00
oy 95faa73ee7 switched filenames of highlight and client chat message to prevent some misunderstanding there. #966 2012-06-10 13:30:25 +02:00
oy ec8484272c made the client not play the chat sound for empty chat messages. Closes #967 2012-06-10 13:07:31 +02:00
oy 6f79a0562b fixed wrapping problems when rendering console input 2012-04-21 00:23:48 +02:00
oy a953fd5e3b fixed wrong map download speed when switching to the editor while downloading. Closes #951 2012-04-20 22:11:41 +02:00
oy 18c56bca43 count spectators in the server browser when 'count players only'-filter is disabled 2012-04-20 21:50:25 +02:00
oy f09d4a19e1 prevent that the main tabs in the menu can be misused as refresh buttons 2012-04-20 21:45:33 +02:00
oy 635dc7cda1 prevent that you can play the music ingame. Closes #947 2012-04-20 01:50:16 +02:00
oy 900472f0a9 fixed that client displays active vote after connecting to a server 2012-04-20 01:13:51 +02:00
oy 1d4d641210 increased time for client info resend to prevent possible overlap 2012-04-20 01:11:32 +02:00
oy fa784a9b85 limit the number of chat messages a player can queue to 3 2012-04-20 01:09:49 +02:00
oy 49ac19c352 skip auto screenshot when the editor is active. #931 2012-04-20 01:04:12 +02:00
oy 8c033a0e2e fixed chat ignore feature 2012-03-04 12:46:38 +01:00
oy 42c845be49 fixed flag blinking issue. Closes #757 2012-03-04 12:46:22 +01:00
oy ab13e4a183 show who is following you in spectator mode. Closes #594 2012-02-15 01:40:47 +01:00
oy bbfb6e5992 fixed map initialisation. Closes #64 2012-02-15 01:40:40 +01:00
oy b0bf7115c9 added lms gametype, updated standard gametype check and made players keep their score between rounds 2012-02-15 01:40:34 +01:00
oy 0f456aebee cleaned up gamecontroller and fixed some survival related things 2012-02-15 01:40:29 +01:00
oy ad33841deb added spectator mode for dead players in survival 2012-02-15 01:40:24 +01:00
oy 6b8287f7c7 cleaned up player flags 2012-02-15 01:40:19 +01:00
oy 23df3c609e removed pickup subtype and renamed rifle to laser and powerups to pickups 2012-02-15 01:40:13 +01:00
oy 7e78740478 made client scoreboard and hud survival ready 2012-02-15 01:40:04 +01:00
oy 97061ab59d changed usage of round to match 2012-02-15 01:39:40 +01:00
oy b374a24c06 added start countdown when game starts without a timer 2012-02-15 01:39:35 +01:00
oy 35ba490183 added game states and fixed some pause related things 2012-02-15 01:39:29 +01:00
oy aec468a3c4 added player ready system. Closes #65 2012-02-15 01:39:24 +01:00
oy c045071b40 always show default country flag on invalid country index 2012-02-05 15:53:22 +01:00
oy d17ee055a2 fixed an issue about resending player info 2012-01-29 12:44:33 +01:00
oy fa81141110 added demo markers by Choupom. Closes #837 2012-01-10 23:13:19 +01:00
oy e8f9145a0d deactivate player ignore setting if show just friends chat is active and player isn't a friend 2012-01-10 23:03:23 +01:00
oy 4efd65359e show notification when game is paused 2012-01-10 22:40:48 +01:00
oy dfe91338f0 added pause command. Closes #15 2012-01-10 00:49:31 +01:00
oy 9251796c3a fixed rendering on pause/specific speed for damage indicators and muzzle in the demo player 2012-01-09 23:43:53 +01:00
oy 3e918075df added an option to show only chat messages from friends 2012-01-09 23:29:15 +01:00
oy e97cfaecad buffered chat input. Closes #916 2012-01-09 23:13:51 +01:00
oy 4fde2cf7f2 add tuning to demo. Closes #899 2012-01-09 00:49:20 +01:00
oy 7c300ccc7b added player names to dm score hud and repositioned the player name in team games. Closes #871 2012-01-09 00:28:42 +01:00
oy 526262ea55 increased the size of emoticons in the selector. Closes #625 2012-01-09 00:23:58 +01:00
oy e960cbdff3 added a config to display the code string of a country flag instead of the image. Closes #897 2012-01-08 18:16:38 +01:00
oy 3811476c6e removed multiple updating of the renderinfo for ninjas. Closes #855 2012-01-08 15:44:49 +01:00
oy 535324d6ed added an entry for the kill command to the controls menu. Closes #652 2012-01-08 00:20:02 +01:00
oy 6649d651a8 switched client and highlight chat sound. Closes #630 2012-01-06 20:06:13 +01:00
oy 2785293469 don't start playing the music again if we're quitting 2012-01-06 20:03:57 +01:00
oy f3ebfae18e drop multiple chat sounds that are played within 300ms. Closes #440 2012-01-06 19:47:49 +01:00
oy b592d7a591 cleaned up playing of global sounds 2012-01-06 19:38:40 +01:00
oy 7328098f8d Merge pull request #912 from matricks/threadedflip
Threadedflip
2012-01-03 15:40:30 -08:00
Magnus Auvinen c1942ca6cb fixed the render frame time and cleaned up some more code 2012-01-01 13:38:46 +01:00
Magnus Auvinen b31abc4053 fixed so that you can select graphics backend via gfx_threaded 2011-12-31 10:29:25 +01:00
Magnus Auvinen 4e923442e4 fixed the broken damage indicators 2011-12-31 10:15:54 +01:00
Magnus Auvinen 8e56885795 initial commit of the threaded graphics. can start game and render the gui. no textures at the moment. still waits for the swap for now 2011-12-31 01:06:04 +01:00
BeaR afb1d5e201 Swap and Shuffle Teams 2011-12-30 21:52:01 +01:00
Magnus Auvinen 8ffe582615 ugly incomplete hack to put the rendering into another thread so we don't have to wait for the flip 2011-12-30 16:02:22 +01:00
oy b44ee3d975 reworked ban system 2011-12-29 23:36:53 +01:00
oy 6e20c32859 removed some resource loading spam. Closes #894 2011-12-10 18:23:29 +01:00
Choupom 713dd3bc08 fixed controls rendering with low ui scale 2011-12-04 22:43:41 +01:00
oy 9a03989e84 added "Make an option for each envelope: (a) synchronized (b) starting at join" by Choupom 2011-12-04 14:39:47 +01:00
Choupom 873c5a77bc some trivial fixes 2011-12-04 14:21:20 +01:00
oy b99ac459be fixed envelope rendering when seeking in the demo player 2011-12-04 14:04:12 +01:00
SushiTee e411d8f591 made envelope rendering more smooth 2011-12-04 13:15:24 +01:00
oy df4e11dc82 fixed fixed camera position when chatting as spectator. Closes #880 2011-11-30 01:47:35 +01:00
oy 05f77f64af added caching for the play command. Closes #891 2011-11-30 01:41:00 +01:00
oy b1e7797b19 fixed compiling with mingw 2011-08-19 00:12:30 +02:00
Shereef Marzouk c6fd4a2cc5 General whitespace and tab cleanup 2011-08-11 10:59:14 +02:00
oy 2b2ddde04f sort players in kick/move to spec vote and player options by team. Closes #809 2011-08-05 19:52:38 +02:00
SushiTee 83652c91ec fixed a warning in client (mac) 2011-08-01 21:03:51 +02:00
oy 10c3e844d7 show alpha2 country code strings next to the flag in the country code selectors. Closes #805 2011-07-31 02:04:46 +02:00
oy a0a62bcd70 fixed econ feature and tcp 2011-07-30 13:40:01 +02:00
oy 65d312fd06 fixed problem with lineinput. Closes #802 2011-07-28 22:01:14 +02:00
Choupom 84e5c53432 added color envelope feature for tilemaps 2011-07-20 22:04:13 +02:00
oy 571dff6216 made rcon auto completion serverside. Closes #97 2011-07-14 22:07:21 +02:00
oy 5f4a5b3366 added country flags to language selectors 2011-07-12 20:33:53 +02:00
oy f4ce34f01c close spectator/emoticon menu when changing to team/spectator via bind. Closes #768 2011-07-11 12:02:45 +02:00
oy e18390fea8 fixed that client resets tuning. Closes #746 2011-07-05 23:32:32 +02:00
oy 20fbe2f92c fixed that player friends are marked as online in the friends list if they match a clan friend 2011-07-05 23:23:33 +02:00
oy ac9c3b8f7f made the dropped flag sign blink faster the last 5 seconds to indicate that it's about to return. Closes #631 2011-07-05 23:15:24 +02:00
oy 7648ba3024 added a different mouse sens for menus/editor 2011-07-03 00:36:07 +02:00
Choupom 4a5c13d1de fixed so Reset Filter button resets all filters 2011-07-02 19:23:36 +02:00
Johannes Loher 3f583d44f9 fixed so there can't be a negative time being displayed when timelimit runs out while there is warmup. If warmup is active, the time will be displayed as if there was no timelimit. 2011-07-01 18:34:28 +02:00
oy 123eab41c8 made it possible to filter by player country in the server browser. Closes #654 2011-06-29 22:27:32 +02:00