Commit graph

703 commits

Author SHA1 Message Date
oy 8f0c5d634b fixed fullscreen on mac osx 2015-04-02 15:37:47 +02:00
oy 15fa362905 fixed stuck mouse on mac osx 2015-04-02 15:28:41 +02:00
oy 135640ac9b fixed compiling on mac osx. Closes #1334 2015-03-31 16:00:25 +02:00
oy 663c39655e fixed last commit 2015-03-22 14:38:22 +01:00
oy 721739ed42 Merge remote-tracking branch 'remotes/swick/sdl2'
Conflicts:
	src/engine/client/backend_sdl.cpp
	src/engine/client/graphics_threaded.h
	src/engine/shared/config_variables.h
2015-03-22 14:10:53 +01:00
oy 99f26dc020 fixed some problems with the pma interpolation. #1317 2015-02-26 19:31:31 +01:00
oy f59f3090ac added start parameter to use the default configuration 2015-02-18 14:15:31 +01:00
oy 6506cf4ddf fixed last commit, generalized config saving and path check 2015-02-18 14:04:26 +01:00
oy c3bce45120 added dilate texture fix by matricks 2015-02-18 13:05:16 +01:00
BeaR a2cb7d339a Mark some return values as const 2015-01-24 18:19:38 +01:00
BeaR a929a99fd9 Refactoring: Mark several functions as 'const', fix some return values and cleanup mapinfo struct 2015-01-24 18:19:24 +01:00
oy 8ac9ec794e moved content and added data creation to the build 2015-01-18 18:44:11 +01:00
Learath be1adf7e51 Scale was always 0 causing Kerning not to be applied 2014-12-21 19:05:59 +01:00
oy 75222892be cleaned up few things 2014-12-21 18:57:30 +01:00
BeaR d1ee52c372 Implement stricter panning(audio), make pan depending on screen width and remove useless channel pan value 2014-12-21 18:48:44 +01:00
BeaR b34e455e4c Allow to set different wrapmodes for each texcoord and soften texture clamping restrictions for quads 2014-12-21 12:52:28 +01:00
Sebastian Wick 2232a73d37 fix remaining bad include 2014-07-03 13:14:14 +02:00
Sebastian Wick 549e37537f remove dead code, fix Mac OSX build, fix includes 2014-07-02 23:12:49 +02:00
Sebastian Wick dac1c65ba5 call SDL_GL_SetSwapInterval after context creation 2014-07-02 18:56:00 +02:00
Sebastian Wick 013e19e497 windows fixes 2014-06-30 21:31:47 +02:00
Sebastian Wick 43a45cd2fa remove InpGrab config, eliminate dead code, fix glu include for Mac 2014-06-30 13:52:42 +02:00
Sebastian Wick f1272f6eb3 fix windows build, remove unnecessary include, more precise error message 2014-06-29 22:09:03 +02:00
Sebastian Wick 4a1733424b fix mouse lag 2014-06-29 21:56:13 +02:00
Sebastian Wick dcd4f9ae7a moving to sdl2, mouse input lags; do not use! 2014-06-29 21:02:09 +02:00
Sebastian Wick 4d0e80e22b moving to sdl2, input still broken; do not use! 2014-06-29 20:22:19 +02:00
Sebastian Wick 8e8b1516e2 moving to sdl2, input is broken, build is broken; do not use 2014-06-29 19:07:46 +02:00
BeaR b99e4304ed Cleanup: Fix code format, remove hardcoded value and add some documentation 2014-06-24 13:19:52 +02:00
ghost91- 242ac2233a snd_enable_musicnow controlls menu music.
don't poll on music toggeling
2014-04-16 14:27:53 +02:00
oy 191feb618f fixed compiler warnings 2014-02-27 19:52:41 +01:00
oy 030443e55a Merge pull request #1138 from KillaBilla/servernamecleanup
Remove consecutive spaces in servername
2014-02-27 19:14:40 +01:00
oy 752a38ccfe consider the max 3d texture size on possible texture re-sampling 2014-02-22 18:58:17 +01:00
oy 9e67ac0b9e fixed displaying invalid textures 2014-02-22 18:36:33 +01:00
oy b668f7faab some cleanup 2014-02-18 18:02:42 +01:00
oy c66f646ae6 fixed using an image in quad and tile layer 2014-02-16 22:09:59 +01:00
oy 7a6e10d87b fixed non-quality textures 2014-02-16 16:47:34 +01:00
oy 5890072809 fixed 3dtexture usage on windows 2014-02-10 19:06:22 +01:00
Magnus Auvinen 85f216d968 Fixed so that the tileborderfix tool isn't needed anymore. Solve the issue by using a 3d texture instead 2014-02-10 18:53:47 +01:00
oy 41b41ec451 fixed some warnings 2014-02-09 17:59:08 +01:00
oy 1e1befc3ec Merge pull request #1163 from Tolsi/master
Adding 9th mouse button support
2013-11-25 11:25:38 -08:00
PsychoGod 40cdbf6c6a window center position when windowed on Windows :3 2013-11-25 19:51:28 +01:00
Sergey Tolmachev e2727c8e1e Adding support 9th mouse key 2013-10-29 01:50:47 +03:00
Sergey Tolmachev e06a57d437 9th mouse key name was added 2013-10-29 01:49:40 +03:00
KillaBilla a9cc1e8de2 remove leading and trailing space from server name and forbit the use of multiple spaces 2013-09-04 16:47:24 +02:00
BeaR c42666cd3c Using MemoryBarrier() for CPUs not supporting SSE2 2013-04-03 11:44:06 +02:00
oy d8a7eb6863 increased sleep time when tw is minimized and made it adjustable via cputhrottle otherwise 2013-02-20 15:51:46 +01:00
Choupom 3048ebe3c5 fixed some compiler warnings 2012-12-15 16:33:37 +01:00
oy c81722f9e3 removed some unused stuff 2012-12-15 16:24:00 +01:00
oy 8a3de3fe28 fixed client clean up 2012-12-09 16:59:27 +01:00
oy 4214b576e9 fixed last commit 2012-12-09 15:55:01 +01:00
BeaR 66579083fa Small aesthetical changes 2012-12-09 15:52:31 +01:00
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