Commit graph

3702 commits

Author SHA1 Message Date
Learath2 f053fd64a0 Forgot a return at can't pause while spectator or dead 2012-04-11 14:40:04 +02:00
heinrich5991 5b455dc4a9 Cleaned up bam.lua, added buildbot support 2012-03-27 22:49:19 +02:00
heinrich5991 9ed9dbb9d3 Merge pull request #154 from swick/DDRace
fixes srv crash if typing '/top5 -999999'
2012-03-24 00:43:18 -07:00
Sebastian Wick 57d90a16eb fixes srv crash if typing '/top5 -999999' 2012-03-23 22:32:20 +01:00
Shereef Marzouk b560e3135d Merge pull request #151 from Learath2/DDRacePause
Fixed a bug i experienced in a up to date server
2012-03-14 12:44:12 -07:00
Learath2 5e6d5a28f0 Follow up fix for pause and spec cant spec or pause in spectators. 2012-03-08 18:24:23 +02:00
Learath2 e06fd51ec1 Fixed a bug i experienced in a up to date server 2012-03-07 19:51:30 +02:00
Shereef Marzouk 65bbd53009 removed useless ve line 2012-03-02 00:53:19 +02:00
Shereef Marzouk f6ac63593f Merge pull request #149 from Learath2/DDRaceTimer
Simplified usage of timer commands. Fixed new year happy spawn.
2012-03-01 14:48:15 -08:00
Learath2 50b2d85abb Fixed according the comment of GreYFoX. 2012-02-14 22:38:06 +02:00
Learath2 d64e1796aa Simplifys the usage of timer commands. Fixes new year happy spawn. 2012-02-14 20:25:34 +02:00
Shereef Marzouk 6f85e721e4 Merge pull request #148 from heinrich5991/ddrace_feature_mobydogskins0
added skins by MobyDog
2012-02-14 08:02:41 -08:00
heinrich5991 bddc8c7161 added skins by MobyDog 2012-02-10 22:50:07 +01:00
Shereef Marzouk 7bd9a687c4 Merge pull request #147 from SushiTee/DDRace
fixed showing player spawn effect only to players who should see
2012-02-05 14:08:26 -08:00
SushiTee 1e602bf31b fixed showing player spawn effect only to players who should see 2012-02-05 14:48:09 +01:00
Shereef Marzouk 13fce08af8 Merge pull request #145 from XXLTomate/FixMute
This fixes mute.
2012-02-02 15:23:30 -08:00
XXLTomate dce5e8434b This fixes mute. Thanks to @heinrich5991 @Learath2 Mo2, the whole #DDRace and my dog. 2012-02-03 00:16:22 +01:00
Shereef Marzouk 8097e96bfb Merge pull request #143 from XXLTomate/DDRaceConsoleFix2
fixing the console
2012-01-28 03:07:48 -08:00
XXLTomate f9e4547b31 fixing the console (2) 2012-01-28 11:14:31 +01:00
GreYFoX 420447dc51 Merge branch 'master' of git://github.com/oy/teeworlds into DDRace
Conflicts:
	readme.txt
2012-01-07 19:16:20 +02:00
oy 71dd0c5aab made gfx_finish work again 2012-01-06 14:12:49 +01:00
oy 12f76e7f8d made the editor work again. Closes #914 2012-01-06 12:55:19 +01:00
oy f91e2abc6b updated copyright to 2012 and fixed a typo in the license 2012-01-06 12:37:23 +01:00
GreYFoX c46f3e06e7 Merge branch 'master' of git://github.com/oy/teeworlds into DDRace 2012-01-04 20:10:07 +02:00
oy f14c0e2359 fixed linking for older gcc versions 2012-01-04 01:19:54 +01:00
oy 8e571a43ac Merge branch 'master' of github.com:oy/teeworlds 2012-01-04 01:14:05 +01:00
oy f4f425b230 fixed compiling with gcc on windows 2012-01-04 01:10:56 +01:00
oy 03a876df80 Merge pull request #911 from Learath2/translatefix
Fixed errors i've seen in Turkish translation.
2012-01-03 16:06:29 -08:00
oy cc94472f04 fixed mac osx 2012-01-04 00:52:24 +01:00
oy 213b88835e fixed compiling on windows 2012-01-04 00:48:04 +01:00
oy 7328098f8d Merge pull request #912 from matricks/threadedflip
Threadedflip
2012-01-03 15:40:30 -08:00
Magnus Auvinen 7393151b6d fixed the osx opengl make current thingie.. I think... 2012-01-03 22:53:24 +01:00
Magnus Auvinen 666401e309 added osx implementation. not tested, not even compiled once. hope it works 2012-01-03 22:49:31 +01:00
Magnus Auvinen 2991f4071e fixed kicking of command buffer if it's full when rendering. fixed compile error on windows 2012-01-03 22:01:37 +01:00
Magnus Auvinen 50d872531a cleaned up the code. fixed so that SDL is inited on main thread and then transfers the gl context to the render thread 2012-01-03 21:39:10 +01:00
Learath2 8e8ba26ac2 Fixed errors i've seen in Turkish translation. 2012-01-01 23:54:29 +02:00
Magnus Auvinen e59b24d8db fixed atomics and semaphore for windows. can't test it correctly however due to that I only have a virtual box machine 2012-01-01 15:56:28 +01:00
Magnus Auvinen c31c82a584 added support for video modes 2012-01-01 14:30:45 +01:00
Magnus Auvinen d7fe3ddaab fixed shutdown and screenshot functionallity 2012-01-01 14:15:35 +01:00
Magnus Auvinen c1942ca6cb fixed the render frame time and cleaned up some more code 2012-01-01 13:38:46 +01:00
Ravomavain 1392c35bb4 Fix banmaster 2012-01-01 04:55:33 +02:00
GreYFoX 908cb57f25 New entities thanks to @Fisico 2012-01-01 04:54:40 +02:00
Ravomavain ebf64758b1 Make spectators see the same thing as the player they spectate 2012-01-01 00:15:16 +02:00
Ravomavain 02372ac0b0 Don't allow kill if player is paused 2012-01-01 00:15:16 +02:00
Ravomavain c85d7bcc0f Make spectators hear the same thing as the player they spectate 2012-01-01 00:15:16 +02:00
Ravomavain af8fac1bac Little fix to allow 2 players to spectate each other 2012-01-01 00:15:15 +02:00
Ravomavain 74de1972a1 Add binaries to .gitignore 2012-01-01 00:15:14 +02:00
GreYFoX ee670118a5 Merge branch 'master' of git://github.com/oy/teeworlds into DDRace
Conflicts:
	src/engine/console.h
	src/engine/server/server.cpp
	src/engine/server/server.h
	src/engine/shared/config.h
	src/engine/shared/console.cpp
	src/engine/shared/console.h
	src/engine/shared/network_server.cpp
@heinrich5991 todo
2012-01-01 00:11:56 +02:00
GreYFoX 250b3b9416 i was scared that @heinrich5991 may send people to kill me while i sleep for hard coding something into DDRace 2011-12-31 19:16:40 +02:00
Magnus Auvinen 8b76105cfa cleaned up some of the code 2011-12-31 14:00:49 +01:00