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
GreYFoX
4c11e9460b
added "fixed brush rotating and flipping for tele and speeduplayer" by SushiTee
2011-04-17 18:00:01 +02:00
GreYFoX
81dd1a3439
fixed showing quads while showing entities
2011-04-17 11:27:46 +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
Shereef Marzouk
0354625f9b
fixed Mac compilation
2011-04-10 00:05:34 +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