Commit graph

703 commits

Author SHA1 Message Date
oy 090867fa0d fixed last commit 2012-11-13 21:37:46 +01:00
BeaR 591b6a2f62 Bug: Losing render-commands if commandbuffer is full(gfx)
Problem:
If there is a new draw call, it is checked if there is enough free memory for the vertices in the databuffer but not if we have enough free space in the commandbuffer to add the command
So we lose some commands during a frame cuz the commandbuffer is full

This fixes the 2nd part of issue 1004
2012-11-13 21:33:16 +01:00
oy 082ee5c474 Merge branch 'master' of https://github.com/SushiTee/teeworlds 2012-11-03 17:52:39 +01:00
BeaR 70a648899d Some graphic batching:
Speed up for displaying debugtext and envelopepreview
(This reduces the performance hit especially for the 'Show Info' mode in the editor)
2012-10-21 13:55:26 +02:00
SushiTee 20cfbfe3a7 Merge branch 'master' of git://github.com/teeworlds/teeworlds
Conflicts:
	src/game/client/components/menus_ingame.cpp
2012-10-09 13:08:01 +02:00
SushiTee c74637ae6d began to rewrite server browser and ingame menu 2012-10-09 12:44:47 +02:00
oy e29ced0741 fixed some compiler warnings and a line ending 2012-10-09 00:11:13 +02:00
oy 078390522e Merge branch 'master' of https://github.com/SushiTee/teeworlds 2012-10-08 23:56:41 +02:00
oy 57e28e5c88 made favorites support hostnames. Closes #55 2012-10-07 23:56:37 +02:00
oy e2973652f7 added skill level to server info. #1000 2012-10-07 22:02:50 +02:00
oy c2cb73b87f made numbers in server info ints instead of strings 2012-10-07 21:56:38 +02:00
oy 81f3882976 removed old non threaded graphics backend 2012-10-07 11:31:23 +02:00
oy 500621ec47 readded texture resampling 2012-10-07 11:22:49 +02:00
oy e6a1f99681 fixed texture memory usage calculation in graphics threaded 2012-10-06 23:31:02 +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
Johannes Loher 5db997445a Fixed threaded gfx and building on Mac OS X 2012-08-26 20:02:04 +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 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
Magnus Auvinen 8ed246fa1c fixed all the errors that the clang static analayzer found 2012-08-17 18:32:56 +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 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 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 a4e13330f6 Merge branch 'master' of git://github.com/teeworlds/teeworlds 2012-08-10 19:01:28 +02:00
oy 9023796d27 fixed faulty message id 2012-08-09 10:30:04 +02:00
SushiTee a631ed3be6 finished start menu 2012-08-09 02:13:16 +02:00
oy 525825c215 fixed some warnings with gcc 2012-08-03 19:28:15 +02:00
oy b1d28c5740 cleaned up updating the friend state 2012-08-03 18:46:33 +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 9ae4479dad cleaned up rcon auth messages 2012-07-21 20:00:01 +02:00
oy a9165cd7a0 removed no longer needed server dummy commands 2012-07-21 18:34:24 +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
SushiTee 4b57161752 -integrated popups into menu -made filter editable 2012-07-17 13:10:11 +02:00
SushiTee 8e09a80e22 - new browser icon - fixed overlay - colorizing ping 2012-07-17 12:55:47 +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 4f9cd3bf14 changed way of loading the menu map (not save yet) 2012-07-15 18:35:47 +02:00
SushiTee 7d7d20cf8b added some configuration 2012-07-15 11:21:16 +02:00
SushiTee fcabed11b4 started writing map background in menu 2012-07-15 10:50:05 +02:00
oy ecf99fbcb4 added some missing file handle closures 2012-07-08 12:03:42 +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
BeaR 8372849cba #913
Fix Input Handling
2012-07-07 11:30:04 +02:00
BeaR c155313165 -Insensitive ordering(Serverbrowser)
-Better shuffling and small deletion
2012-07-06 18:51:15 +02:00
heinrich5991 121f3b61b3 Removed useless enum 2012-06-27 11:47:31 +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 c16c4ee4d9 fixed semaphore on macosx 2012-06-10 12:14:41 +02:00
oy 6f79a0562b fixed wrapping problems when rendering console input 2012-04-21 00:23:48 +02:00
oy 314978a87f fixed used nettype in server browser and try to use ipv4 and ipv6 socket when using a bindaddr. Closes #940 2012-03-04 12:47:16 +01:00
oy 5253f2ffa1 auto adjust the screen resolution on first start. Closes #921 2012-03-04 12:46:55 +01:00
oy 525e7ad7d4 skip screenshot when window isn't active. Closes #931 2012-03-04 12:46:46 +01:00
oy c2e5771a15 improved map download. Closes #712 2012-03-04 12:46:32 +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 27daa26b99 fixed stuck mouse cursor when loosing fullscreen focus on windows 2012-02-05 13:28:35 +01:00
oy 0c05b3bfa1 fixed compiling with vs2008 (#932) 2012-02-05 13:22:39 +01:00
oy fa81141110 added demo markers by Choupom. Closes #837 2012-01-10 23:13:19 +01:00
oy 590dbac239 put the game version constants all together in one file. Closes #870 2012-01-09 02:02:02 +01:00
oy 4073520214 cleaned up content folder creation. Closes #845 2012-01-09 01:38:45 +01:00
oy 672b70e9b9 fixed some line endings 2012-01-08 13:57:40 +01:00
oy be37147342 fixed border rendering in the editor's image preview. Closes #908 2012-01-08 01:47:53 +01:00
oy 2785293469 don't start playing the music again if we're quitting 2012-01-06 20:03:57 +01:00
oy 6ad6d59b6f fixed memory corruption with snd_buffer_size config 2012-01-06 19:27:18 +01:00
oy 29738552a6 made bindaddr config work for client and master too. Closes #909 2012-01-06 19:17:14 +01:00
oy 78bb0e3d8c fixed compiling for macosx 2012-01-06 16:35:48 +01:00
oy 71dd0c5aab made gfx_finish work again 2012-01-06 14:12:49 +01:00
oy 12f76e7f8d made the editor work again. Closes #914 2012-01-06 12:55:19 +01:00
oy cc94472f04 fixed mac osx 2012-01-04 00:52:24 +01:00
oy 213b88835e fixed compiling on windows 2012-01-04 00:48:04 +01:00
oy 7328098f8d Merge pull request #912 from matricks/threadedflip
Threadedflip
2012-01-03 15:40:30 -08:00
Magnus Auvinen 7393151b6d fixed the osx opengl make current thingie.. I think... 2012-01-03 22:53:24 +01:00
Magnus Auvinen 666401e309 added osx implementation. not tested, not even compiled once. hope it works 2012-01-03 22:49:31 +01:00
Magnus Auvinen 2991f4071e fixed kicking of command buffer if it's full when rendering. fixed compile error on windows 2012-01-03 22:01:37 +01:00
Magnus Auvinen 50d872531a cleaned up the code. fixed so that SDL is inited on main thread and then transfers the gl context to the render thread 2012-01-03 21:39:10 +01:00
Magnus Auvinen c31c82a584 added support for video modes 2012-01-01 14:30:45 +01:00
Magnus Auvinen d7fe3ddaab fixed shutdown and screenshot functionallity 2012-01-01 14:15:35 +01: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 8b76105cfa cleaned up some of the code 2011-12-31 14:00:49 +01:00
Magnus Auvinen 6e57620c2c added flags for mipmap generation on textures. fixes missing texts 2011-12-31 11:18:55 +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 7a36a103ae fixed so that the rendering can be done async from the input, network and update 2011-12-31 10:04:46 +01:00
Magnus Auvinen 8a91bfa1dd fixed texture upload support. removed raw gl calls from the text render 2011-12-31 09:40:11 +01:00
Magnus Auvinen 50e75da333 fixed so that the resolusion is set correctly on init 2011-12-31 01:23:04 +01:00
Magnus Auvinen 09b785a290 splitted out the graphics threaded into a separate header 2011-12-31 01:11:24 +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
oy de3e94d901 clean up temp commands on logout in the client 2011-12-30 19:21:00 +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 988b1c22cf fixed that the server browser list gets sorted twice on a new entry 2011-12-29 13:06:53 +01:00
oy af9775f400 fixed texture increasing in the text renderer 2011-12-29 13:03:06 +01:00
oy 6e20c32859 removed some resource loading spam. Closes #894 2011-12-10 18:23:29 +01:00
oy 0fdc9c1b8e cleaned up few things 2011-12-04 14:17:05 +01:00
oy 05f77f64af added caching for the play command. Closes #891 2011-11-30 01:41:00 +01:00
oy 48d367db20 added faster way of inverting the sorted serverlist by KillaBilla. Closes #885 2011-11-29 22:34:47 +01:00
oy 8238853b8c added a todo note 2011-11-29 22:18:40 +01:00
eeeee 1452b6811c Replaced sorting implementation with stable one to prevent annoying flickering on server browser update. 2011-11-29 22:16:41 +01:00
Shereef Marzouk c6fd4a2cc5 General whitespace and tab cleanup 2011-08-11 10:59:14 +02:00
oy 2aee50d5b1 fixed a nasty noise problem. Closes #812 2011-08-05 18:37:59 +02:00
oy b25fc26c1c zero out client memory on startup to prevent more bad surprises 2011-07-31 18:39:48 +02:00
oy 9cf4facd05 fixed a client crash in debug. Closes #806 2011-07-31 17:07:10 +02:00
oy 34132ce244 fixed client crash in debug 2011-07-31 01:38:45 +02:00
oy 94bdd95957 added missing newlines at end of 2 files 2011-07-30 18:29:40 +02:00
Johannes Loher e2664c1b00 Added server sided automatic demo recording 2011-07-30 18:23:59 +02:00
oy b3e8506f20 create client on heap. Closes #744 2011-07-30 13:50:22 +02:00
SushiTee a3fec2f9f3 fixed clipping on some machines 2011-07-15 00:39:37 +02:00
oy 571dff6216 made rcon auto completion serverside. Closes #97 2011-07-14 22:07:21 +02:00
oy e37d536fdf fixed some NETTYPE usage based on the socket state 2011-07-07 01:48:00 +02:00
Choupom 520683c0aa made so background musics restart where they got stopped 2011-07-02 19:24:21 +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
oy 47cdd2524b do not try to play sound when it isn't enabled 2011-06-27 22:57:06 +02:00
Choupom 99c2c53c0b fixed some dbg_assert 2011-06-27 16:45:40 +02:00
oy 557c906390 fixed compiling problem 2011-06-27 16:44:35 +02:00
Choupom b17a7be286 fixed #2 Too big textures 2011-06-27 16:32:52 +02:00
oy fb309436b4 improved friends feature 2011-06-26 17:10:13 +02:00
oy 5fbf6d0bfd fixed compiler warnings. Closes #679 2011-05-05 01:43:27 +02:00
heinrich5991 9fb36fd802 added strict game type filter 2011-05-02 19:25:38 +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
oy 4d8c9d1c0d updated standard map filter in the server browser with new maps 2011-04-09 00:08:32 +02:00
oy b6118ae9fe mapped IPv4 addresses within master servers server list to IPv6 to decrease the size of an entry and increased the servers per packet 2011-04-08 23:56:15 +02:00
oy f38fc81d78 fixed a possible client crash on map change 2011-04-07 18:23:03 +02:00
oy c27a634089 fixed and show error message if the crc doesn't match on map load 2011-04-07 18:07:22 +02:00
oy 4ad6d2f01e fixed problem with sv_bindaddr on the server 2011-04-04 18:20:05 +02:00
oy 9cb2f07b80 fixed clients search for maps within subfolders 2011-04-04 16:53:02 +02:00
oy ab810cab25 fixed that player options just show players as friends not clans 2011-04-02 19:51:05 +02:00
oy 04a3b7be00 fixed problem with recorded demo files. Closes #570 2011-04-02 11:55:37 +02:00
oy 85e9fb1e63 made it possible to add just a clan as friend 2011-03-31 21:30:28 +02:00
oy b3ae1a088e make the "show friends"-filter just list servers with friends on them 2011-03-31 21:22:12 +02:00
oy 2a72c0b38b added a mechanism to check for a valid standard map. Closes #132 2011-03-31 15:13:49 +02:00
oy 59d56cd332 finished IPv6 support (master servers aren't compatible with 0.5 and older). Closes #233 2011-03-30 12:08:33 +02:00
oy 34a9ca20a7 added ipv6 support from the old lua branch 2011-03-28 20:11:28 +02:00
oy 7bd79f9f43 added remove_favorite command by Choupom 2011-03-27 18:05:11 +02:00
oy a583633cde added renaming of srvbrowse so it matches with the interface filename by Choupom 2011-03-27 18:00:54 +02:00
oy ae325c873f added friends feature. Closes #24 2011-03-23 13:06:35 +01:00
oy 192d6a0b13 fixed that spectator filter updates the server browser 2011-03-20 16:09:44 +01:00
oy 96808a1145 made it possible to just show the number of player slots of a server (instead of client ones). Closes #68 2011-03-20 15:33:49 +01:00
oy 79aa9d640e fixed that server browser shows the correct country flag 2011-03-20 11:15:24 +01:00
oy a8bf857c68 improved server browser list resorting and made search work on IP addresses. Closes #482 2011-03-18 19:03:13 +01:00
oy f8ae9f7732 made server browser show clan name and country code for players 2011-03-18 17:59:48 +01:00
oy b939d38228 made the client check for valid address on connectionless packets from master/version server 2011-03-17 17:41:57 +01:00
oy 7412fabb9c made serverinfo use clan name and country code for players 2011-03-16 12:37:41 +01:00
oy 27e5a6af0d made clients sending startinfo a requirement to prevent empty player infos 2011-03-15 09:58:57 +01:00
oy 09dc08859d added a function to set the text outline colour and increased readability of nameplates on bright backgrounds. Closes #205 2011-03-13 12:55:00 +01:00
oy be8f669333 added extended demo infos in the demo browser 2011-03-13 10:41:10 +01:00
oy 50b266086b made dbg_dumpmem and dbg_lognetwork work again 2011-03-05 11:46:24 +01:00
oy fc692d85c8 decreased server info timeouts for now 2011-03-04 18:32:12 +01:00
oy 0ae19e1339 removed support for old server infos 2011-03-04 18:14:08 +01:00
oy d9ce720387 made engine an interface 2011-02-27 15:03:57 +01:00
oy 088ec3e2f3 made the client's map search work with sub folders. Closes #254 2011-02-21 11:23:30 +01:00
oy 4f91026a01 added an editor function to show tile informations (index, flip/rotate status) 2011-02-18 11:41:27 +01:00
oy 169efb129f enabled debug rendering in the editor 2011-02-18 11:25:55 +01:00
oy 6a6e7b702e removed double utf8 decoding in text rendering 2011-02-18 11:08:38 +01:00
oy d939b84125 removed no longer needed progression browse info 2011-02-16 12:31:47 +01:00
oy b63dbfede5 fixed problems with map downloading if the map changes during download. Closes #236 2011-02-16 12:07:54 +01:00
oy 818cf464e3 added missing disconnect for stress testing 2011-02-13 17:59:51 +01:00
GreYFoXGTi 1b2703aaba Refactoring & fixed WEAPONSPEC_GUN in content.py 2011-02-12 21:18:41 +01:00
oy be68a4f516 added fix by CarmineZ about missing tool tips in the editor 2011-01-29 18:48:55 +01:00
oy 82749dedf0 fixed beginning of gametime margin graph 2011-01-19 19:29:10 +01:00
oy 7ca7c95bc0 limit the latency within server browser entries to a maximum of 999 2011-01-19 15:54:50 +01:00
oy bf6fcc20f4 added an error popup on startup when the sound couldn't be initialised. Closes #425 2011-01-17 13:28:15 +01:00
oy 216967c3bf release gameclient components when opening the editor. Closes #429 2011-01-17 12:28:37 +01:00
oy 91f642fac2 fixed cut off broadcast. Closes #398 2011-01-09 23:25:07 +01:00
oy 41b8022aa1 record a new demo when a game ends. Closes #358 2011-01-06 23:21:51 +01:00
oy f8b1edca64 show error message for all content that could not be loaded. Closes #257 2011-01-06 22:18:19 +01:00
m!nus 7b46d386dd requesting serverinfo now uses gie2 instead of the legacy gief. 2011-01-05 12:22:45 +01:00
oy aad2438882 fixed outlines for larger font sizes 2011-01-05 12:12:23 +01:00
oy 1928a757c6 added fix for rendering big fonts on large resolutions by RushPL 2011-01-04 12:30:40 +01:00
oy 5dbe75fd7b removed duplicate stuff 2011-01-04 12:00:34 +01:00
oy c75a75b64f made it possible to automatically take game over screenshots. Closes #339 2010-12-12 16:48:13 +01:00
oy ecd7afd9ff added cleaner exit on quit event by Choupom 2010-12-11 22:04:50 +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 0fe8cabe78 added auto recording support by Batchyx 2010-12-08 01:42:32 +01:00
oy db9dd6b8c9 added an optional time stamp to a demo record by Batchyx 2010-12-08 00:42:32 +01:00
oy 665934ee09 cleaned up several uses of timestamps for filenames 2010-12-08 00:32:50 +01:00
oy bd9850cae2 added single function to stop recording by Batchyx 2010-12-08 00:02:24 +01:00
oy e7e2501d1b close map-download-file if the map changes during downloading 2010-11-21 01:10:25 +01:00
Sworddragon fc9211c777 Updated copyrights 2010-11-20 21:26:06 +01:00
oy 3d3572f845 fixed some compiler warnings 2010-11-17 18:36:19 +01:00
oy f1ce0d1949 improved loading progression in the server browser 2010-11-17 12:43:24 +01:00
Choupom a7f37446b6 added loading progression in server browser 2010-11-17 12:31:44 +01:00
oy 4dce645ba8 removed unimportant debug message. Closes #264 2010-11-13 14:29:02 +01:00
oy f1bc96ad09 fixed crashes with the font. closes #178 2010-10-29 23:49:33 +02:00
oy 9490b6f28d fixed key handling for unicodes > 255 2010-10-29 23:01:50 +02:00
oy fa768449e2 fixed issue with reason on forcevotekick 2010-10-13 20:31:21 +02:00
oy 8fb39524a9 do not use console in silent mode. Closes #48 2010-10-13 12:54:27 +02:00
oy e4fe7457c8 fixed problems with the mouse movement. Closes #214 2010-10-13 12:47:42 +02:00
oy 411db8b885 fixed that chat message gets out of the window. Closes #102 2010-10-11 02:29:30 +02:00
Choupom 7aefbca742 made so we can add the reason for a kick/ban (fixes #123) 2010-10-11 00:31:14 +02:00
oy 3a98f7a048 added mod system. Closes #34 2010-10-06 23:07:35 +02:00
oy 27e6fa3ad7 fixed problems with key handling on osx. Closes #45 2010-09-22 00:40:35 +02:00
oy d913af1ab2 renamed demorec files to demo 2010-09-12 12:16:51 +02:00
ghost 3baf522330 added the option to hide the console window on the client, too. Fixes #48 2010-09-07 19:32:33 +02:00
oy 18632b7f5f fixed last commit 2010-09-05 14:09:55 +02:00
Choupom 44cf6acc3a fixed so png files are closed after loading 2010-09-05 14:07:07 +02:00