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
Shereef Marzouk
c6fd4a2cc5
General whitespace and tab cleanup
2011-08-11 10:59:14 +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
SushiTee
83652c91ec
fixed a warning in client (mac)
2011-08-01 21:03:51 +02:00
oy
10c3e844d7
show alpha2 country code strings next to the flag in the country code selectors. Closes #805
2011-07-31 02:04:46 +02:00
oy
a0a62bcd70
fixed econ feature and tcp
2011-07-30 13:40:01 +02:00
Choupom
84e5c53432
added color envelope feature for tilemaps
2011-07-20 22:04:13 +02:00
oy
571dff6216
made rcon auto completion serverside. Closes #97
2011-07-14 22:07:21 +02:00
oy
5f4a5b3366
added country flags to language selectors
2011-07-12 20:33:53 +02:00
oy
f4ce34f01c
close spectator/emoticon menu when changing to team/spectator via bind. Closes #768
2011-07-11 12:02:45 +02:00
oy
20fbe2f92c
fixed that player friends are marked as online in the friends list if they match a clan friend
2011-07-05 23:23:33 +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
7648ba3024
added a different mouse sens for menus/editor
2011-07-03 00:36:07 +02:00
Choupom
4a5c13d1de
fixed so Reset Filter button resets all filters
2011-07-02 19:23:36 +02:00
Johannes Loher
3f583d44f9
fixed so there can't be a negative time being displayed when timelimit runs out while there is warmup. If warmup is active, the time will be displayed as if there was no timelimit.
2011-07-01 18:34:28 +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
oy
8035e022fd
fixed cursor positioning by mouse in edit boxes
2011-06-29 18:39:58 +02:00
oy
fdf6db5fd6
fixed that music resets on password prompt. Closes #695
2011-06-27 23:26:01 +02:00
oy
47cdd2524b
do not try to play sound when it isn't enabled
2011-06-27 22:57:06 +02:00
oy
e8938e3d80
set the minimum of seconds remaining in map downloading popup to 1
2011-06-27 22:35:23 +02:00
oy
1239150846
fixed password popup UI issue. Closes #583
2011-06-27 16:39:23 +02:00
oy
fb309436b4
improved friends feature
2011-06-26 17:10:13 +02:00
oy
eae1a97297
fixed marker position in chat
2011-06-09 23:54:11 +02:00
oy
fd965ca4b2
made name highlighting in chat more strict
2011-06-09 23:49:06 +02:00
oy
37bdc4c2a1
removed some unneeded stuff
2011-06-09 23:40:35 +02:00
oy
4f402f85bb
added ':' after names on start and a space separator in chat tab completion
2011-06-09 23:37:59 +02:00
oy
e1ef01f656
made tab completion for names in chat start with the ones that match on the beginning
2011-06-09 23:28:20 +02:00
oy
9845d757ef
removed file extension from the demo name in the demo player
2011-06-09 22:44:22 +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
603071ee92
fixed data struct names
2011-06-02 17:42:30 +02:00
Choupom
101d9de3c3
added aspect ratio in display modes list in settings
2011-06-02 17:36:17 +02:00
GreYFoX
eb70e55ead
Merge branch 'master' of git://github.com/oy/teeworlds
2011-05-17 09:00:25 +02:00
PsychoGod
210d98666c
Scroll fix, protect scrolling 2 windows at the same time
2011-05-17 01:15:54 +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
e4c85b00db
fixed that some demos show a negative length in the demo browser. Closes #660
2011-05-09 17:55:12 +02:00
oy
15e1d4f1d6
distinguish [chat] and [teamchat] in console messages. Closes #643
2011-05-05 02:08:39 +02:00
oy
8ad6f3d7fc
show flags in spectator menu. Closes #636
2011-05-05 02:00:43 +02:00
oy
5b2f5f0778
fixed problem with connecting on double click in the server browser. Closes #662
2011-05-05 01:56:31 +02:00
oy
5fbf6d0bfd
fixed compiler warnings. Closes #679
2011-05-05 01:43:27 +02:00
oy
41ebc9bc9d
fixed cursor marker position in console
2011-05-03 23:30:50 +02:00
Choupom
f8d21b48af
fixed a l10n bug for some languages
2011-05-03 23:10:20 +02:00
Choupom
7f15b3ac57
fixed several stuffs
2011-05-03 19:25:11 +02:00
Choupom
8e773a55ad
show tee pos and vel in tiles in debug hud
2011-05-03 18:13:12 +02:00
Choupom
7b87cfa68a
made envelopes synchronized with other clients
2011-05-03 18:12:32 +02:00
heinrich5991
9fb36fd802
added strict game type filter
2011-05-02 19:25:38 +02:00
Romain Labolle
f4ca6d9ad5
Some Clean up: closes #28
...
* m_VoteEnforcer variable is never used.
* pController variable is not used in OnMessage scoop.
* CNetObj_ClientInfo have now only 4 m_Name ints, so change it to 4 in ghost.cpp
2011-04-20 18:07:38 +02:00
GreYFoX
d0ed9612e1
Properly done cl_show_entities
2011-04-19 16:32:42 +02:00
GreYFoX
00ef75390f
Laying off some caps
2011-04-17 20:02:32 +02:00
GreYFoX
dad66bffc3
General DDRace binds improvements
2011-04-17 19:45:48 +02:00
oy
246cbed786
colorized background of entries in the server browser scoreboard so it's more obvious what belongs together
2011-04-16 18:55:36 +02:00
oy
726bbbbdb0
added missing localisation in the demo player
2011-04-16 18:37:57 +02:00
GreYFoX
c6ca0fd6b0
Fixed Reset Filter
2011-04-15 06:40:42 +02:00
GreYFoX
9397c4a55f
some make release changes for adding sql server files
...
Servers are no longer build with SQL by default.
fixed compilation on Mac OS X 10.5
2011-04-15 04:32:53 +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
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