edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-21 18:14:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
10823 commits 1 branch 424 tags 417 MiB
Commit graph

513 commits

Author SHA1 Message Date
heinrich5991 4ee5c5a781 Rewrite stopper code a bit 
Remove the whole copy-and-paste mess.

A seemingly ineffective and apparently code block has been removed.
 2018-08-15 17:47:07 +02:00
fokkonaut e621a4a8a2 fixed, thanks heinrich 2018-07-25 22:41:24 +02:00
yangfl 81a39c229b Fix typo 2018-07-10 17:29:02 +08:00
ZombieToad 5e723f6199 fix projectiles not rendering on mods based on ddnet 
for some reason the client doesnt render extrainfo projectiles if the gamemode wasnt ddnet
 2018-07-04 04:19:36 +01:00
ChillerDragon 6564b93a35 Fix unwanted dummy fire 
If the latest fire input and the current differ in any way it causes firing.
So if you switch dummy after hammerfly was used it causes a weaponfire.
This unwanted fireing caused many unlucky fails for me already.
So i swap the fire status on dummyswapping so the server doesn't see any difference even if hamemrfly was used.
 2018-06-04 11:06:54 +02:00
Jupeyy 887bcb52ff add window event listener for the client 2018-03-21 15:54:51 +01:00
Jupeyy db48a03898 add text buffering for nameplates and killmessages 2018-03-13 21:55:47 +01:00
yangfl 1620fc9b0f Fix typo 2018-02-07 16:10:40 +08:00
def 151da9af97 Remove Emojis 2018-01-25 20:03:18 +01:00
bors[bot] 5528cde5f6 Merge #869 
869: Complete rework of the ghost and race recorder r=Learath2 a=Redix

This PR fixes a lot of issues with the ghost and race recorder, introduces a new ghost file format and implements some pretty useful features.

**A quick overview:**
 - When you cross the start line multiple times, both (ghost and recorder) will only restart if it is a non-solo server
 - If available, both will use the race timer to recognize the start instead of searching for the start line
 - Fastcap support for both
 - The recorder immediately starts when the Tee spawns, so the preparation steps (which are quite important for speedruns) will be included in the demo. If you do not cross the start-line within 20 seconds, it will stop the demo until you really start.
 - Better ghost menu (colors, reloading, deleting and saving ghosts)
 - The ghosts are more resistant against lags (old ones were sometimes completely useless due to small lags)
 - New ghosts files are significantly smaller
 - Cleanup, bugfixes..


**About the new ghost format (version 4/5):**
This format is used by Teerace for over a year now. The code for handling the binary files was moved to the engine. It includes an auto updater which creates a backup of all ghosts and converts them to the new format afterwards. The major differences from the format used by DDNet right now (version 2), are the ability to store multiple types of data, the usage of delta-encoding and a more portable header.

For whatever reason, the ghost stores values for every predicted tick, but without tick information, so lost snapshots can make them unusable. The new code uses the original values from the snapshots including ticks but it can also handle the old ones without. Since hardly any server uses the high bandwidth option this practically reduces the file size.

Like the demo recorder the ghost recorder directly stores the data to a file (every 50 snapshots) instead of writing the whole file at the end of the race. Indeed this can be changed with only a few lines if the old behavior is preferred.

The updater can handle version 2 (DDNet) and 3 (old teerace format, only slightly different from version 2) files. The updating already happens when the files are scanned for generating the list in the menu and not only when you activate them. The change from version 4 to 5 was only needed due to a bug in the implementation, the ghost loader can read both.

Some numbers about the file size: (map: hotrun, both about 30 seconds)

 - Old ghost: 30.4 kB (converted: 10.7 kB)
 - New ghost: 5.4 kB


**One thing about the race recorder:**
The old implementation compared the new file only with the first file it found for the particular map. The new one compares with all related demos and deletes them possibly, so that only the best demo is left. Since DDNet can also store the demos without name, this might also delete demos from other players, that you might have in your directory.
To prevent this I at least check whether the demo contains the player name if `cl_demo_name` is on. 
In my opinion the better solution would be to remove `cl_demo_name` and always use the player name.
 2017-10-30 20:27:10 +00:00
Redix de1c0cf24d Fixed several issues with the ghost (thanks to Learath2) 2017-10-28 14:23:24 +02:00
Michał 35fb1ddb41 Add emoji support 2017-10-28 09:08:17 +02:00
Redix 134a79a225 Move RaceHelper to src/game/client 2017-10-06 22:13:35 +02:00
Redix d4509111d5 Clean up ghost and race recorder 2017-10-06 22:01:33 +02:00
Redix 1efa8023ea Use race timer for ghosts if available 2017-09-28 16:02:00 +02:00
Redix d09e825065 Use existing code for rendering the ghost 2017-09-28 16:01:58 +02:00
Redix 5cc0d16029 Reworked the race recorder 2017-09-28 16:01:57 +02:00
Redix 9e52957423 Only restart ghost and race demo on non-solo servers when crossing the start line again 2017-09-28 16:01:57 +02:00
Redix 1c377ed00f Added Fastcap support for ghost and race demo 2017-09-28 16:01:57 +02:00
Redix 4f57b33524 Use static array for active ghosts 
Improve ghost file handling
 2017-09-28 16:01:56 +02:00
heinrich5991 4d96090770 Fix MSVS warnings 
```
warning C4291: no matching operator delete found; memory will not be freed if initialization throws an exception
warning C4305: truncation from 'double' to 'float'
warning C4805: unsafe mix of type 'bool' and type 'int' in operation
```
 2017-09-06 10:54:29 +02:00
heinrich5991 1ebb4f89a6 Reopen: Add a flag for rcon login via username (#800) 
This uses an extended protocol message to signal that rcon
authentication might require a username, allowing the client to enable
the username prompt.

Add a forgotten logout on key update
 2017-07-24 21:43:55 +02:00
def e4b3c17829 Add option to disable long pain sound (used when shooting in freeze) 2017-06-06 18:58:23 +02:00
eeeee 2797227063 also remove references to CGameContext from CServer 2017-06-05 22:31:56 -07:00
def 4125941896 Disable dbg_stress in release builds (fewer confused kids that think they hacked the server, less useless code in cache) 2017-06-02 20:45:09 +02:00
necropotame b8e4e5beea Fix style in several places 2017-03-22 19:45:14 +01:00
heinrich5991 e08ca70b1f Fix dummy input reset 2017-03-06 19:45:39 +01:00
Learath2 a87edad978 Move to a cpp file 2017-03-06 14:04:09 +01:00
heinrich5991 e3f2316106 Revert "Revert "Refactor dummy input and demo filtering"" 
This reverts commit 187560c8c0.
 2017-02-28 10:08:14 +01:00
Dennis Felsing 187560c8c0 Revert "Refactor dummy input and demo filtering" 
This reverts commit 8375f4888e.
 2017-02-28 08:15:35 +01:00
Dennis Felsing eb36f421c5 Merge pull request #630 from heinrich5991/pr_ddnet_cmake_basic 
Add overly simple CMakeLists.txt
 2017-02-27 16:28:19 +01:00
heinrich5991 8375f4888e Refactor dummy input and demo filtering 
Remove references to src/game/ from src/engine/
 2017-02-23 14:13:14 +01:00
Redix abcb074dcc Fixed statboard 
- FPM value
- reset when a player leaves
 2017-02-15 16:43:45 +01:00
d3fault d6b732113e dummy copyMoves/hammer disabling when dummy connecting 2016-10-26 15:00:02 -07:00
heinrich5991 f49d60945d Don't show player HUD during /pause 2016-09-20 16:34:49 +02:00
BannZay d78c565f8a dCopyMoves disabling when Dummy disconnecting 2016-08-21 16:22:46 +03:00
H-M-H e351080dd3 removed double semicolons 2016-05-04 00:24:54 +02:00
def 4761608329 Input fixes from TW master for mouse wheel 2016-04-30 20:11:26 +02:00
def 11e3fd55db seperated ingame input handling from rendering (from TW master) 2016-04-29 23:05:20 +02:00
def 67bff95a72 Merge remote-tracking branch 'timakro/new_hookthrough' 2016-04-27 18:59:51 +02:00
def 8fdeb9df58 Don't use antiping when spectating 2016-04-17 18:36:33 +02:00
Tom ff1c6705d6 fix compile warning 2016-03-03 23:40:19 +08:00
Tom 26a1a9f331 replace strstr to str_find 2016-02-13 18:51:21 +08:00
Tom 96510284e3 Add font support for chinese, japanese, korean. 
Added some character to DejaVuSans Font, so Language List can show CJK names.
Modify code to let ddnet choose DejavuWenQuanYiMicroHei when user choose CJK language, this font is merge from Dejavu and WenQuanYiMicroHei.
 2016-02-06 00:13:57 +08:00
H-M-H 8e24ef8020 commanddescription can now be placed directly in 
the commandparamsstring: "s[file]"
 2015-12-28 16:19:52 +01:00
H-M-H 11a426c18b added (console-)command usage 2015-12-23 14:29:31 +01:00
Nikita Zyuzin e63e9eed54 Replace diff > 2 with != in RoundStartTick comparison 2015-11-13 14:40:02 +04:00
Nikita Zyuzin d7f2fc95e7 Reset statboard after a game restart 
Fixes #335
 2015-11-12 13:06:05 +04:00
H-M-H f0d10ac62d better get dummyinput directly from CControls 2015-11-10 20:29:12 +01:00
timgame dc89301292 clean up intersect line code 2015-11-08 10:20:44 +01:00
heinrich5991 ba4eab1f1c Don't reset antiping subconfiguration on startup 2015-09-10 12:09:38 +01:00
Chairn 70a2cfa4ea Added custom background in entities. 2015-08-27 00:52:31 +02:00
Nikita Zyuzin 0b9e2f144c Add prefix Cl to dummy and player variables 2015-08-07 00:16:33 +04:00
def 791e260e65 Fix spectating in demo viewer and add a button to choose to follow a player 2015-07-26 18:21:51 +02:00
def e97c8ac08f Add foes (permanently ignored players) 2015-07-22 22:16:49 +02:00
def 1af5507b95 Allow spectating other players and freeview in demo player (especially fun with /showall and /showothers on) 2015-07-22 21:32:02 +02:00
east 458e83e794 Further revert of auto demo recorder (fixes continuous recording on TILE_BEGIN) 2015-06-17 12:54:41 +02:00
east 45748f35e3 Revert: Changes on auto demo recorder 2015-06-16 22:35:21 +02:00
def 8f4e8a871d Make autorecorder work with race again 2015-06-16 22:00:42 +02:00
Nikita Zyuzin 897af546cb Fix bug with constant demo autorecording. Fixes #213 
It's relevant for states in which new RoundStartTick is sent each second tick
 2015-06-14 14:39:42 +04:00
Nikita Zyuzin 7bb0c1cfbf Fix bug with continuous demo recording restart in TILE_BEGIN 2015-06-12 15:15:23 +04:00
Nikita Zyuzin d40d7f8d03 Remove unused stats 2015-05-21 16:22:42 +04:00
Nikita Zyuzin 82fdf7a5de Fix tabulation 2015-05-21 16:17:10 +04:00
Nikita Zyuzin e3413e59cc Fix bug with OnStartGame not called after game is over 2015-05-21 16:09:23 +04:00
Nikita Zyuzin ab2f87ace4 Don't call OnStartGame after pause 2015-05-21 15:11:53 +04:00
Nikita Zyuzin 3e3daf46bd Don't reset stats when player goes spectator 2015-05-21 14:32:17 +04:00
Nikita Zyuzin d8d20b0c1a Rename detailed_stats to statboard 2015-05-21 13:41:59 +04:00
Nikita Zyuzin 42759e8909 Fix restart on new round and grabs count 2015-05-21 00:23:58 +04:00
Nikita Zyuzin 245ebccd7b Add initial detailed stats board code 2015-05-20 02:51:02 +04:00
def 9dc63ed429 Clean up a bit 2015-05-04 17:53:07 +02:00
nuborn 0a07787f37 improve prediction of collision between players 2015-05-03 16:15:45 +02:00
def 9c1e65a1f5 Clean up a bit and hopefully fix player move on dummy connect 2015-04-19 14:06:31 +02:00
timgame c4f011dd9d resend player/dummy info that filtered the server 2015-04-19 13:17:51 +02:00
def a77cd039a6 Get rid of all Clang warnings 2015-04-18 22:29:28 +02:00
def 710a786f88 Rename AutoUpdater to Updater because you have to press a button now 2015-04-18 21:17:27 +02:00
def 8cbd41abfe Revert "Reduce client load by only searching for new skin when it changed" 
This reverts commit 7c503c3197.
 2015-03-14 12:30:17 +01:00
def 7c503c3197 Reduce client load by only searching for new skin when it changed 2015-03-13 15:42:09 +01:00
def f893ed6ec4 Fix and clean up autoupdater 2015-03-13 15:14:00 +01:00
Learath Lea 233ce262ac Add Autoupdate. 2015-02-23 20:23:56 +02:00
Learath 09ce649238 First get rid of the old autoupdate 
Conflicts:
	src/engine/client/client.cpp
	src/engine/client/client.h

Conflicts:
	src/engine/shared/config_variables.h
 2015-02-23 20:23:35 +02:00
def 7f54f8e10e Kill for both with cl_dummy_copy_moves 2015-02-18 14:23:25 +01:00
nuborn 92c9646060 detect and predict weak/strong hook 2015-01-19 22:14:50 +01:00
def ce13aa6809 Fix: Not jetpack prediction on DDNet incompatible servers 2015-01-19 22:14:48 +01:00
def 79aeb5ea38 Add hook duration tune 2014-12-27 12:05:02 +01:00
def 8b108a2311 Clean up gametype determination 2014-12-10 03:39:15 +01:00
def eb12370db0 Rename cl_antiping to cl_antiping_players and add cl_antiping metasetting 2014-12-08 13:49:39 +01:00
nuborn bb9c699f35 use consistent values for prediction 2014-12-01 18:34:16 +01:00
nuborn 03bc769c09 prediction of hammer (hits) and grenade (explosions) 2014-12-01 01:31:58 +01:00
def 627d6386ee Revert "Revert "Revert "Add antiping for weapons (by nuborn)""" 
This reverts commit 8f7e24b4db.
 2014-11-02 10:59:22 +01:00
def d3797289c1 Revert "improve antiping for weapons (particularly in vanilla) by taking into account more of the info already available to the client" 
This reverts commit 56036dcd7b.
 2014-11-02 10:58:21 +01:00
def 997e1edc0d Revert "also predict explosions from crazy shotgun" 
This reverts commit 1d21a552e8.
 2014-11-02 10:58:15 +01:00
nuborn 1d21a552e8 also predict explosions from crazy shotgun 2014-10-28 21:30:51 +01:00
nuborn 56036dcd7b improve antiping for weapons (particularly in vanilla) by taking into account more of the info already available to the client 2014-10-28 21:13:55 +01:00
nuborn 8f7e24b4db Revert "Revert "Add antiping for weapons (by nuborn)"" 
This reverts commit 755e9f4d1c.
 2014-10-28 15:50:28 +01:00
def 755e9f4d1c Revert "Add antiping for weapons (by nuborn)" 
This reverts commit 48e66a2ab3.

Conflicts:
	src/game/client/gameclient.cpp
	src/game/version.h
 2014-10-27 20:03:22 +01:00
def 35f8b7a6dd Add option for disabling gun sounds 2014-10-26 01:00:30 +02:00
def 8d230306d8 Fix sound enabling and disabling (fixes #82) 2014-10-25 02:52:08 +02:00
def 1523954333 check that index in within array bounds + only predict grenade projectiles (by nuborn) 2014-10-25 01:08:14 +02:00
def 4403a2df62 Minor cleanup 2014-10-23 17:40:10 +02:00
def 033ca57331 Oops 2014-10-23 17:39:29 +02:00
def 48e66a2ab3 Add antiping for weapons (by nuborn) 2014-10-23 17:31:29 +02:00
BeaR 39f93716e0 Support replaying mapsounds 2014-10-18 18:41:52 +02:00
def 1144ba77c6 Split up demo recording into 3 separate recorders 2014-10-16 17:42:13 +02:00
def c54cf2e7ba Cleanup 2014-09-26 02:41:25 +02:00
def 89b92b4d6b Cleanup 2014-09-23 09:52:18 +02:00
def 4133e642f8 Remove Damage Indications when entering game (fixes #29) 2014-09-03 14:17:44 +02:00
def 0916d8aba5 Fix timeout code stuff 2014-08-17 19:19:40 +02:00
def c97a412913 Timeout code for dummy, timeout code working on solo servers 2014-08-17 19:10:08 +02:00
def c493ef4408 imports 2014-08-13 13:00:18 +02:00
def 83cb1cdaea Initialize random number earlier 2014-08-13 12:58:53 +02:00
def 8640f422d7 Missing include 2014-08-10 13:00:45 +02:00
def f42b9d6904 Fix timeout code on Windows 2014-08-10 12:54:01 +02:00
def ee6fcdf876 Automatic timeout protect message in client 2014-08-09 19:17:21 +02:00
def 85b7475ae4 remove debug output 2014-08-09 18:13:21 +02:00
def 4af575654b Kind of working 2014-08-09 14:50:51 +02:00
def 5b72add865 Case sensitive player sort 2014-07-27 11:41:31 +02:00
def bbe597ef04 Add cl_dummy_resetonswitch 2014-07-08 01:41:45 +02:00
def 11b439ba51 Fix 64 player on other servers 2014-06-22 15:30:15 +02:00
def f2d6ceaf66 Add an exception for DDWar server, where we don't want to see all players 2014-06-17 11:34:07 +02:00
def 7875c2ec36 Android support (by Pelya) 2014-06-16 13:29:18 +02:00
def af12bd92ec Bring back old cl_showothers 2014-05-25 00:59:52 +02:00
def 6bcdb4fdb8 Some more dummy stuff, might fix sound 2014-05-23 23:59:26 +02:00
def b2f5a1b96e Fix showothers 2014-05-18 01:35:15 +02:00
def e85d594f81 Other teams alpha settable 2014-05-17 23:00:52 +02:00
def 73103df309 Make autoupdater only run when ddnet servers can be reached 2014-05-17 15:42:32 +02:00
def 42811dc896 Autoupdater asks for permission to update + Autoupdater fixes 2014-05-17 14:28:50 +02:00
def 9ae6ce7097 Fix: You still receive whispers and team messages for dummy 2014-05-07 03:34:21 +02:00
HMH addfe47d4c fix correct dummy-tunings now 2014-05-03 02:44:28 +02:00
def b3e9041768 Revert "Same hook strength for everyone (by cinaera)" 
This reverts commit 2b08464527.
 2014-05-01 03:03:31 +02:00
def 2b08464527 Same hook strength for everyone (by cinaera) 2014-04-30 17:36:25 +02:00
def c0e162e085 Fix: Correct tunings with dummies 2014-04-30 16:02:28 +02:00
def 5eb7a74558 Fix: Tunings and Tunezones with dummies 2014-04-29 03:34:23 +02:00
def 4782d34667 Some more dummy fixes 2014-04-28 16:47:44 +02:00
def 474d307a9a Fix: Only allow changing dummy when dummy is connected 2014-04-28 15:34:56 +02:00
def 9f509eeedb Fix: Dummy setting updates 2014-04-28 15:19:57 +02:00
def 8f4452c118 More Mac compile fixes 2014-04-28 00:45:45 +02:00
def d63f44e316 Make compile on Mac 2014-04-28 00:41:19 +02:00
def 215e5dbcab Disable autoupdate on Mac 2014-04-28 00:23:04 +02:00
def 5f60491002 Minor fixes 2014-04-28 00:13:15 +02:00
def 3bbc2c4ef7 Fix dummy issues 2014-04-27 13:44:04 +02:00
def 7bcc51d488 Basic updating (thanks to unsigned char* 2014-04-27 05:01:03 +02:00
def 9d123cb95f Fix: Work for pure vanilla servers 2014-04-15 21:22:12 +02:00
def 68980e7699 Fix: Ok, proper Jetpack prediction now 2014-04-14 10:56:14 +02:00
def 7ae973af0d Make jetpack strength a tuning 2014-04-12 11:12:29 +02:00
def 3e63993333 Fix: hook collision line of other players works on yourself when you're paused 2014-04-10 20:33:26 +02:00
def a4580c4af0 Add speedup prediction (by c) 2014-03-25 01:13:46 +01:00
def ba4d8d153e Proper client version numbers 2014-02-19 22:29:46 +01:00
def 92e0b5fe3c Add fake tunings so that freeze prediction is correct (by HMH) 2014-02-19 21:55:37 +01:00
def 17102bdf09 Still have to keep crashmeplx 2014-02-13 19:53:30 +01:00
def dd17150160 Remove old code so that we work on 128p player servers 2014-02-13 04:39:29 +01:00
def 67ede77105 fix 2014-02-08 23:46:55 +01:00
def 50d3e03c16 Fix teams in client 2014-02-08 23:41:12 +01:00
def f1661fc6b4 Sorted scoreboard and spectator view 2014-02-08 22:24:57 +01:00
def bf658945a5 Fix some +showhookcoll 2014-02-08 21:55:08 +01:00
def b21dc83b1a Compatibility for old servers 2014-01-30 17:15:54 +01:00
def d8533eea67 Proper Client Version numbers and more visible whispers 2014-01-30 16:49:15 +01:00
def e97d3ba788 Fix: +showhookcoll fixes 2014-01-30 04:10:52 +01:00
def fea96c411a Properly show SUPER team in Scoreboard 2014-01-28 19:52:46 +01:00
def 9ff38a940b Allow +showhookcoll on yourself 2014-01-27 05:16:07 +01:00
def 3e5bcb0213 Absolutely perfect +showhookcoll 2014-01-27 05:06:23 +01:00
def c7cc656f1a Remove useless code 2014-01-24 22:10:14 +01:00
def 25f69ecdeb Display teams in scoreboard 2014-01-22 01:39:18 +01:00
def f0d79b8388 Trying to get better team support 2014-01-22 00:08:30 +01:00
def fe7f274023 Fix: Proper super on DDRace 16 player servers 2014-01-21 18:21:01 +01:00
def 693d68841c More exact showhookcoll 2014-01-12 00:45:25 +01:00
def 0f251a435b Revert "Remove useless code" 
This reverts commit 3e28e52d8d.
 2014-01-02 01:14:20 +01:00
def 3e28e52d8d Remove useless code 2014-01-01 15:44:49 +01:00
def 3607218f12 Merge ddrace64 from eeeeee 2013-12-31 06:13:57 +01:00
def 3eaad43b6b Merge remote-tracking branch 'upstream-teeworlds/0.6' into DDRace 
Conflicts:
	bam.lua
	data/languages/index.txt
	src/engine/server/server.cpp
	src/engine/shared/network_server.cpp
	src/game/client/components/chat.cpp
	src/game/client/components/menus_settings.cpp
	src/game/server/entities/character.cpp
	src/game/server/gamecontext.cpp
	src/game/version.h
 2013-12-26 18:02:22 +01:00
def ad724453ad Better fix for slow Map loading 2013-12-20 12:27:10 +01:00
def 06fed6e596 Disable Tilemap Skip Generation (Makes map loading 30 times faster) 2013-12-20 03:33:50 +01:00
def 2a70aefc63 Show correct nameplates without antiping 2013-10-09 16:23:18 +02:00
def dc6d2305d5 Add AntiPing 2013-10-09 16:02:23 +02:00
def 9028d77471 Add +showhookcoll from H-Client 2013-08-24 01:50:35 +02:00
def 85b5277bb5 Reset zoom when player joins team 2013-07-11 17:25:51 +02:00
oy 32c8dd6cf5 increased time for client info resend to prevent possible overlap 2013-02-24 17:28:39 +01:00
oy 5de2763f82 skip auto screenshot when the editor is active. #931 2013-02-24 17:27:44 +01:00
BeaR 6d74d52c22 Fix problem with show other players: (Closes DDRace/teeworlds#210) 
sending packet on setting change
 2013-02-03 20:23:44 +02:00
GreYFoX cd4ba53bae Merge branch 'master' of git://github.com/teeworlds/teeworlds into DDRace 
Conflicts:
	bam.lua
	scripts/build.py
	scripts/make_release.py
	src/engine/server.h
	src/game/client/gameclient.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontext.h
	src/game/server/gamecontroller.cpp
	src/game/server/gamecontroller.h
	src/game/server/player.cpp
	src/game/version.h
 2012-04-12 02:09:31 +02:00
oy d17ee055a2 fixed an issue about resending player info 2012-01-29 12:44:33 +01:00
oy 4fde2cf7f2 add tuning to demo. Closes #899 2012-01-09 00:49:20 +01:00
oy b592d7a591 cleaned up playing of global sounds 2012-01-06 19:38:40 +01:00
GreYFoX c46f3e06e7 Merge branch 'master' of git://github.com/oy/teeworlds into DDRace 2012-01-04 20:10:07 +02:00
oy 7328098f8d Merge pull request #912 from matricks/threadedflip 
Threadedflip
 2012-01-03 15:40:30 -08:00
GreYFoX ee670118a5 Merge branch 'master' of git://github.com/oy/teeworlds into DDRace 
Conflicts:
	src/engine/console.h
	src/engine/server/server.cpp
	src/engine/server/server.h
	src/engine/shared/config.h
	src/engine/shared/console.cpp
	src/engine/shared/console.h
	src/engine/shared/network_server.cpp
@heinrich5991 todo
 2012-01-01 00:11:56 +02:00
Magnus Auvinen b31abc4053 fixed so that you can select graphics backend via gfx_threaded 2011-12-31 10:29:25 +01:00
BeaR afb1d5e201 Swap and Shuffle Teams 2011-12-30 21:52:01 +01:00
GreYFoX 1446d0980b Merge branch 'master' of git://github.com/oy/teeworlds into DDRace 
* Version 1.098a
Conflicts:
	bam.lua
	src/game/client/gameclient.h
	src/game/mapitems.h
 2011-12-05 11:32:01 +02:00
oy b99ac459be fixed envelope rendering when seeking in the demo player 2011-12-04 14:04:12 +01:00
GreYFoX ff696bad6c Mac Loves Cyclic Includes 2011-08-31 13:56:04 +02:00
GreYFoX 5b27758650 Removed level stuff 
Removed client ID stuff
Removed console stuff
Resolved merge conflicts
Upgraded Banmaster
Cleaned up
 2011-08-13 02:11:06 +02:00
GreYFoX 35d16bd58c Merge branch 'master' of git://github.com/oy/teeworlds into DDRace0611 
Conflicts:
	src/engine/console.h
	src/engine/server.h
	src/engine/server/server.cpp
	src/engine/shared/config_variables.h
	src/engine/shared/console.cpp
	src/engine/shared/console.h
	src/engine/shared/network_server.cpp
	src/game/client/components/console.cpp
	src/game/client/components/console.h
	src/game/client/components/menus_browser.cpp
	src/game/client/gameclient.cpp
	src/game/editor/editor.cpp
	src/game/editor/editor.h
	src/game/editor/io.cpp
	src/game/editor/layer_tiles.cpp
	src/game/editor/popups.cpp
	src/game/gamecore.cpp
	src/game/mapitems.h
	src/game/server/entities/character.cpp
	src/game/server/entities/laser.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontroller.cpp
	src/game/server/gamecontroller.h
	src/game/server/gamemodes/ctf.cpp
	src/game/server/player.cpp
	src/game/variables.h
 2011-08-13 02:01:40 +02:00
oy 2b2ddde04f sort players in kick/move to spec vote and player options by team. Closes #809 2011-08-05 19:52:38 +02:00
oy e18390fea8 fixed that client resets tuning. Closes #746 2011-07-05 23:32:32 +02:00
oy ac9c3b8f7f made the dropped flag sign blink faster the last 5 seconds to indicate that it's about to return. Closes #631 2011-07-05 23:15:24 +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
Johannes Loher 14f98a9ded Added possibility to deny changing of team after a set_team for a certain amount of time. Added server setting to do this automatically for spec votes. fixes #640. 2011-06-27 17:07:23 +02:00
GreYFoX bee10fda8f Merge branch 'master' of git://github.com/oy/teeworlds 
Conflicts:
	src/game/server/gamecontext.cpp
 2011-06-02 19:13:40 +02:00
Choupom deff0ce7c4 fixed netevent struct names 2011-06-02 17:40:08 +02:00
GreYFoX dad66bffc3 General DDRace binds improvements 2011-04-17 19:45:48 +02:00