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

579 commits

Author SHA1 Message Date
Dennis Felsing 37256d6e2c Merge pull request #283 from savander/DDRace64 
Improvements for demoplayer (pause/unpause demo is bindable) + you can hide scoreboard after death
 2015-08-13 17:25:57 +02:00
Adam Jaworski 41620b1a36 Con_DemoPlay instead of Con_PlayDemo and demo_play instead of playdemo 2015-08-12 14:26:48 +02:00
def 8f532aad9f Use autoexec_client/server.cfg by default, fall back to autoexec.cfg for both 2015-08-12 13:49:16 +02:00
Adam Jaworski 18fae123ab Playdemo - Check if demo is played 2015-08-12 12:17:19 +02:00
Adam Jaworski 8d4aea8a00 Added: playdemo command to start demo via console, bindable 2015-08-12 11:59:34 +02:00
Nikita Zyuzin 0b9e2f144c Add prefix Cl to dummy and player variables 2015-08-07 00:16:33 +04:00
def e97c8ac08f Add foes (permanently ignored players) 2015-07-22 22:16:49 +02:00
def d815193d86 Merge branch 'DDRace64' of github.com:def-/ddnet into DDRace64 2015-07-22 18:24:09 +02:00
def 4e658c1057 Minor cleanups 2015-07-22 18:23:40 +02:00
east 63cfc09017 make add_demomarker working in all recorders 2015-07-22 15:37:59 +02:00
def 76e4ca1bf6 Sort players in scoreboard by name too 2015-07-10 22:26:55 +02:00
def 6e8ada1ac8 Fix whitespaces a bit 2015-07-09 02:12:35 +02:00
def 7c665a7b97 Add auto-antiping based on ping 2015-06-21 18:00:09 +02:00
east 458e83e794 Further revert of auto demo recorder (fixes continuous recording on TILE_BEGIN) 2015-06-17 12:54:41 +02:00
Nikita Zyuzin 12652985c3 Hide scoreboard if statboard is present 2015-05-21 13:55:51 +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 33c0420edf Don't stop Autoupdater downloads just because they're slow 2015-05-10 01:53:26 +02:00
east 9d50085782 Fix dummy connect on servers without security token protocol 2015-04-19 23:09:55 +02:00
east 93305aef74 Fix dummy connect delay (Fullfill securitytoken handshake) 2015-04-19 19:53:37 +02:00
def 8f02de318b Make dummy connecting a bit nicer: Show that dummy is being connected, disable unusable buttons 2015-04-19 14:40:05 +02:00
def 710a786f88 Rename AutoUpdater to Updater because you have to press a button now 2015-04-18 21:17:27 +02:00
Learath Lea df57a981de Add os_compare_version. Check for WinXP. 2015-04-18 15:53:11 +03:00
def b55bf7ef90 Try to add back WinXP compatibility for autoupdater (untested) 2015-04-18 13:42:56 +02:00
def 04c64a1794 Don't ask to autoupdate if we're on a newer version already 2015-03-15 01:09:34 +01:00
def d835826461 Use proper path for autoupdater on *nix 2015-03-14 20:01:18 +01:00
def ba4f961594 Some more autoupdater changes and a button to check for autoupdates 2015-03-14 10:45:11 +01:00
def f893ed6ec4 Fix and clean up autoupdater 2015-03-13 15:14:00 +01:00
Learath Lea 488db9b4fb Can't autoupdate on OSX and Android. 2015-02-27 23:08:34 +02:00
Learath Lea 0f279a33cb Add restart functionality. 2015-02-23 20:25:03 +02: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
Learath Lea 62a35bfb81 Escape the filenames. 2015-02-12 19:58:54 +02:00
Dennis Felsing 99f2adc29b Merge pull request #139 from Learath2/pr_FixOverflow 
Fix progress bar overflow and Abort segfault
 2015-01-28 18:45:15 +01:00
Learath Lea c4ab42333d Make sure the old object is deleted 2015-01-28 14:17:39 +02:00
Learath Lea ace7e8208a Fix a segfault when aborting a download 2015-01-28 14:13:56 +02:00
def 499adf3cdb HTTP instead of HTTPs 2015-01-27 23:14:04 +01:00
def 3aa4a613b6 Make the option to disable http download work (thanks Learath2) 2015-01-20 00:26:09 +01:00
def 3b0a52319b Typo 2015-01-20 00:21:38 +01:00
Learath Lea c6ee3ebbed Fix for the crc fail fallback. 2015-01-20 00:51:55 +02:00
Learath Lea b8ec5c6e65 Fallback to gameserver if LoadMap fails 2015-01-19 23:34:57 +02:00
def 883cd3d7d3 Adaptation to work with DDNet 2015-01-19 22:19:27 +01:00
Learath 340e79904d Added fetcher interface. 
Make fetcher client only and move Task class from interface.

Fix queue logic, add destructor.
LEAN_AND_MEAN moved up to prevent curl including the whole winapi

Remove JobNo, Fix callback, Cleanup debug messages.

Fix include guard

Copy the Url and Destination. Delete pTask.

Fix typo

Add Completion callback

Let the user pass context

Add virtual to inherited funcs

Use 0 instead of NULL

Give fetcher the ability to create folders. Fix couple of small bugs.

Added .lib files for MSVC.

Leave user the allocation of CFetchTask. Get rid of unnecessary cb
arguments.

Get the HTTP return code from libcurl.

Incorperate the storage system.

Fail on HTTP error >= 400.

Add more info to the task.

Add blocking way of getting HTTP resp code.
Remove resp code from normal tasks as we fail >= 400 anyways.

Sleep instead of killing the thread

Forgot one instance of respcode.

Provide HTTP download for maps.

Dont check 404 first.
 2015-01-19 22:14:52 +01:00
def 8b108a2311 Clean up gametype determination 2014-12-10 03:39:15 +01:00
Dennis Felsing b525de33b5 Merge pull request #112 from trml/prediction_weapons 
Prediction weapons
 2014-12-02 11:24:52 +01:00
nuborn 9752334e75 convert projectiles back to default format before recording demos 2014-12-01 01:32:51 +01:00
nuborn 03bc769c09 prediction of hammer (hits) and grenade (explosions) 2014-12-01 01:31:58 +01:00
def f3ba2e86ca Send timeout code later (fixes timeout code entering issues, fixes timeout protection not working realiably with dummy) 2014-11-27 01:59:55 +01:00
def 91bc16c037 Add an option to assume demos to be race demos 2014-11-25 20:46:21 +01:00
def 2acdf5ea17 Code cleanup 2014-11-25 20:29:31 +01:00
def 140173311e Uncached time_get by default 2014-11-18 18:21:30 +01:00
def 808f889c00 Improve server wakeup timing 2014-11-11 13:00:02 +01:00
def 4e9b6ea336 Ugly fix for client (TODO: improve) 2014-11-10 00:17:31 +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
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
def 5fd50e0b46 Fix warning at client start 2014-10-27 09:05:22 +01:00
def 9453b80e66 Forgotten 2014-10-26 02:57:03 +02:00
def 1144ba77c6 Split up demo recording into 3 separate recorders 2014-10-16 17:42:13 +02:00
def 607a27718e Revert "Removed InputData Array" 
This reverts commit 83f6fc70fa.
 2014-10-12 17:52:53 +02:00
Tomew 83f6fc70fa Removed InputData Array 2014-10-12 17:19:09 +02:00
def 32fedf3518 Automatically rcon-authenticate dummy on connection if player is authenticated already 2014-10-01 12:41:10 +02:00
def c54cf2e7ba Cleanup 2014-09-26 02:41:25 +02:00
def bde8c33c20 Hopefully real fix now 2014-09-20 21:44:43 +02:00
def 7035bf87fd Refresh DDNet tab when a new serverlist was received 2014-09-20 15:35:01 +02:00
def 3b3955632c Hopefully fix Windows compile 2014-09-20 14:20:43 +02:00
def d6aea5ba40 Prepare DDNet gametype name 2014-09-20 13:48:59 +02:00
east 603727232a ddnet server list zlib compression added 2014-09-20 11:36:46 +02:00
east cda02a3d9a versionsrv serverlist download added 2014-09-20 00:36:22 +02:00
east e732008157 DDNet serverlist added 2014-09-13 16:36:25 +02:00
def a36358190b Mac OS X compilation 2014-09-11 21:38:23 +02:00
def 49682f4a8d Threaded logger output 2014-09-09 23:02:05 +02:00
def 0da1ba238c Add cl_cpu_throttle_inactive 2014-09-06 01:42:59 +02:00
def 4133e642f8 Remove Damage Indications when entering game (fixes #29) 2014-09-03 14:17:44 +02:00
def f66febb009 Revert "Only connect dummy when we're fully connected to the server" 
This reverts commit 96502a2d88.
 2014-09-03 13:58:06 +02:00
def 96502a2d88 Only connect dummy when we're fully connected to the server 2014-09-01 17:36:10 +02:00
def 9f4ac93d90 fifoconsole cleanup 2014-08-29 19:42:34 +02:00
timgame 7929d9a0c8 added client fifo 2014-08-29 16:52:08 +02:00
def c653a09f82 Use settings_ddnet.cfg instead of settings.cfg 2014-08-26 22:25:22 +02:00
def b2f8f272db Only use rcon spoofing protection on ddnet servers as it's buggy on others 2014-08-26 22:10:22 +02:00
Dennis Felsing 25bbecc0c9 Merge pull request #10 from east/demoslice 
Extended demo player features
 2014-08-23 18:36:20 +02:00
east 070ebe2895 merge fixed 2014-08-23 17:57:32 +02:00
east 8624d0a747 DemoPlayer: Save dialog added 2014-08-23 17:48:04 +02:00
def 803745fee1 Fix: Working 64 player server info in LAN tab (by Savander) 2014-08-22 19:59:38 +02:00
def 2cff296c25 Protect from IP spoofing of rcon commands 2014-08-22 13:54:13 +02:00
def bdd8e77d46 also show all players for 32 player serves in serverbrowser 2014-08-21 13:57:21 +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 23f67b5afe Really disconnect dummy on map change 2014-08-16 12:55:37 +02:00
east f1ee4aa48c CDemoEditor: slice begin/end markers added 2014-08-13 17:32:03 +02:00
east 65b2426349 CDemoEditor: added new buttons to demo player 2014-08-13 16:35:15 +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 5436e45e2f Use another connection (with a truly random port) to request connection infos 2014-08-13 12:03:53 +02:00
east 64810cf11c worked on CDemoEditor 2014-08-12 16:21:06 +02:00
def b1da901028 Fix: Only allow dummy reconnect every 5 seconds 2014-07-25 02:43:01 +02:00
def 53346dddfc Try to fix the movement on dummy connect 2014-07-16 14:45:53 +02:00
def bbe597ef04 Add cl_dummy_resetonswitch 2014-07-08 01:41:45 +02:00
CookieMichal e236758118 Fixed compilator warnings 2014-07-07 15:42:46 +02:00
def 7875c2ec36 Android support (by Pelya) 2014-06-16 13:29:18 +02:00
def 26dbb86d0b Fix: Save news in teeworlds settings directory 2014-06-05 15:19:26 +02:00
def c67742f60a Add news 2014-06-05 12:11:41 +02:00
def 458331597e Fix: Dummy can see 64 players on non-ddnet servers 2014-06-04 23:19:05 +02:00
def bf38e947a8 Fix: Dummy connect and disconnect (Thanks to Kati) 2014-05-24 21:34:06 +02:00
def 7dc7165157 Seems like 64 player rerequests are bad for switching between Internet 
and LAN
 2014-05-22 17:02:58 +02:00
def bede303976 Fix: Dummy connect 2014-05-17 21:37:55 +02:00
def f0ed57a9a3 Fix: Dummy can connect without port 2014-05-17 20:00:01 +02:00
def 2db6673a46 Reset dummy connect time to fix dummy connect on new server 2014-05-17 19:06:33 +02:00
def 2c1dc335cc Only consider dummy connected when 2 snapshots were received 2014-05-17 18:57:46 +02:00
def 4b8a52d7c9 Fix: Rerequest 64 player infos 2014-05-17 16:15:01 +02:00
def 73103df309 Make autoupdater only run when ddnet servers can be reached 2014-05-17 15:42:32 +02:00
def 46fb8c8b7f Readd old graphics code for old computers 2014-05-16 01:01:30 +02:00
def b0dc35080e Fix: Only allow dummy connect every 5 seconds (Thanks Monsta) 2014-05-13 20:26:59 +02:00
def 6cdca20e4d Fix last 2014-05-10 20:58:29 +02:00
def 102997a989 Only allow dummy connect when we're connected to server 2014-05-10 20:40:54 +02:00
def c0be97b8c3 No more crashing on map change with dummy 2014-05-10 20:25:29 +02:00
def 25cfa741e5 Fix: Stop the random shootings at dummy switch 2014-05-10 20:23:26 +02:00
def 96068e0149 Fix random dummy jumps at switch (for the 100th time) 2014-05-10 18:20:03 +02:00
def 5b1c866b35 Feature: Separate inputs for dummy and player 2014-05-10 14:31:00 +02:00
def 0d5790b8cd No more Connection Problems on dummy connect 2014-05-09 16:46:04 +02:00
def d2623bbb05 Fix potential crash with dummy 2014-05-08 14:58:42 +02:00
def 98c9fe33bf Fix: Dummy shouldn't hammer on switch (except after hammerfly, which is harder to fix) 2014-05-07 15:24:53 +02:00
def 239fdce024 Fix: Always start dummy hammer immediately 2014-05-05 04:56:37 +02:00
def b6e319f1c5 Fix dummy switching (hopefully crashes as well) 2014-05-04 23:29:29 +02:00
HMH 44a20aca2e use predicted characters for dummy_hammer 2014-05-04 17:32:26 +02:00
def c316c3f5a3 Fix: Better dummy behaviour on switches 2014-05-03 23:28:48 +02:00
def d1cb8a8e06 Fix: No more random inputs when you hold dummy switch pressed... 2014-05-03 20:29:31 +02:00
def 820926d836 Store dummy snapshots for better dummy switching 2014-05-03 20:24:45 +02:00
HMH addfe47d4c fix correct dummy-tunings now 2014-05-03 02:44:28 +02:00
def bf6fb6eb0f cl_overlay_entities instead of cl_show_entities 2014-05-01 17:44:35 +02:00
def 873d17ceed Fix: Dummy stop hammering immediately when cl_dummy_hammer is toggled off 2014-04-30 17:51:34 +02:00
def c4118a3878 Fix: Make inputs work 100% when you're in freeze. 
This was random before, now these parts are a lot more reasonable
Client-side fix so it works on all servers
 2014-04-30 15:21:23 +02:00
def 89777a294b Fix: Dummy starts hammering immediately on switch 
This allows perfect hammerfly start timing
 2014-04-30 15:15:27 +02:00
def 567e55ca57 Fix dummy delta switching 2014-04-30 13:32:12 +02:00
def 158900cbc1 Fix: Dummy holds keys after freeze 2014-04-29 03:24:40 +02:00
def 1738ff6010 Cleanup 2014-04-28 22:20:03 +02:00
def 8b816dce44 Fix: Proper weapon for dummy 2014-04-28 22:16:24 +02:00
def 7a5f32f155 Add hammerfly for dummies 2014-04-28 22:12:50 +02:00
def 82abac307a More dummy fixes 2014-04-28 20:43:08 +02:00
def a7862a200f Fix: Map changing with dummy 2014-04-28 19:36:08 +02:00
def 8687fd1317 Less lags on dummy switch 2014-04-28 17:26:31 +02:00
def 4782d34667 Some more dummy fixes 2014-04-28 16:47:44 +02:00
def 9f509eeedb Fix: Dummy setting updates 2014-04-28 15:19:57 +02:00
def 9bf6f3ed6c Fix: Connecting to server names instead of IPs with dummy 2014-04-28 14:12:24 +02:00
def 085fea62b6 More Mac fixes 2014-04-28 01:00:02 +02:00
def 3bbc2c4ef7 Fix dummy issues 2014-04-27 13:44:04 +02:00
def 94c81fd9ab Allow dummy to rcon too 2014-04-27 12:51:02 +02:00
def 7bcc51d488 Basic updating (thanks to unsigned char* 2014-04-27 05:01:03 +02:00
def 5345bb6273 Fix dummy bugs 2014-04-26 21:10:39 +02:00
def 3dce4c9489 Add dummy (Thanks to //toast and Monsta) 2014-04-26 20:29:42 +02:00
def 28cc8f7724 Fix: Show the server you're connected to in the server browser too 2014-04-05 00:07:58 +02:00
def 607e41cdd3 Fix: Always refresh serverlist properly, don't let 64 player packets disrupt us 2014-02-26 02:17:41 +01:00
def 96855e2b95 Fix crash on server change by ignoring snapshots of old server 2014-02-26 01:25:22 +01:00
def 41703cd5b9 Add gfx_backgroundrender to fix crashes on some systems 2014-02-12 12:38:57 +01:00
def 79a99a994c Remove non-threaded graphics as they strongly decrease performance in many cases 2014-02-07 23:33:15 +01:00
def 48c292b8bf Only render if window is visible 2014-02-02 11:54:34 +01:00
def 3ca4514d21 Fix: Editor, Debug mode always open immediately 2014-01-31 01:41:57 +01:00
def d859f490ce Better performance when CPU throttled 2014-01-15 21:40:28 +01:00
def 31629b15c1 DDNet Version notice 2014-01-14 23:13:17 +01:00
def bc9e188309 Revert SetPing 2014-01-14 21:44:40 +01:00
def 9e4114f27d Better 64 player search 2014-01-14 21:40:55 +01:00
def a0e5c6759d Only sort players on last packet 2014-01-13 23:15:54 +01:00
def 8af9f9d6a3 Fix: Properly show 64 player servers 2014-01-11 04:08:01 +01:00
def d437c57d26 Fix null pointer 2014-01-10 12:01:13 +01:00
def ba9a29c704 Fix that sometimes 64 player servers show up as 16 player 2014-01-09 15:40:11 +01:00
def 35ea08915a Don't allow negative offsets 2014-01-08 18:16:52 +01:00
Patrick Rathje 5114570794 Hotfix for Refresh 2014-01-08 07:46:24 +01:00
Patrick Rathje 4c080fe137 Better Refreshing 
Conflicts:
	src/engine/client/client.cpp
	src/engine/client/serverbrowser.cpp
	src/engine/client/serverbrowser.h
	src/engine/masterserver.h
	src/engine/shared/masterserver.cpp
 2014-01-08 07:46:09 +01:00
Patrick Rathje 020bb16f54 Faster Refreshing 
Conflicts:
	src/engine/client/serverbrowser.cpp
 2014-01-08 07:42:19 +01:00
def 52e83313c8 64 players in server browse 2014-01-08 06:15:56 +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 da9ff2a696 Add: Set Ping to any value you want 2013-12-18 16:54:20 +01:00
def 2d6a4874e3 Don't consider showing entities and zooming out cheats 2013-12-18 16:53:46 +01:00
def 5fa57ed5ab Remove gfx_clear 2013-10-09 17:11:34 +02:00
def 7dbce81bbf Allow more colors 2013-10-08 16:32:27 +02:00
def 48870102e0 Entities background color 2013-08-29 17:14:03 +02:00
def d4c0f31b32 Make client compile 2013-07-22 17:20:34 +02:00
def 6d26e07e1f Single config variable for background color without quads 2013-07-11 17:13:45 +02:00
def 6105f60a89 Make RGB values of background colors independent 2013-06-23 20:56:05 +02:00
def 8421903897 Grey background colors when quads disabled 2013-06-23 13:41:13 +02:00
BeaR 9b81779ae3 Using MemoryBarrier() for CPUs not supporting SSE2 2013-04-26 16:44:59 +02:00
oy 07c97822bb increased sleep time when tw is minimized and made it adjustable via cputhrottle otherwise 2013-02-24 18:31:23 +01:00
BeaR d58afefaae Some graphic batching: 
Speed up for displaying debugtext and envelopepreview
(This reduces the performance hit especially for the 'Show Info' mode in the editor)

Conflicts:

	src/engine/client/client.cpp
	src/game/editor/editor.cpp
	src/game/editor/editor.h
 2013-02-24 18:23:06 +01:00
Magnus Auvinen 1711be955b fixed all the errors that the clang static analayzer found 2013-02-24 17:58:34 +01:00
oy 13d06e45ac fixed used nettype in server browser and try to use ipv4 and ipv6 socket when using a bindaddr. Closes #940 2013-02-24 17:26:59 +01: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 fa81141110 added demo markers by Choupom. Closes #837 2012-01-10 23:13:19 +01:00
oy 590dbac239 put the game version constants all together in one file. Closes #870 2012-01-09 02:02:02 +01:00
oy 4073520214 cleaned up content folder creation. Closes #845 2012-01-09 01:38:45 +01:00
GreYFoX 420447dc51 Merge branch 'master' of git://github.com/oy/teeworlds into DDRace 
Conflicts:
	readme.txt
 2012-01-07 19:16:20 +02:00
oy 2785293469 don't start playing the music again if we're quitting 2012-01-06 20:03:57 +01:00
oy 29738552a6 made bindaddr config work for client and master too. Closes #909 2012-01-06 19:17:14 +01:00
oy 78bb0e3d8c fixed compiling for macosx 2012-01-06 16:35:48 +01:00
oy 12f76e7f8d made the editor work again. Closes #914 2012-01-06 12:55:19 +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
Magnus Auvinen 2991f4071e fixed kicking of command buffer if it's full when rendering. fixed compile error on windows 2012-01-03 22:01:37 +01:00
Magnus Auvinen 50d872531a cleaned up the code. fixed so that SDL is inited on main thread and then transfers the gl context to the render thread 2012-01-03 21:39:10 +01:00
Magnus Auvinen c1942ca6cb fixed the render frame time and cleaned up some more code 2012-01-01 13:38:46 +01: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
Magnus Auvinen 7a36a103ae fixed so that the rendering can be done async from the input, network and update 2011-12-31 10:04:46 +01:00
Magnus Auvinen 8e56885795 initial commit of the threaded graphics. can start game and render the gui. no textures at the moment. still waits for the swap for now 2011-12-31 01:06:04 +01:00
oy de3e94d901 clean up temp commands on logout in the client 2011-12-30 19:21:00 +01:00
Magnus Auvinen 8ffe582615 ugly incomplete hack to put the rendering into another thread so we don't have to wait for the flip 2011-12-30 16:02:22 +01:00
oy b44ee3d975 reworked ban system 2011-12-29 23:36:53 +01:00
GreYFoX 5ebf60891c Merge branch 'master' of git://github.com/oy/teeworlds into DDRace 2011-12-01 19:48:09 +02:00
oy 05f77f64af added caching for the play command. Closes #891 2011-11-30 01:41:00 +01:00
GreYFoX 7e24be5d83 Version 1.091a 2011-08-31 12:10:15 +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 b25fc26c1c zero out client memory on startup to prevent more bad surprises 2011-07-31 18:39:48 +02:00
oy 9cf4facd05 fixed a client crash in debug. Closes #806 2011-07-31 17:07:10 +02:00
oy 94bdd95957 added missing newlines at end of 2 files 2011-07-30 18:29:40 +02:00
Johannes Loher e2664c1b00 Added server sided automatic demo recording 2011-07-30 18:23:59 +02:00
oy b3e8506f20 create client on heap. Closes #744 2011-07-30 13:50:22 +02:00
oy 571dff6216 made rcon auto completion serverside. Closes #97 2011-07-14 22:07:21 +02:00
oy e37d536fdf fixed some NETTYPE usage based on the socket state 2011-07-07 01:48:00 +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
GreYFoX cc63cf2553 Merge branch 'master' of git://github.com/oy/teeworlds 
Conflicts:
	src/engine/external/pnglite/pnglite.c
	src/engine/external/pnglite/pnglite.h
	src/engine/shared/config_variables.h
	src/game/client/components/menus_browser.cpp
	src/game/server/entities/character.cpp
	src/game/server/entities/laser.cpp
	src/game/server/gamecontext.cpp
	src/game/server/player.cpp
	src/game/version.h
 2011-05-09 18:36:13 +02:00
oy 5fbf6d0bfd fixed compiler warnings. Closes #679 2011-05-05 01:43:27 +02:00
GreYFoX 5924b5a8bf Fixed blank squares and cl_show_entities to show other layers 
P.S. this might introduce a client crash bug, but it needs to happen for me to trace it
 2011-04-17 19:14:49 +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
GreYFoX aaac8a3f77 Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/game/version.h
 2011-04-09 22:33:06 +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
oy b6118ae9fe mapped IPv4 addresses within master servers server list to IPv6 to decrease the size of an entry and increased the servers per packet 2011-04-08 23:56:15 +02:00
oy f38fc81d78 fixed a possible client crash on map change 2011-04-07 18:23:03 +02:00
oy c27a634089 fixed and show error message if the crc doesn't match on map load 2011-04-07 18:07:22 +02:00
oy 4ad6d2f01e fixed problem with sv_bindaddr on the server 2011-04-04 18:20:05 +02:00
oy 9cb2f07b80 fixed clients search for maps within subfolders 2011-04-04 16:53:02 +02:00
oy 2a72c0b38b added a mechanism to check for a valid standard map. Closes #132 2011-03-31 15:13:49 +02:00
oy 59d56cd332 finished IPv6 support (master servers aren't compatible with 0.5 and older). Closes #233 2011-03-30 12:08:33 +02:00
oy 34a9ca20a7 added ipv6 support from the old lua branch 2011-03-28 20:11:28 +02:00
oy 7bd79f9f43 added remove_favorite command by Choupom 2011-03-27 18:05:11 +02:00
oy a583633cde added renaming of srvbrowse so it matches with the interface filename by Choupom 2011-03-27 18:00:54 +02:00
oy ae325c873f added friends feature. Closes #24 2011-03-23 13:06:35 +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 96808a1145 made it possible to just show the number of player slots of a server (instead of client ones). Closes #68 2011-03-20 15:33:49 +01:00
oy 79aa9d640e fixed that server browser shows the correct country flag 2011-03-20 11:15:24 +01:00
oy a8bf857c68 improved server browser list resorting and made search work on IP addresses. Closes #482 2011-03-18 19:03:13 +01:00
oy b939d38228 made the client check for valid address on connectionless packets from master/version server 2011-03-17 17:41:57 +01:00
GreYFoX 87cde802b1 Added a new entities_clear 
Fixed cl_ddrace_cheats not controlling cl_show_entities
attempted to make cl_show_entities show other layers than the game layer
 2011-03-16 19:48:16 +02: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 ee178d5a48 Client Cheat showing entities in game 2011-03-16 14:48:16 +02:00
oy 7412fabb9c made serverinfo use clan name and country code for players 2011-03-16 12:37:41 +01:00
oy 27e5a6af0d made clients sending startinfo a requirement to prevent empty player infos 2011-03-15 09:58:57 +01:00
oy be8f669333 added extended demo infos in the demo browser 2011-03-13 10:41:10 +01:00
oy 50b266086b made dbg_dumpmem and dbg_lognetwork work again 2011-03-05 11:46:24 +01:00