GreYFoX
|
37cd5d5510
|
Merge branch 'master' of git://github.com/oy/teeworlds
|
2011-04-17 11:11:37 +02:00 |
|
oy
|
fede33447a
|
fixed problem with the master server
|
2011-04-15 20:38:06 +02:00 |
|
GreYFoX
|
c6ca0fd6b0
|
Fixed Reset Filter
|
2011-04-15 06:40:42 +02:00 |
|
GreYFoX
|
89abd3ad81
|
1.073a
|
2011-04-15 06:37:02 +02:00 |
|
GreYFoX
|
561ce64666
|
Renamed cheats to testing commands sv_test_cmds
Since these are testing commands, anyone can use them and only on their selves no login needed
Revised some rcon commands
cleanup some unwanted codes
|
2011-04-15 06:04:21 +02:00 |
|
GreYFoX
|
3f0ad1ab65
|
Cleaned up helper commands, @heinrich5991 please revise this commit
|
2011-04-15 05:20:52 +02:00 |
|
GreYFoX
|
a2e4e9c050
|
Fixed CServer::SetRconLevel
|
2011-04-15 05:19:11 +02:00 |
|
GreYFoX
|
14e4557dfc
|
Made EMOTICON_WTF eye action EMOTE_SURPRISE
|
2011-04-15 04:38:48 +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
|
c5d992dc2c
|
nothing
|
2011-04-14 04:42:09 +02:00 |
|
GreYFoX
|
7c6d405e2a
|
Fixed vote abortion by admin login
|
2011-04-14 04:26:13 +02:00 |
|
GreYFoX
|
c37bad0be8
|
fixed a crash
|
2011-04-14 04:00:22 +02:00 |
|
GreYFoX
|
847aab9970
|
fixed banmaster compilation
|
2011-04-14 01:51:38 +02:00 |
|
GreYFoX
|
5668fa08ff
|
fixed masterserver compilation
|
2011-04-14 01:51:26 +02:00 |
|
GreYFoX
|
dc886b7b2e
|
New emoticons eye actions
|
2011-04-14 01:36:51 +02:00 |
|
GreYFoX
|
2a0e272950
|
1.072a
|
2011-04-14 01:29:00 +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 |
|
GreYFoX
|
f7892d3f00
|
Administrator privacy, re-enabled disabled functions
|
2011-04-14 00:53:33 +02:00 |
|
GreYFoX
|
61129aa15e
|
avoided confusion between rcon kill and and local console kill
|
2011-04-14 00:51:29 +02:00 |
|
GreYFoX
|
fd6388a9d8
|
Cheats are on unregistered servers only, added warning message about records not getting saved
|
2011-04-14 00:50:57 +02:00 |
|
heinrich5991
|
f0735554ec
|
fixed the reworked IConsole::PrintResponse
|
2011-04-14 00:34:11 +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
|
1d426f1df9
|
fixed problem with ui_page
|
2011-04-13 20:45:16 +02:00 |
|
oy
|
06115dd49d
|
added "Whitespace and line Endings cleanup" by GreYFoX
|
2011-04-13 20:37:12 +02:00 |
|
oy
|
e6f0318bdf
|
added "fixed some header guards and added a script to fix them all!" by Choupom
|
2011-04-13 20:22:10 +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
|
876eac1048
|
added fix to make [Shift] only change the time of the point and not his value for envelopes in map editor by Choupon
|
2011-04-13 17:47:02 +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
|
dd70b687ed
|
Better ICons + Mac Icons
Disabled Emotional tees until reworked
|
2011-04-13 01:34:39 +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
|
4a46168631
|
Temporarily removed crash features til it's fixed, made version 1.071a
changed some names for the build bot to work
|
2011-04-12 03:52:01 +02:00 |
|
GreYFoX
|
0ee65685be
|
Fixed Crazy shotgun bullets
|
2011-04-12 00:28:00 +02:00 |
|
GreYFoX
|
03095b5ecf
|
Nothing
|
2011-04-12 00:27:52 +02:00 |
|
GreYFoX
|
b4f05a6772
|
removed comments from voting - no longer needed
|
2011-04-10 15:32:56 +02:00 |
|
GreYFoX
|
b2c67df7e7
|
fixed hammer hit
|
2011-04-10 15:07:36 +02:00 |
|
oy
|
3788d2392d
|
moved to trunk version again and added update for Portuguese translation by Slinack
|
2011-04-10 02:23:39 +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
|
f677b397a3
|
made 0.6.0 release
|
2011-04-09 20:42:51 +02:00 |
|
oy
|
1d7a91909c
|
ctf2 update
|
2011-04-09 18:32:01 +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
|
42fdd6540c
|
added new graphics and maps
|
2011-04-09 16:48:51 +02:00 |
|
oy
|
4d8c9d1c0d
|
updated standard map filter in the server browser with new maps
|
2011-04-09 00:08:32 +02:00 |
|
oy
|
c902d98be3
|
moved vote tabs on top
|
2011-04-09 00:03:56 +02:00 |
|
oy
|
b6118ae9fe
|
mapped IPv4 addresses within master servers server list to IPv6 to decrease the size of an entry and increased the servers per packet
|
2011-04-08 23:56:15 +02:00 |
|