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

742 commits

Author SHA1 Message Date
heinrich5991 a7857d58c4 Remove now-useless function in CGameClient 
(incorporate @fokkonaut's feedback)
 2019-06-14 00:28:59 +02:00
heinrich5991 2b7f3587c4 Only accept DDRace record message on DDRace servers 2019-06-14 00:28:59 +02:00
heinrich5991 f31e081bd4 Remove all checking for the gametype in the game 
OK, maybe not actually remove because it is kept for fallback when the
new method isn't available.

The whole gametype parsing business had the same downsides as user agent
parsing on the web, hence I removed it while keeping behavior the same.

This allows servers to explicitly opt in or out of certain bug
workarounds and other client behavior. This increases the complexity of
different configurations that are available in the client (which is a
bad thing).
 2019-06-14 00:28:59 +02:00
Dennis Felsing 0d9952b32a
Merge pull request #1748 from archimede67/pr_replays 
Replay system (demo after-the-fact)
 2019-06-11 18:13:26 +02:00
Dennis Felsing bbb1b2cdef
Merge pull request #1733 from Learath2/dd_pr_colorsigned 
Store colors unsigned
 2019-06-11 12:26:28 +02:00
Ryozuki c089cffdde
fix hook col and make it green on tees 2019-06-09 19:26:20 +02:00
archimede67 929bf57bf6 infinite length and a lot of changes including notifications are now chat messages 2019-06-05 19:17:55 +02:00
heinrich5991 756aab339b Remove item invalidation logging for unknown UUIDs 
This caused lags due to too much output during gameplay, demo playback
and demo cutting.

Fixes #1643.
 2019-06-04 00:05:28 +02:00
Dennis Felsing e8362f1727
Merge pull request #1736 from sirius1242/master 
Recorded the time of the player's game after the client was opened and show it on the top.
 2019-06-03 11:02:28 +02:00
Learath2 c98978c9d6 Implement timescore using a netobj 2019-05-21 10:26:33 +02:00
Learath c2a774275f Move AuthInfo into DDNetPlayer 2019-05-21 10:25:15 +02:00
Learath 23255a04b3 Remove time-score 2019-05-21 10:24:07 +02:00
sirius 8819f21d3a played time can show now 2019-05-17 21:47:12 +08:00
Learath 0d39eb128d Use unsigned integers for colors 2019-05-15 18:05:19 +02:00
Dennis Felsing 0f65d02d1d
Merge pull request #1727 from trml/pr_pred_fixes_2 
A few more prediction fixes
 2019-05-13 07:29:04 +02:00
trml a885c64f4f Fix ninjajetpack prediction 2019-05-13 01:46:50 +02:00
trml bde2de2267 Improve weapon prediction on fastcap and vanilla 2019-05-13 01:46:35 +02:00
12pm a6a33bfaa5 Restore old team colors 2019-05-11 18:04:32 +02:00
Andrew 0fffd7705f Cl_text_entities_size (#1632) 
* new command added

* fix code duplication after merge

* merge #1632 suggestions

* align the texture to the center vertically

* refactor

* fix RenderSwitchOverlay

* Update src/engine/client/text.cpp

Co-Authored-By: BannZay <bannzay3@gmail.com>

* Apply suggestions from code review

Co-Authored-By: BannZay <bannzay3@gmail.com>

* Apply suggestions from code review

* Apply suggestions from code review

Co-Authored-By: BannZay <bannzay3@gmail.com>

* Apply suggestions from code review
 2019-05-06 14:19:10 +02:00
trml 00ab99aa2e Add prediction for weapon switches and gunfire animation 2019-05-05 12:33:26 +02:00
trml b61aae5ab4 Reset predicted character on kill 2019-05-05 12:33:26 +02:00
trml 20c06dfcdf Make speedup and stopper prediction on all gametypes again 2019-05-05 12:33:13 +02:00
trml 8eb4b7fd71 Add setting cl_predict_freeze 2 for having a small amount of misprediction while frozen 2019-05-05 12:32:06 +02:00
Learath b86c457c91 Remember whether a color is lit or not 2019-05-01 23:35:29 +03:00
Learath 5d0a1c8d0a Unlighten colors when sending to server 2019-05-01 22:49:52 +03:00
bors[bot] a2f44299e0 Merge #1678 
1678: Handle colors in console r=def- a=Learath2

DEPENDS: #1654 

A better way to fix #1581 possibly deprecates #1597 

Co-authored-by: Learath <learath2@gmail.com>
 2019-04-30 19:39:56 +00:00
Learath f9ab06476d Lighten tee colors of others 2019-04-30 19:49:53 +03:00
bors[bot] d8964ceedb Merge #1654 #1685 
1654: Try working on colors a bit r=def- a=Learath2

There were color functions everywhere, I tried cleaning it up a little. I still couldn't get the roundtrip from Hsl to Rgb to be exactly the same, but I think this is the best possible.

1685: Work on compound binds r=def- a=Learath2

Closes #1417 

Co-authored-by: Learath <learath2@gmail.com>
 2019-04-29 15:56:16 +00:00
Learath 6a1ef1af62 Can't access a siblings protected members? 2019-04-28 20:34:34 +03:00
Learath 66c89eafb2 Allow binding with modifiers in settings 2019-04-28 20:22:19 +03:00
bors[bot] a5096c4de0 Merge #1663 
1663: Use freeze end tick instead of a flag. Fix #1659 r=def- a=Learath2

I used -1 for deep frozen, and 0 for not frozen. Not really sure if this is the best way.

Co-authored-by: Learath <learath2@gmail.com>
 2019-04-27 08:53:38 +00:00
Learath 929d772071 Collateral 2019-04-26 22:38:18 +03:00
Learath 93d14a1eca Inconvenience for windows 2019-04-26 22:36:49 +03:00
Learath 65a17599e1 Add ColorHSVA, phase out more vec3's 2019-04-26 15:06:32 +03:00
Learath e637064a68 Don't store HSL separately 2019-04-25 19:49:27 +03:00
Learath 95a3a69e08 Start phasing out vectors for colors 2019-04-25 18:21:35 +03:00
Learath cc36af73be Cleanup colors 2019-04-24 23:53:26 +03:00
Ryozuki 502ebc5628 fix all conflicts 2019-04-23 20:45:54 +02:00
Ryozuki 42a5d7a9c1 fix conflicts 2019-04-23 20:42:07 +02:00
Learath 67668d7fb2 Use freeze end tick instead of a flag. Fix #1659 2019-04-23 18:57:26 +03:00
trml 681f30950c Remove the dummy prediction 2019-04-23 02:01:17 +02:00
trml 3d8bd174e7 Add extended data to CCharacter and improve prediction of super/solo/endless/superjump 2019-04-22 00:38:24 +02:00
Ryozuki d6cc94f839
fix hook col a bit 2019-04-21 19:35:07 +02:00
trml 0b3f3b03b5 Rewrite of prediction code, with additional prediction 2019-04-21 16:12:20 +02:00
Ryozuki eaef31d4a0
fix wording and add/fix no col and no hook 2019-04-19 11:59:09 +02:00
Ryozuki 0f3411f8fa
fix wording 2019-04-19 11:46:54 +02:00
Ryozuki f37f8a8268
add all character flags to ddnetnetwork character 2019-04-19 11:17:28 +02:00
Learath d6bfef2cc0 Use a NetObj instead of a system message 2019-04-17 23:47:32 +02:00
Ryozuki c686ceea53
Merge branch 'master' into pr_fix_solo 2019-04-12 16:34:43 +02:00
Ryozuki 3556830b9a
fix solo prediction 2019-04-12 16:29:13 +02:00
Ryozuki 7e43120b6e
make the client aware of other players solo status 2019-04-12 16:16:21 +02:00
bors[bot] 279eeed9fc Merge #1614 
1614: Remove unmaintained Android code (fixes #1575) r=heinrich5991 a=def-

Thoughts?

Co-authored-by: def <dennis@felsin9.de>
 2019-04-11 00:02:17 +00:00
def 2eab795c9e Implement color_to_rgb 2019-04-10 22:45:30 +02:00
def 94f3d97ddf Remove unmaintained Android code (fixes #1575) 2019-04-10 19:40:50 +02:00
def 11127f9344 Release fixes 2019-04-10 17:57:56 +02:00
Dennis Felsing bd4e3716a1 color -> color_from_rgb 2019-04-10 08:58:08 +02:00
def 01ffde25f3 Console command "colors" (fixes #1581) 
Converts RGB colors to TW's HSL format
 2019-04-07 22:54:29 +02:00
Ryozuki 0138dd32e3
apply alpha to solo players 2019-04-07 19:42:26 +02:00
Ryozuki 813c24bf29
add m_IsSolo and fix hook col 2019-04-07 18:58:49 +02:00
Dennis Felsing 138a9c6ff7
Merge pull request #1545 from def-/pr-load-font 
Move out common font loading into method
 2019-03-28 23:38:24 +01:00
def 9e25f4c113 Move out common font loading into method 2019-03-28 21:51:42 +01:00
def 8908102536 Add cl_confirm_disconnect_quit_time (fixes #1530) 
Number of minutes of active racing time before being asked to confirm
disconnecting, disconnecting dummy or quitting through GUI. Defaults to
20 minutes, -1 to disable, 0 to always enable.

Also removed confirmation to quit when in main menu, except when having
an unsaved map in editor.

Spectate and kill should already be safe thanks to server-side kill
protection.
 2019-03-25 20:10:38 +01:00
def 9ea9a43f13 Reset authed level in client 
As reported by jao on Discord:

22:26 <jao> @Learath2 client auth level needs to reset on server join or something
22:28 <jao> because other servers don't send it
 2019-03-19 22:29:41 +01:00
Learath 548e9969b2 Add colors for authed players. Deprecates #1299 2019-03-02 13:50:33 +03:00
fokkonaut fe4426b008 fixed ddrace score (time score) 2019-01-14 08:01:20 +01:00
fokkonaut 0e842359ad Add DDRace Score NETMSG 2019-01-14 08:01:20 +01:00
def bad0d53906 Move timing code to actual end of function 2018-12-23 22:58:37 +01:00
Dennis Felsing 0ad472df41 Make cort comparator conform to strict weak ordering 
comp(p1, p2) == false was violated when both are nullptr
https://en.cppreference.com/w/cpp/named_req/Compare
 2018-12-06 07:57:01 +01:00
def 6ad686eee2 Fix HUD (thanks to fokkonaut for reporting) 2018-11-24 22:57:15 +01:00
def 27865fdd89 Fix Race scoreboard ordering for times > 166 minutes (9999 seconds) 2018-11-21 21:26:05 +01:00
Ryozuki 09c82fba7a indent 2018-10-03 07:40:50 +02:00
Ryozuki 5c51e3b80d change to c style casts 2018-10-02 20:52:21 +02:00
Ryozuki be3cfe88e6 fix 2018-10-02 20:45:44 +02:00
Ryozuki 0a91fef8c8 fix tabs 2018-10-02 14:36:55 +02:00
Ryozuki e21a08f700 another improvement 2018-10-02 14:35:50 +02:00
Ryozuki 7efe2b436e code improvement on gameclient.cpp 2018-10-02 14:32:59 +02:00
Dennis Felsing 13aa154d47 Revert "Rewrite stopper code a bit" 
This reverts commit 4ee5c5a781.
 2018-08-24 09:34:54 +02:00
Dennis Felsing d60b0db632 Revert "Add mapbug "stoppers-passthrough@ddnet.tw"" 
This reverts commit 25e86851d3.
 2018-08-22 08:33:21 +02:00
heinrich5991 25e86851d3 Add mapbug "stoppers-passthrough@ddnet.tw" 
This can be set for maps that rely on actually passing through stoppers.
 2018-08-16 17:54:55 +02:00
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
GreYFoX 0df6d0541f Merge branch 'master' of git://github.com/oy/teeworlds into HEAD 
Conflicts:
	bam.lua
	src/engine/console.h
	src/engine/server.h
	src/engine/server/server.cpp
	src/engine/shared/config.h
	src/engine/shared/config_variables.h
	src/engine/shared/console.cpp
	src/engine/shared/console.h
	src/game/client/components/binds.cpp
	src/game/client/components/chat.h
	src/game/client/components/console.cpp
	src/game/client/components/console.h
	src/game/client/components/controls.cpp
	src/game/client/components/emoticon.h
	src/game/client/components/maplayers.cpp
	src/game/client/components/menus.h
	src/game/client/components/scoreboard.h
	src/game/client/components/spectator.h
	src/game/client/components/voting.h
	src/game/client/gameclient.cpp
	src/game/client/gameclient.h
	src/game/client/render.h
	src/game/collision.cpp
	src/game/editor/ed_layer_tiles.cpp
	src/game/gamecore.cpp
	src/game/gamecore.h
	src/game/layers.cpp
	src/game/layers.h
	src/game/mapitems.h
	src/game/server/entities/character.cpp
	src/game/server/entities/laser.cpp
	src/game/server/entities/laser.h
	src/game/server/entities/pickup.cpp
	src/game/server/entities/pickup.h
	src/game/server/entities/projectile.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontroller.cpp
	src/game/server/gamecontroller.h
	src/game/server/gameworld.cpp
	src/game/server/gameworld.h
	src/game/server/player.cpp
	src/game/variables.h
 2011-04-14 01:27:49 +02:00
heinrich5991 c83c7b1a19 reworked IConsole::PrintResponse to IResult::Print (and obviously CConsole::PrintResponse to CResult::Print) 2011-04-14 00:34:10 +02:00
oy 06115dd49d added "Whitespace and line Endings cleanup" by GreYFoX 2011-04-13 20:37:12 +02:00
oy 1a5d70450f added "reimplemented menu music by teetow-the-great-teetow" by Choupom 2011-04-13 20:00:54 +02:00
Shereef Marzouk 0354625f9b fixed Mac compilation 2011-04-10 00:05:34 +02:00
GreYFoX f7f6058a92 Merged Oy, Cleaned up, removed some useless features and code parts 
Added Icon by landil
alot more...
 2011-04-09 22:32:17 +02:00
Choupom 733f0b3390 reimplemented extra projectiles 2011-04-03 22:57:03 +02:00
oy ab810cab25 fixed that player options just show players as friends not clans 2011-04-02 19:51:05 +02:00
oy d4f2b8de87 fixed skin colour of spectators 2011-03-27 11:52:16 +02:00
oy 6ece07ee74 added force_vote command 2011-03-25 12:06:45 +01:00
oy 359b806e95 added remove_vote command. Closes #47 2011-03-25 11:49:35 +01:00
oy 8ad3def65e added aliases for votes. Closes #144 2011-03-25 09:49:21 +01:00
oy ae325c873f added friends feature. Closes #24 2011-03-23 13:06:35 +01:00
oy b64db75a6b added an option to ignore other players in chat 2011-03-22 22:41:27 +01:00
Sebastian Wojtowicz 55ce870597 Client utf8 converting (servernames,playernames) in Internet tab and (playernames,playermessage) in chat and hud 2011-03-22 21:11:10 +02:00
oy eaef2ce48a added notification for unsaved map data and a confirmation for overwriting an existing map in the editor. Closes #115 2011-03-22 00:31:42 +01:00
oy 2547bfa4fc linked console commands player_clan and player_country to the client's info update 2011-03-20 11:17:51 +01:00
oy 79aa9d640e fixed that server browser shows the correct country flag 2011-03-20 11:15:24 +01:00
GreYFoX 0cbcdd027a Removed Helper made Moderators able to moderate only 
Enumerated levels
http://ddrace.info/forum/showthread.php?t=528
or modify the server and change the game type to something other than DDRace thank you
 2011-03-16 16:27:30 +02:00
GreYFoX 3059199505 Fixed a crash 2011-03-16 13:59:36 +02:00
oy 156e23b592 added loading/support for country flags to the client 2011-03-16 12:09:22 +01:00
oy 30d9c9f4d9 made network support clan name and country code for players 2011-03-15 11:23:49 +01:00
oy b834426548 fixed several problems with spectator view in game and demo player. Closes #83 2011-03-12 18:07:57 +01:00
oy ee2f625754 added extended spectator mode. Closes #28 2011-03-10 10:08:14 +01:00
oy 9811c2396b made network clip flags. Closes #131 2011-03-04 17:08:10 +01:00
oy 0bc13c91eb made cl_threadsoundloading work again 2011-02-27 17:56:03 +01:00
GreYFoX 90d93ba7b2 Client showothers 2011-02-23 22:22:05 +02:00
Romain Labolle 0209ef4126 The first parameter of set_team is the victim (cf. line 1190) 2011-02-23 08:02:55 +02:00
noother 901859a494 fixed all known bugs in racedemos & ghosts, including "ghost is shown when playing a demo", "ghost doesn't reset when crossing the startline 
again" (this conflicts with racemod however, where the time isn't reset on crossing the start tiles again. This should be removed in
DDRace.), "ghost sometimes doesn't save"  (this was because of kill tiles right next to finish tiles, and it just wasn't quick enough when
going through them fast), "demos contain a lot of garbage before the actual run (prior attempts)" ghosts and racedemos should now work 100%
 2011-02-16 10:39:26 +02:00
GreYFoXGTi 718d697707 Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/game/collision.cpp
	src/game/collision.h
	src/game/gamecore.cpp
	src/game/server/gamecontext.cpp
 2011-02-13 19:36:53 +02:00
GreYFoXGTi f83132448d Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02:00
oy 09cd38d320 cleaned up skin initialisation 2011-02-13 13:58:59 +01:00
GreYFoXGTi 1b2703aaba Refactoring & fixed WEAPONSPEC_GUN in content.py 2011-02-12 21:18:41 +01:00
GreYFoXGTi 24a688b2c3 Added AutoDemoRecord and ghost made by Race mod team, implemented to DDRace by noother 2011-02-04 22:15:02 +02:00
GreYFoXGTi f1a8b6b7ad Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/engine/shared/config.h
	src/engine/shared/config_variables.h
	src/game/client/gameclient.cpp
	src/game/server/entities/character.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontext.h
 2011-01-24 14:06:55 +02:00
heinrich5991 43b67aaa57 added server command to clear the votes. this fixes #47 partially 2011-01-23 17:53:53 +01:00
GreYFoXGTi 2151883b43 Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/game/gamecore.cpp
	src/game/server/entities/character.cpp
	src/game/server/entities/laser.cpp
	src/game/server/entities/pickup.cpp
	src/game/server/entities/projectile.cpp
	src/game/server/entity.h
	src/game/server/gamecontext.cpp
	src/game/server/player.cpp
	src/game/variables.h
 2011-01-20 16:10:32 +02:00
oy da84771345 removed some old checks 2011-01-18 18:53:19 +01:00
oy 216967c3bf release gameclient components when opening the editor. Closes #429 2011-01-17 12:28:37 +01:00
GreYFoXGTi 2ec0e0eec4 Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/engine/shared/console.cpp
	src/game/client/components/hud.cpp
	src/game/client/components/scoreboard.cpp
	src/game/server/entities/character.cpp
	src/game/server/entities/projectile.cpp
 2011-01-12 11:08:17 +02:00
oy b60d6deb51 made m_paInfoByScore within gameclient's snap state work and cleaned up render scoreboard 2011-01-11 23:03:01 +01:00
GreYFoXGTi 959b05d557 Merge branch 'master' of http://github.com/oy/teeworlds 2011-01-10 00:45:58 +02:00
oy 41b8022aa1 record a new demo when a game ends. Closes #358 2011-01-06 23:21:51 +01:00
oy eedaf62d97 fixed that the client crashes if it has no skins 2011-01-06 22:55:57 +01:00
GreYFoXGTi 6889adc0bb Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	.gitignore
	src/game/client/gameclient.cpp
	src/game/editor/ed_editor.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontext.h & Cleaned it up
 2011-01-06 23:32:19 +02:00
oy f8b1edca64 show error message for all content that could not be loaded. Closes #257 2011-01-06 22:18:19 +01:00
oy 1306b62ce2 added command to move all players to a team. Closes #384 2011-01-06 13:37:28 +01:00
GreYFoXGTi 22aa8940a7 Code Style of some files converted from K&R to BSD/Allman 2011-01-06 07:30:19 +02:00
GreYFoXGTi ddc5dd7ab3 Cleaned up & Re-arranged stuff 2011-01-06 05:46:10 +02:00
GreYFoXGTi c5648311ed Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	data/languages/german.txt
	src/game/client/components/scoreboard.cpp
	src/game/editor/ed_layer_tiles.cpp
	src/game/server/entities/character.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontroller.cpp
	src/game/variables.h
 2011-01-04 22:37:09 +02:00
oy a72848e780 added constants for teams by Choupom 2011-01-03 12:50:38 +01:00
GreYFoXGTi 2f5f332cbb Merge branch 'master' into DDRace 
Conflicts:
	src/engine/client/client.cpp
	src/engine/shared/config_variables.h
 2010-12-13 03:43:22 +02:00
oy c75a75b64f made it possible to automatically take game over screenshots. Closes #339 2010-12-12 16:48:13 +01:00
oy 3ea00f61cf removed needless include 2010-12-07 23:51:04 +01:00
GreYFoXGTi ae4aebd365 Merge branch 'master' of http://github.com/oy/teeworlds 2010-11-24 02:28:01 +02:00
oy e6698b1118 apply custom colour to blood colour. Closes #314 2010-11-24 01:11:56 +01:00
GreYFoXGTi 5d9ee1736e made the code so it would have less conflicts in the future and Merged branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	data/languages/dutch.txt
	data/languages/french.txt
	data/languages/german.txt
	data/languages/russian.txt
	src/game/server/entities/flag.cpp
	src/game/server/entities/flag.h
	src/game/server/gamecontext.cpp
	src/game/server/gamemodes/ctf.cpp
	src/game/server/gamemodes/ctf.h
	src/game/server/gamemodes/dm.cpp
	src/game/server/gamemodes/dm.h
	src/game/server/gamemodes/mod.cpp
	src/game/server/gamemodes/tdm.cpp
	src/game/server/gamemodes/tdm.h
 2010-11-22 00:26:00 +02:00
Sworddragon fc9211c777 Updated copyrights 2010-11-20 21:26:06 +01:00
GreYFoXGTi a109e1150d Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/engine/shared/config_variables.h
	src/game/client/components/console.cpp
	src/game/client/gameclient.cpp
	src/game/editor/ed_editor.h
	src/game/server/gamecontext.cpp
 2010-11-18 01:10:59 +02:00
oy 8351682edf added constants for console types by Choupom 2010-11-17 13:01:46 +01:00
oy 994a44f6e1 simplified change_map command so that it switches to the next map in the maprotation when called without param 2010-11-17 12:50:01 +01:00
GreYFoXGTi f16d1a8507 Fixed DemoPlayback 2010-11-04 22:06:12 +02:00
btd 418875b5e5 Add score board time, need to add in server send time for players if someone enter 2010-11-04 19:39:04 +03:00
btd f42adf79ef ... 2010-11-01 00:17:36 +03:00
btd 62ef58329d Return DDRace stuff. No need in mistic compatibility 2010-10-31 23:50:40 +03:00
GreYFoXGTi 8d88f5d541 Partially Revert "Refactoring" to keep DDRace compatible with SushiTee's Stuff 
This partially reverts commit 505a5b4172.
 2010-10-30 20:17:59 +02:00
GreYFoXGTi d6b898c84a Merge branch 'master' of http://github.com/oy/teeworlds 2010-10-30 00:48:17 +02:00
oy 476f951ffc added font that provides more characters. closes #56 2010-10-29 23:44:08 +02:00
GreYFoXGTi 505a5b4172 Refactoring 2010-10-29 23:29:07 +02:00
btd a62decbc91 Show others for ddrace clients. 
Need to fix entities now.

Signed-off-by: btd <bardadymchik@gmail.com>
 2010-10-24 14:47:25 +04:00
btd 61092f7baa Begin show_others 
Signed-off-by: btd <bardadymchik@gmail.com>
 2010-10-23 23:26:10 +04:00