Commit graph

2289 commits

Author SHA1 Message Date
oy 7415514a72 play only one weapon no ammo sound per second. #993 2012-10-06 13:47:37 +02:00
oy 09cca41215 fixed last commit 2012-10-06 13:24:31 +02:00
BeaR 9071008a6f Missed a file.. 2012-10-06 13:20:50 +02:00
BeaR 056309ac5e Readded Texturecompression-support 2012-10-06 13:20:44 +02:00
SushiTee 8d427bea39 started working on server browser 2012-08-26 21:15:48 +02:00
Johannes Loher 5db997445a Fixed threaded gfx and building on Mac OS X 2012-08-26 20:02:04 +02:00
SushiTee 98778a5be6 function for back button 2012-08-23 16:18:00 +02:00
SushiTee e04a324634 -remade ingame buttons
-make settings work ingame
2012-08-22 23:36:48 +02:00
SushiTee c5cd2279f8 Merge branch 'master2' of git://github.com/Choupom/teeworlds 2012-08-22 21:14:45 +02:00
SushiTee 2db2ba4732 redesign of all popups 2012-08-22 20:34:57 +02:00
Choupom 3c4e7c116d fixed skins settings gui 2012-08-22 18:19:31 +02:00
Choupom f46512bc13 fixed some variables name/class 2012-08-22 17:56:27 +02:00
Choupom 203a03050e made skin previews bigger 2012-08-22 15:19:56 +02:00
Choupom b2f484a5f6 fixed skin part selection 2012-08-22 14:48:57 +02:00
Choupom a63c5efa05 removed a useless enum 2012-08-22 14:31:42 +02:00
Choupom a4817a2070 fixed some variables name 2012-08-22 13:45:20 +02:00
Choupom b3b0464cfe reverted some stuff 2012-08-22 13:41:50 +02:00
SushiTee 913a0bbee4 forgot to render the body shadow 2012-08-21 20:55:04 +02:00
SushiTee 443730a193 fixed showing eyes in skin part selection 2012-08-21 20:49:30 +02:00
SushiTee 3e1abb8ff6 fixed last commit 2012-08-21 19:05:20 +02:00
SushiTee c76a851027 better order of menu button parameters 2012-08-21 18:55:41 +02:00
BeaR dcbcfd34c7 Fixes some errors in the GUI(messed up buttons ingame and "Internet" and wrong ServerlistScroll)
Also small cleanup in backend header
2012-08-21 18:53:57 +02:00
SushiTee ed1dc21dcb -select more than one skin part with ctrl keys pressed
-little beauty changes in tee menu
-showing only the selected skinpart in skinpart selection
-fixed clamping of tattoo color
2012-08-21 18:52:56 +02:00
SushiTee 2fdc9cf8e6 made background a bit lighter 2012-08-21 18:03:50 +02:00
SushiTee a96af1c9fb made it possible to colorize more than one skin part at the same time again 2012-08-19 21:10:15 +02:00
oy 0fc13ec1f8 Merge pull request #998 from cinaera/RenderBug
Fix Renderingbug:
2012-08-19 09:40:10 -07:00
SushiTee 171ee4287d -showing mapsize in KiB in demo menu
-fixed insertion for map data in demo menu
2012-08-19 17:43:15 +02:00
oy cb9d6032ff Merge branch 'master' of https://github.com/SushiTee/teeworlds 2012-08-19 15:48:34 +02:00
oy 1a125863a3 fixed a compiler error and removed some unused variables 2012-08-19 13:06:04 +02:00
oy f25010d9dd Merge branch 'master' of github.com:teeworlds/teeworlds
Conflicts:
	src/game/client/gameclient.cpp
	src/game/server/gamecontext.cpp
2012-08-19 12:46:24 +02:00
oy 37b43caba8 cleaned up Sv_VoteOptionListAdd message 2012-08-19 10:40:30 +02:00
oy 8b5dddf2ba fixed some problems with force_vote 2012-08-18 20:14:23 +02:00
oy 34ebab8cab made force_vote just ui based 2012-08-18 18:42:31 +02:00
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
Magnus Auvinen 8ed246fa1c fixed all the errors that the clang static analayzer found 2012-08-17 18:32:56 +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
Magnus Auvinen 4e20a9e6c0 cleaned up warnings that clang spits out. some bugs found with it. 2012-08-17 00:03:53 +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 85a5fd8bc0 fixed missing texture unload in the editor 2012-08-12 14:32:37 +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 b10931eb9d Merge branch 'master' of git://github.com/teeworlds/teeworlds 2012-08-11 16:28:12 +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
oy 25da0f4c52 fixed few things in pnglite 2012-08-11 11:51:01 +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
oy 9023796d27 fixed faulty message id 2012-08-09 10:30:04 +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 f9427a3aa3 made server resend gameinfo just when it changed and fixed match counter 2012-08-03 18:46:57 +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 9164c1d879 made the server validate player input 2012-08-03 18:46:17 +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 78e18dc2cb Show user authlevel on status command. Closes #985 2012-07-29 12:17:16 +02:00
oy c28a45796b fixed asserts when sorting the server browser 2012-07-29 12:09:31 +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
oy 3d10432d97 fixed compiler error. Closes #982 2012-07-22 10:44:50 +02:00
oy de7942d6e4 fixed editor crash on replacing images. Closes #981 2012-07-22 10:43:19 +02:00
oy 9ae4479dad cleaned up rcon auth messages 2012-07-21 20:00:01 +02:00
BeaR 2c4bcf8874 grey out text color of non-active gui elements. Closes #867. 2012-07-21 19:28:03 +02:00
oy a6d658903d fixed invalid inactive kick when dead during survival. Closes #957 2012-07-21 19:18:49 +02:00
oy 7d8e76ecaf fixed semaphore behavior on windows. Closes #926. Closes #934. 2012-07-21 18:53:09 +02:00
BeaR 96d30fa820 end a round when there's only 1 player left (#961) 2012-07-21 18:48:19 +02:00
oy a9165cd7a0 removed no longer needed server dummy commands 2012-07-21 18:34:24 +02:00
oy c24e35fa87 merged tileset_border tools 2012-07-21 18:30:21 +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 a69a0c4f67 reduced some possible spam for the server 2012-07-19 12:18:12 +02:00
oy 5c2534969c fixed saved skin files and cleaned up writing newlines 2012-07-19 11:57:20 +02:00
oy 5fdca5bf54 removed some unused save directories and abort when the save directory cannot be created 2012-07-19 11:49:03 +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 3a0b017619 fixed try_lock on windows 2012-07-19 10:01:57 +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 f8939534c7 fixed so skin is default the first time we launch the game 2012-07-17 21:55:20 +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