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