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
|
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 |
|
oy
|
06115dd49d
|
added "Whitespace and line Endings cleanup" by GreYFoX
|
2011-04-13 20:37:12 +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
|
b3cb33eec0
|
replace team name by clan name if possible
|
2011-04-02 18:11:43 +02:00 |
|
|
GreYFoXGTi
|
6904956a14
|
Added some DDRace Menu Items
Enforced cl_ddrace_cheats on zoom
|
2011-02-16 11:20:27 +02:00 |
|
|
GreYFoXGTi
|
2fd0ff1b85
|
Added Show IDs
and altered last commit
|
2011-02-15 03:14:32 +02:00 |
|
XXLTomate
|
f0201597c6
|
DDRace Settings-tab
Checkbox for DDRace Scoreboard
|
2011-02-15 02:36:22 +02:00 |
|
|
GreYFoXGTi
|
f83132448d
|
Merged Oy, Isolated Freeze from Deep Freeze
|
2011-02-13 19:32:06 +02:00 |
|
heinrich5991
|
dc8ec160e5
|
removed the usage of std::string in scoreboard
|
2011-01-26 20:54:19 +01:00 |
|
|
GreYFoXGTi
|
109cbd4e28
|
The DDRace scoreboard is now for all Race types
|
2011-01-21 10:07:32 +02:00 |
|
|
GreYFoXGTi
|
82eac5cf3b
|
ScoreBoard now is different for DDRace only
|
2011-01-06 06:45:53 +02:00 |
|
|
GreYFoXGTi
|
ddc5dd7ab3
|
Cleaned up & Re-arranged stuff
|
2011-01-06 05:46:10 +02: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 |
|
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 |
|
|
GreYFoXGTi
|
fa379a806a
|
Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
src/engine/server/server.cpp
src/game/client/components/scoreboard.cpp
src/game/server/gamecontext.cpp
src/game/server/player.cpp
|
2010-09-13 07:49:01 +03:00 |
|
|
oy
|
e226b47212
|
close the emote selector, chat history and the scoreboard when closing the chat, console or ingame menu. Closes #111
|
2010-09-12 12:43:03 +02:00 |
|
|
GreYFoXGTi
|
d1b3e01892
|
Merge branch 'master' of http://github.com/oy/teeworlds
|
2010-09-07 21:49:12 +02:00 |
|
|
oy
|
ea25972e21
|
added rec notification by ghost91-. Closes #82
|
2010-09-07 19:03:59 +02:00 |
|
|
btd
|
909c583d96
|
End merge
|
2010-08-26 00:30:21 +04:00 |
|
|
oy
|
1cfa122521
|
fixed that scoreboard overlaps the chat. Closes #14
|
2010-08-24 23:48:27 +02:00 |
|
|
oy
|
538d968349
|
fixed that scoreboard overlaps the chat. Closes #14
|
2010-08-18 03:57:35 +02:00 |
|
Magnus Auvinen
|
72c06a2589
|
copied refactor to trunk
|
2010-05-29 07:25:38 +00:00 |
|