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
3394 commits 1 branch 429 tags 411 MiB
Commit graph

2668 commits

Author SHA1 Message Date
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
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
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