edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-20 06:58:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
3428 commits 1 branch 429 tags 411 MiB
Commit graph

2695 commits

Author SHA1 Message Date
oy 6722e8e3b1 fixed wrong types within vector constructors. Closes #1371 2015-08-30 08:37:10 +02:00
oy cbe133dce0 let the client check if a connection is still established and for the correct peer address before processing data. Closes #1356 2015-08-30 08:36:34 +02:00
oy cc2dcd865a force vital check on essential cl/srv messages and added additional sequence checking 
Conflicts:
	src/engine/client/client.cpp
	src/engine/server/server.cpp
 2015-08-30 08:31:29 +02:00
oy d4c00097a5 separated connless packet handling and use random port for client's server connection 2015-08-30 08:22:04 +02:00
oy b9e4c7e979 made server info requests more strict 
Conflicts:
	src/engine/client/serverbrowser.cpp
 2015-08-30 08:20:24 +02:00
oy e592d1b1fa fixed updating the menu map on change 2015-04-02 19:28:38 +02:00
oy 83ea5f71ad fixed a warning 2015-04-02 16:14:38 +02:00
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
heinrich5991 cd26c89c2f Remove unnecessary use of the comma operator 2015-03-31 17:44:22 +02:00
oy 135640ac9b fixed compiling on mac osx. Closes #1334 2015-03-31 16:00:25 +02:00
oy 2283a3b785 fixed some quad rendering. Closes #1333 2015-03-28 10:49:02 +01:00
oy 39f1d3a7e2 fixed key handling for the console/binds. Closes #1331 2015-03-26 16:01:34 +01:00
oy 999163301e fixed a line separator 2015-03-22 15:24:26 +01: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 845331bca3 Make SERVERBROWSE_GETINFO extensible. Closes #1324 2015-03-22 13:48:00 +01:00
oy cdcc641af3 made day/night detection more accurate and did some cleanup. Closes #1304 2015-03-22 13:44:19 +01:00
oy 191d7fab81 fixed custom skin colour picker 2015-03-22 13:28:28 +01:00
oy fa8959311e skip multiple skins during loading and prevent saving skin as special one 2015-03-22 13:15:18 +01:00
oy d0a028ae7e fixed saving skin with a name that already exists. Closes #1330 2015-03-22 12:54:08 +01:00
oy 939be9c949 cleaned up camera positions for the background map a bit 2015-03-10 19:37:21 +01:00
oy e6cfd22ca0 removed unused config variable 2015-03-10 19:31:29 +01:00
BeaR 2aab20bb80 Fix camera movement in the menu 
* Wrap menupage updates
* Remove magic value
 2015-03-10 19:24:43 +01:00
oy c727995ffa open quit popup when pressing escape in the main menu 2015-03-04 12:24:48 +01:00
oy 2fdd97df06 fixed some comments 2015-03-04 11:26:39 +01:00
heinrich5991 e872d7599e str_check_pathname: Only check for "..", "." is not dangerous 2015-03-04 11:20:50 +01:00
heinrich5991 1af9980b03 str_check_pathname: Also fail if the forbidden sequence is at the end 2015-03-04 11:20:49 +01:00
heinrich5991 d335694931 Make clearer comments on why the current path checking suffices 
Also fix that it `str_check_pathname` counted dots even if they were after a
non-dot character.
 2015-03-04 11:20:48 +01:00
oy 6a1a0d800f fixed last commit 2015-03-04 11:15:54 +01:00
Henningstone 7e180dfdb9 Make seekbar toggable/hide automatically 2015-03-04 10:54:56 +01:00
BeaR 3add923231 Add editor to adjust z-index of quads 
* Keybinds home/end/pageup/pagedown to move the selected quad to front/back/up/down
 2015-02-26 19:53:06 +01:00
oy 99f26dc020 fixed some problems with the pma interpolation. #1317 2015-02-26 19:31:31 +01:00
oy b64c8dff25 fixed problems with the dilate fix. Closes #1317 2015-02-24 12:32:24 +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
Rudi c77518d2e1 Introduced str_safe_as_pathname that just checks string before using them as path to save to, returns error otherwise. Check is performed before saving server conf, recordings and ban list. 2015-02-18 13:21:55 +01:00
Rudi b3321e506c Sanitizing the path to which we save server configurations, and also demo files 2015-02-18 13:21:54 +01:00
Rudi d38af947a1 Introduced optional name for save_conf, sanitized file name? 2015-02-18 13:21:54 +01:00
Rudi b3c51c33bb Adding the command save_conf that allows to save current server configuration to a file 2015-02-18 13:21:53 +01:00
oy d85937738a removed outdated files 2015-02-18 13:06:53 +01:00
oy c3bce45120 added dilate texture fix by matricks 2015-02-18 13:05:16 +01:00
BeaR 291cdde544 Fix crc32 initial value 2015-01-28 14:41:33 +01:00
oy 2950804cfb fixed a warning 2015-01-26 16:21:40 +01:00
oy 77daedc814 fixed last commit and removed some outdated stuff 2015-01-24 18:40:49 +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 74dfee1aee some cleanup 2015-01-24 18:07:03 +01:00
BeaR 718510e0b1 Removed unused directory 2015-01-24 17:44:59 +01:00
oy fb85b582bf load background map in the menu regarding current day or night time 2015-01-18 19:28:39 +01:00
oy 98b6510b9c fixed loading of the background map 2015-01-18 19:07:28 +01:00
oy 8ac9ec794e moved content and added data creation to the build 2015-01-18 18:44:11 +01:00
oy dc827fa460 fixed quick rejoin check for localhosts. Closes #1140 2015-01-18 16:37:46 +01:00
oy 952cbd9d3b removed dead code. Closes #1284 2015-01-18 16:10:25 +01:00
oy 5c83148fc6 added +/- for speed-up/slow-down in the demo player. Closes #1268 2015-01-18 15:57:26 +01:00
Henningstone d4f749c88e Add Spacebar for toggling Play/Pause 
Closes #1268; Added spacebar for swiching between
play/pause in demoplayer
 2015-01-18 15:28:53 +01:00
oy 6821703f95 fixed wrapping 2015-01-12 05:58:04 +01:00
BeaR d4a752e446 Fix texture wrapping mode for menuimages 2015-01-12 05:55:07 +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
oy dcd5ef27c0 Fixed overlapping exit message. Closes #1288 2014-12-21 13:46:57 +01:00
BeaR 3c4bf03783 Editor: Scale indicator for selected quads with zoomlevel 2014-12-21 13:35:03 +01:00
BeaR 008283c530 Fix newline 2014-12-21 13:22:10 +01:00
BeaR bfb245c2bb Add missing color.h 2014-12-21 13:22:03 +01:00
BeaR 551b21162f Fix variable name formatting 2014-12-21 13:21:55 +01:00
BeaR a5debee342 Move color conversion functions to seperate header and add variables to customize editor colors 2014-12-21 13:21:50 +01:00
BeaR fee5f5ec9f Fix menumap animations 2014-12-21 13:09:43 +01:00
BeaR 656b1e9071 Fix loading of menuimages and fix foreground mapanimations 2014-12-21 13:09:32 +01:00
BeaR 5ba116ad13 Remove code duplication (by heinrich5991) 2014-12-21 12:56:03 +01:00
BeaR a030d7c494 Correctly retrieve the mouse position and adjust worldoffset 2014-12-21 12:55:55 +01:00
BeaR 90617421eb Editor: Add feature to zoom to the current mouse position 2014-12-21 12:55:47 +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
BeaR de82ad7a26 Editor: Add texture coordinates to quad properties and fix wrong fxp conversion 2014-12-21 12:42:26 +01:00
BeaR 5f99e6841f Fix image button darkening 2014-12-21 12:33:56 +01:00
BeaR 792900fb3d Editor: Show if images are used by layers (originally by deen) 2014-12-21 12:33:48 +01:00
BeaR 26c3f11813 Editor: Hide screen sizes if tilepicker is active 2014-07-29 13:26:35 +02:00
oy 03c171d2e4 Merge pull request #1243 from cinaera/pr_fixes 
Cleanup: Fix code format, remove hardcoded value and add some documentat...
 2014-07-12 13:20:46 +02:00
oy 7b9c75eda1 fixed an issue with the ammo regeneration. thx Ich 2014-07-12 13:15:14 +02: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
oy e7f1a8ab79 fixed faulty includes 2014-06-22 13:55:17 +02:00
oy 3dffd6bc9c fixed last commit 2014-06-22 13:36:58 +02:00
oy 8178302e02 Merge pull request #1149 from Speedy-Consoles/weapon_cleanup 
weapon code cleanup
 2014-06-22 13:29:19 +02:00
oy 5eee57f1e7 changed tattoos to markings. Closes #1131 2014-06-22 12:53:22 +02:00
oy 456a1963be removed some unused code 2014-06-22 12:29:53 +02:00
oy 2448ed14f0 fixed maximum chat message length on client-side. #1151 2014-06-22 12:28:31 +02:00
oy 27da041e00 Merge pull request #1072 from minus7/new-bam-file 
rewrote bam.lua to be cleaner
 2014-06-21 19:59:28 +02:00
BeaR 2c4775cf5a Prevent texture bleeding on quad rendering 2014-06-21 18:10:35 +02:00
oy ffd9c7b0b3 Merge pull request #1231 from cinaera/demoplayer 
Improve the sensitivity of the demoplayer timeline and visually better m...
 2014-06-21 13:37:44 +02:00
oy de663a71f1 Merge pull request #1229 from cinaera/mapitem 
Remove outdated code and add some version enums for safety
 2014-06-21 13:23:31 +02:00
oy c92d430f4a Merge pull request #1225 from cinaera/envelope_legacy 
Fix envelopes rendering (incorrect loading)
 2014-06-21 13:10:00 +02:00
BeaR aab36332d9 Improve the sensitivity of the demoplayer timeline and visually better match the seekbar slider with the actual position 2014-06-13 13:50:43 +02:00
BeaR f3ca2403fd Fix code formating 2014-06-11 16:37:38 +02:00
BeaR 04ee8b20a1 UI: Add alignment enums 2014-06-11 07:26:18 +02:00
BeaR bbed4d73d3 Removed outdated maploading code 2014-06-10 10:34:33 +02:00
BeaR 6d75bcc89a Add version enums to some mapitems for safety 2014-06-10 10:31:10 +02:00
BeaR a56a14af72 Only load envelope points once at mapload 2014-06-04 17:51:03 +02:00
BeaR 65be3d8766 Fix envelopes rendering (incorrect loading of legacy ones) 2014-06-04 17:50:57 +02:00
BeaR 52faacc45e Fix building (missing header) 2014-05-30 13:52:20 +02:00
BeaR e8b6ce4288 Fix header inclusion 2014-05-26 12:02:54 +02:00
BeaR 2b36ae2baa Correctly name functions, remove old code and fix bezier solver 2014-05-25 10:41:24 +02:00
BeaR f3ca79315e Remove unnecessary debug variable 2014-05-24 17:19:27 +02:00
BeaR d5a7590e7c Clamp bezier tangents and re-fix envelope preview 2014-05-24 17:12:39 +02:00
BeaR 09c2e8475f Fix envelope editor scaling 2014-05-24 15:10:48 +02:00
BeaR fe74ff4c0c Fix some numerical issues at bezier envelopes 2014-05-24 12:34:15 +02:00
BeaR 3c99ba5228 Correctly preview the envelope curves 2014-05-23 15:48:37 +02:00
BeaR a39a03e318 Fix envelope preview commit 2014-05-23 12:59:00 +02:00
BeaR f209aea10e Add cubic bezier-FCurves support for envelopes 2014-05-23 11:12:43 +02:00
BeaR 9e5daa446b Add enum for envelope preview modes 2014-05-23 11:12:15 +02:00
oy cd75606521 Merge pull request #1197 from heinrich5991/pullreq_1197 
Fix some of #1138
 2014-05-11 21:01:21 +02:00
oy bb8a180358 Merge pull request #1204 from cinaera/clean_rendertools 
Cleanup MapScreenToGroup
 2014-05-11 20:00:29 +02:00
oy 68c58d1aae Merge pull request #1148 from ghost91-/menumusic 
snd_enable_musicnow controlls menu music.
 2014-05-11 17:49:20 +02:00
Mohammad H. Hemeda 82f8b4bbdb Fixed some typos 2014-04-30 05:18:57 +03:00
ghost91- 242ac2233a snd_enable_musicnow controlls menu music. 
don't poll on music toggeling
 2014-04-16 14:27:53 +02:00
m!nus 92fbebf40a generated files are now in build/ as well 
also fixed python invocation on windows again
 2014-03-23 11:50:57 +01:00
heinrich5991 c927b73a4c Fix walking animation 
Previously, when walking with negative x-coordinate, your walking direction was
inversed.
 2014-03-22 11:56:21 +01:00
BeaR 2fcb898f5f Remove redundant MapScreenToGroup() and declarate it in RenderTools 2014-03-11 10:24:37 +01:00
heinrich5991 fde797274a Fix some spelling in src/base/system.h 
termineted -> terminated
 2014-02-28 23:16:11 +01:00
heinrich5991 b9c4086382 Fix indentation and formatting of str_clean_whitespaces 2014-02-28 23:14:18 +01:00
oy 32ba5bb5a5 added some missing localizations. Closes #1105 2014-02-27 22:17:13 +01:00
oy c1778a5452 fixed problem with ninja movement while the powerup ends. #1152 2014-02-27 21:44:00 +01: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 d9a18f112d Merge pull request #1137 from KillaBilla/warmuphide 
Minimize warmup message
 2014-02-27 18:42:59 +01:00
oy d6adb1efa7 Merge pull request #1139 from KillaBilla/settingsflashfix 
Fixed a menu bug (settings menu flashing for one frame)
 2014-02-27 18:34:34 +01:00
oy eb0a2dfd11 Merge pull request #1117 from just-another-one-timmy/master 
Fixed spelling in src/engine/docs/snapshots.txt
 2014-02-27 18:29:38 +01:00
oy 3f958c3345 changed feet size. Closes #1181 2014-02-24 22:55:28 +01:00
oy 12ac0f3789 fixed a localization problem. Closes #1186 2014-02-24 22:50:33 +01:00
oy 6b69f94dc8 some type cleanup within vector functions 2014-02-22 19:38:18 +01:00
BeaR 7735557aa5 Add angle<->direction conversion functions to vector math (Cleanup) 2014-02-22 19:14:57 +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 24397335be fixed possible client crash on too many map images 2014-02-10 19:36:49 +01:00
oy 8d57c7ab55 fixed 3dtextures in menu maps 2014-02-10 19:27:36 +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
BeaR 2bfb848414 Cleanup quad creation: add i2fx to reduce confusion 2014-02-10 10:46:45 +01:00
oy 19912be97a Merge pull request #1170 from SushiTee/vs12_fix 
fixed compiling using visual studio 2013 by renaming the round function
 2014-02-09 19:16:09 +01:00
oy 8e5733ff1c Merge pull request #1190 from cinaera/fix_automapper 
Automapper: fix wrong tile orientation and correctly handle border tiles
 2014-02-09 18:54:03 +01:00
oy 41b41ec451 fixed some warnings 2014-02-09 17:59:08 +01:00
oy 143c7b0a35 Merge pull request #1184 from cinaera/fix_vec 
Fix typo in vector2_base division operator
 2014-02-09 16:59:20 +01:00
oy c598e87ebe fixed a server crash due to faulty offsets. #1173 2014-02-09 16:54:09 +01:00
BeaR 868e212871 Automapper: fix wrong tile orientation and correctly handle border tiles 2014-02-07 20:16:11 +01:00
BeaR be52fc28c6 Fix typo in vector2_base division operator 2014-02-05 19:19:49 +01:00
heinrich5991 9d3d8cc197 Fix vector2_base::operator!= 
Previously it compared the x coordinate of the one vector with the y coordinate
of the other vector.
 2014-01-19 19:23:39 +01:00
SushiTee 13a128ef8c fixed compiling using visual studio 2013 by renaming the round function 2013-12-09 14:00:24 +01:00
oy 22fe75245c Merge pull request #1111 from heinrich5991/pullreq_1111 
Fixed two minor issues
 2013-11-26 11:44:30 -08:00
josephgbr bdd0663db0 Localize the flag capture's message 
This string is presented to the user without translation, but would be nice if it could.

Requires adding the respective original strings in translation files.
 2013-11-26 20:31:08 +01:00
oy c9eb180a2e Merge pull request #1104 from TsFreddie/patch-1 
Fix a spelling mistake "Spactating"->"Spectating"
 2013-11-26 11:23:20 -08:00
oy 2c73819a15 Merge pull request #1121 from east/ipv6_fix 
IPV6 fix
 2013-11-25 11:27:33 -08:00
oy 1e1befc3ec Merge pull request #1163 from Tolsi/master 
Adding 9th mouse button support
 2013-11-25 11:25:38 -08:00
oy a5ab154547 Merge pull request #1165 from fisted/fix_netbsd 
support NetBSD
 2013-11-25 11:24:11 -08:00
oy d2379124d5 improved chat msg spam protection 2013-11-25 20:06:19 +01:00
oy 08d0af36c2 increased minimum required connect time for clients to 1 second. #1070 2013-11-25 19:57:40 +01:00
PsychoGod 40cdbf6c6a window center position when windowed on Windows :3 2013-11-25 19:51:28 +01:00
oy 4e14dedd80 prevent quick join/quit flood. #1070 2013-11-25 19:27:57 +01:00
fisted 0e2a134c2a support NetBSD 2013-11-17 00:52:31 +01:00
Sergey Tolmachev d26039cc84 9th mouse key and its code was added 2013-10-29 01:52:23 +03: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
oy 30e6e0877b fixed master server lookup for servers. #1047 2013-09-25 15:03:28 +02:00
Speedy Consoles 0e14f32cd9 improved variable usage in CPickup::Tick() 2013-09-15 01:25:05 +02:00
Speedy Consoles ee2d53b411 using weapon damage for explosion damage 
removed unused nodamage parameter in CreateExplosion
took projectile damage for explosion maxdamage
replaced some 0s by false as it should be
 2013-09-14 22:46:48 +02:00
Speedy Consoles c9bdc32fc0 cleaned up weapon value locations 
removed laser damage tuning
added explosion values in content.py
made explosion force independent from damage
linked all weapon damage values to content.py
linked all weapon max ammo values to content.py
stopped regenerating  infinite ammo
removed m_Ammocost in CCharacter
 2013-09-14 21:33:52 +02:00
KillaBilla c818afd1ea changed str_clean_whitespace implementation to pkoerner's one 2013-09-08 13:11:43 +02:00
KillaBilla 4746cf0488 made the settings menu close on escape press only if not online 2013-09-05 17:04:27 +02:00
KillaBilla c90d40793c Changed font color for warmup message 2013-09-04 19:55:16 +02: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
KillaBilla dc089ef3c2 Minimize warmup message after 10 seconds if only one player present 2013-09-03 23:29:40 +02:00
east 1bd3d9e584 net_addr_from_str() fix 2013-08-05 09:39:43 +02:00
Iaroslav Tymchenko d62eb8b637 Fixed spelling in src/engine/docs/snapshots.txt 2013-07-23 17:02:31 +03:00
heinrich5991 ca87b4b84b removed weird if from the pure server/tune check 
This fixes #1110 on GitHub.
 2013-06-30 11:49:00 +02:00
heinrich5991 3e9fadf908 added operator != to the vec? templates 
This fixes #1094 on GitHub.
 2013-06-30 11:45:47 +02:00
Freddie Wang b09dacf02f Fix a spelling mistake "Spactating"->"Spectating" 
There's spelling mistake in menus_ingame.cpp (line 99)
 2013-06-05 17:03:22 +08:00
oy fe49818093 fixed tabs from last commit 2013-06-04 18:54:15 +02:00
oy acaaa9723b added optional context to a localization string to allow multiple translations. Closes #1082 2013-06-04 18:41:32 +02:00
oy f7d436b398 made skin selector refresh on save and added delete functionality. Closes #1101 2013-06-02 12:49:27 +02:00
oy 22c14e9347 Made client/server check for correct map version on load. #1100 2013-06-01 15:26:22 +02:00
m!nus 7e971a514c prevent map editor from crashing if loaded map is invalid 2013-06-01 13:18:16 +02:00
oy 2bee327302 Fixed removing tattoo/decoration in the skin creator. Closes #1099 2013-06-01 12:44:11 +02:00
oy 33efa4e512 Fixed a missing check if killer is alive in tdm 2013-04-26 16:52:14 +02:00
oy f52ca525c0 Merge pull request #1084 from cinaera/atomics 
Fixing atomics (threading)
 2013-04-26 07:42:30 -07:00
BeaR c42666cd3c Using MemoryBarrier() for CPUs not supporting SSE2 2013-04-03 11:44:06 +02:00
oy 2fe43c909e decreased the tees feet size. Closes #1085 2013-04-02 23:36:18 +02:00
BeaR 0fbd493466 Fixing atomics 2013-04-02 16:53:57 +02:00
oy 48f43a7057 drop game messages when client isn't ingame. Closes #1081 2013-03-23 16:08:12 +01:00
oy 1d9611c1be fixed client crash on removing friends. Closes #1077 2013-03-16 17:33:42 +01:00
oy 38b5d9987c fixed frozen GUI caused by popups 2013-03-16 17:31:54 +01:00
oy 109e122f4f show reason for closing a connection within a debug message. Closes #1061 2013-02-20 16:49:21 +01: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
oy 717162a9a2 fixed picker logic 2013-02-20 15:40:57 +01:00
BeaR cc856152b5 Fixing the HSL-Picker: 
Accurate displaying of the colors in the picker and the Lgt slider
 2013-01-17 18:44:39 +01:00
oy 295eac63eb added alternative HSL picker. Closes #1029 2012-12-23 00:27:53 +01:00
oy f5c56c96d5 changed skin file format to json 2012-12-22 00:34:49 +01:00
oy d08695b148 added automapper improvements by LordSk in a json based manner 2012-12-21 01:18:32 +01:00
oy 3329c549e6 fixed couple of warnings 2012-12-20 16:30:16 +01:00
oy 4337eb80f3 changed language file format to json 2012-12-19 00:30:01 +01:00
oy f50b5d6059 changed format of the countryflags index file to json 2012-12-17 19:40:48 +01:00
oy 61b515f9be added missing json parser files 2012-12-17 18:50:06 +01:00
oy b7dbf5431e close workerthreads on shutdown 2012-12-17 00:43:31 +01:00
oy d39cdb9468 use json format within the language index file 2012-12-17 00:05:43 +01:00
Choupom 3048ebe3c5 fixed some compiler warnings 2012-12-15 16:33:37 +01:00
oy b8e3120c0d disabled the map checker for now 2012-12-15 16:31:48 +01:00
oy c81722f9e3 removed some unused stuff 2012-12-15 16:24:00 +01:00
oy b99368e3d7 removed hookdir from snapshot data 2012-12-15 16:13:49 +01:00
oy 09ef13b9b9 some clean up 2012-12-15 16:13:03 +01:00
oy 8b8eb50961 fixed ninja skin and skin part selection on missing part 2012-12-09 20:26:40 +01:00
oy 1b6698a181 fixed size of the tee hands 2012-12-09 17:00:03 +01:00
oy 8a3de3fe28 fixed client clean up 2012-12-09 16:59:27 +01:00
oy dd5c040a3b Merge branch 'master' of https://github.com/SushiTee/teeworlds 2012-12-09 16:15:28 +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
BeaR 639c7cf6a8 Envelope preview: make last point editable 2012-12-09 15:51:20 +01:00
BeaR b8602f019b Add OnReset for damage indication 2012-12-09 15:50:26 +01:00
oy 5623c5c008 updated map checker for dm8 2012-12-06 20:58:16 +01:00
SushiTee aa03944cfb Merge branch 'master' of git://github.com/teeworlds/teeworlds 
Conflicts:
	src/game/client/components/menus_ingame.cpp
 2012-11-15 10:19:20 +01:00
SushiTee 5845665ba6 started writing the friends browser page 2012-11-15 10:14:30 +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 749dfa2af1 fixed server crash on team balance. Closes #1032 2012-11-10 19:15:41 +01:00
SushiTee 01c7a06c22 made overlay enterable 2012-11-07 17:59:05 +01:00
SushiTee 9fd796162a gave info button a function 2012-11-07 17:15:03 +01:00
oy 444da4e341 fixed a typo and added some missing localisation markers 2012-11-04 16:42:59 +01:00
SushiTee 02648e14b2 Merge branch 'master' of git://github.com/teeworlds/teeworlds 2012-11-04 12:47:41 +01:00
SushiTee 9f54a5c696 remade ingame join buttons 2012-11-04 12:47:10 +01:00
oy 082ee5c474 Merge branch 'master' of https://github.com/SushiTee/teeworlds 2012-11-03 17:52:39 +01:00
SushiTee c0f70eddc4 changed server browser 2012-10-21 19:59:20 +02:00
oy ada8011a4c fixed last commit 2012-10-21 14:49:26 +02: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 550c323eb4 made restart work in "wait for more players"-warmup. #999 2012-10-07 22:05:02 +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 401697b35d added a config var for the font filename. Closes #1003 2012-10-07 16:24:18 +02:00
oy 217a30bca0 save last reason within ingame cal vote tab. Closes #996 2012-10-07 15:55:06 +02:00
oy efc26acaaa set default value for asynchronous rendering to disabled for now. #1001 2012-10-07 11:35:39 +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 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