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 |
|
Choupom
|
2179ae0113
|
fixed need restart warning in settings
|
2011-04-13 17:49:31 +02:00 |
|
oy
|
537e5fa7b6
|
added default keys for spectator next/previous and updated localisations
|
2011-04-13 17:39:26 +02:00 |
|
Johannes Loher
|
2e09bd6b9d
|
Extended the control settings so spectate_next and spectate_previous can be set there.
|
2011-04-13 17:32:32 +02:00 |
|
GreYFoX
|
e3cc1c405e
|
Merge branch 'master' of git://github.com/oy/teeworlds
|
2011-04-12 21:05:55 +02:00 |
|
Choupom
|
ffe40db053
|
fixed map download speed and remaining time
|
2011-04-12 19:29:06 +02:00 |
|
GreYFoX
|
32a85dabe3
|
Fixed some merge mistakes, NOTE: This will be be buggy to say the least
|
2011-04-09 23:01:10 +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
|
caf1a9f912
|
made translations ready for 0.6 release and added fixed friends/mute icons
|
2011-04-09 18:08:11 +02:00 |
|
oy
|
c902d98be3
|
moved vote tabs on top
|
2011-04-09 00:03:56 +02:00 |
|
oy
|
9643fc36ae
|
added new hammer hit effect by SushiTee and Crises
|
2011-04-08 19:11:41 +02:00 |
|
oy
|
b5510d4cf9
|
fixed possible client crash with extra projectiles on disconnect
|
2011-04-08 11:22:44 +02:00 |
|
oy
|
b985fdc20a
|
added new friend/mute buttons by Crises and reworked the player options like Landil suggested. Closes #579
|
2011-04-06 20:18:31 +02:00 |
|
oy
|
ebca792975
|
improved call vote tab. Closes #573
|
2011-04-06 11:41:40 +02:00 |
|
oy
|
9b97eb282a
|
prevent that you can add votes with an empty description
|
2011-04-05 20:06:41 +02:00 |
|
oy
|
2401cc2ec3
|
highlight the followed player in scoreboard and show their score on top
|
2011-04-05 19:00:00 +02:00 |
|
oy
|
5c6e274a88
|
added more and resized flags by Crises and made them show up smaller and less of an eye-catcher. Closes #566
|
2011-04-04 20:37:12 +02:00 |
|
Johannes Loher
|
622b3de9bd
|
Added more convenient variabe names for sectate_next and spectator_previous
|
2011-04-04 17:29:32 +02:00 |
|
Johannes Loher
|
1364631211
|
Added functionality to switch to the next and the previous player while spectating.
|
2011-04-04 17:29:08 +02:00 |
|
oy
|
c20a33ede7
|
added more space for translations in demo details. Closes #592
|
2011-04-03 23:33:43 +02:00 |
|
Choupom
|
733f0b3390
|
reimplemented extra projectiles
|
2011-04-03 22:57:03 +02:00 |
|
SushiTee
|
b6f607e73b
|
little more space between killmessages so the tees dont overlap
|
2011-04-02 22:24:57 +02:00 |
|
oy
|
401543c7a9
|
added some space for colour channel translations in the graphic settings as well
|
2011-04-02 19:34:02 +02:00 |
|
Choupom
|
b3cb33eec0
|
replace team name by clan name if possible
|
2011-04-02 18:11:43 +02:00 |
|
SushiTee
|
4adad07ad8
|
polished scoreboard a bit
|
2011-04-02 15:18:52 +02:00 |
|
SushiTee
|
0db6022c64
|
centering scoreboard (goals and spectators) correctly
|
2011-04-02 15:18:45 +02:00 |
|
oy
|
2c9b454fb8
|
added some more space for the translations of the colour channels
|
2011-04-02 12:13:23 +02:00 |
|
oy
|
30c45b7899
|
removed newline from a localisation. Closes #572
|
2011-04-02 12:08:46 +02:00 |
|
oy
|
37b75f90e4
|
fixed that unsaved map notice in quit popup overlaps
|
2011-04-02 12:01:10 +02:00 |
|
oy
|
593a8ee6ec
|
improved settings menu. Closes #564
|
2011-04-01 19:36:44 +02:00 |
|
oy
|
a6fced3d3a
|
made new version notification show up in red colour
|
2011-04-01 18:06:59 +02:00 |
|
oy
|
9a4426779d
|
decreased the font size for some menu buttons and tabs to give translations more room
|
2011-04-01 17:57:04 +02:00 |
|
oy
|
cd9176331d
|
auto add .demo if not present when renaming a demo
|
2011-03-31 18:33:46 +02:00 |
|
oy
|
0e6aca2b28
|
fixed a missing translation
|
2011-03-31 18:24:02 +02:00 |
|
oy
|
08c03104b4
|
changed ingame vote menu so it fits the other tabs and it's makes localisations easier
|
2011-03-31 15:43:12 +02:00 |
|
oy
|
9712e4004c
|
improved the add/remove friend and ignore/notice chat buttons
|
2011-03-29 00:48:36 +02:00 |
|
oy
|
0307138950
|
added better headlines for tabs in vote menu
|
2011-03-28 23:51:46 +02:00 |
|
oy
|
141089f257
|
fixed more compiler warnings
|
2011-03-28 23:30:56 +02:00 |
|
oy
|
867f944459
|
added graphic buttons for remove/add friend and chat ignore/notice
|
2011-03-28 21:10:37 +02:00 |
|
oy
|
63d2019b19
|
fixed that chat overlaps the spectator hud
|
2011-03-27 23:43:45 +02:00 |
|
oy
|
7bd79f9f43
|
added remove_favorite command by Choupom
|
2011-03-27 18:05:11 +02:00 |
|
GreYFoX
|
85fa86102f
|
Refactored e to Event
|
2011-03-27 17:21:30 +02:00 |
|
GreYFoX
|
eb344c83ce
|
Chat History. Closes #521
|
2011-03-27 17:21:07 +02:00 |
|
oy
|
4d5443affa
|
added demo loading speed enhancement by MAP94. Closes #555
|
2011-03-27 16:42:47 +02:00 |
|
oy
|
2aa1bda97e
|
made mouse wheel change speed in demo player. Closes #524
|
2011-03-27 16:26:50 +02:00 |
|
oy
|
67b026f65f
|
added an option to disable ingame HUD. Closes #523
|
2011-03-27 14:40:15 +02:00 |
|