def
35ea08915a
Don't allow negative offsets
2014-01-08 18:16:52 +01:00
Patrick Rathje
5114570794
Hotfix for Refresh
2014-01-08 07:46:24 +01:00
Patrick Rathje
4c080fe137
Better Refreshing
...
Conflicts:
src/engine/client/client.cpp
src/engine/client/serverbrowser.cpp
src/engine/client/serverbrowser.h
src/engine/masterserver.h
src/engine/shared/masterserver.cpp
2014-01-08 07:46:09 +01:00
Patrick Rathje
020bb16f54
Faster Refreshing
...
Conflicts:
src/engine/client/serverbrowser.cpp
2014-01-08 07:42:19 +01:00
def
52e83313c8
64 players in server browse
2014-01-08 06:15:56 +01:00
def
3eaad43b6b
Merge remote-tracking branch 'upstream-teeworlds/0.6' into DDRace
...
Conflicts:
bam.lua
data/languages/index.txt
src/engine/server/server.cpp
src/engine/shared/network_server.cpp
src/game/client/components/chat.cpp
src/game/client/components/menus_settings.cpp
src/game/server/entities/character.cpp
src/game/server/gamecontext.cpp
src/game/version.h
2013-12-26 18:02:22 +01:00
def
da9ff2a696
Add: Set Ping to any value you want
2013-12-18 16:54:20 +01:00
def
2d6a4874e3
Don't consider showing entities and zooming out cheats
2013-12-18 16:53:46 +01:00
def
5fa57ed5ab
Remove gfx_clear
2013-10-09 17:11:34 +02:00
def
7dbce81bbf
Allow more colors
2013-10-08 16:32:27 +02:00
def
48870102e0
Entities background color
2013-08-29 17:14:03 +02:00
def
d4c0f31b32
Make client compile
2013-07-22 17:20:34 +02:00
def
6d26e07e1f
Single config variable for background color without quads
2013-07-11 17:13:45 +02:00
def
6105f60a89
Make RGB values of background colors independent
2013-06-23 20:56:05 +02:00
def
8421903897
Grey background colors when quads disabled
2013-06-23 13:41:13 +02:00
BeaR
9b81779ae3
Using MemoryBarrier() for CPUs not supporting SSE2
2013-04-26 16:44:59 +02:00
oy
07c97822bb
increased sleep time when tw is minimized and made it adjustable via cputhrottle otherwise
2013-02-24 18:31:23 +01:00
BeaR
d58afefaae
Some graphic batching:
...
Speed up for displaying debugtext and envelopepreview
(This reduces the performance hit especially for the 'Show Info' mode in the editor)
Conflicts:
src/engine/client/client.cpp
src/game/editor/editor.cpp
src/game/editor/editor.h
2013-02-24 18:23:06 +01:00
Magnus Auvinen
1711be955b
fixed all the errors that the clang static analayzer found
2013-02-24 17:58:34 +01:00
oy
13d06e45ac
fixed used nettype in server browser and try to use ipv4 and ipv6 socket when using a bindaddr. Closes #940
2013-02-24 17:26:59 +01:00
GreYFoX
cd4ba53bae
Merge branch 'master' of git://github.com/teeworlds/teeworlds into DDRace
...
Conflicts:
bam.lua
scripts/build.py
scripts/make_release.py
src/engine/server.h
src/game/client/gameclient.cpp
src/game/server/gamecontext.cpp
src/game/server/gamecontext.h
src/game/server/gamecontroller.cpp
src/game/server/gamecontroller.h
src/game/server/player.cpp
src/game/version.h
2012-04-12 02:09:31 +02:00
oy
fa81141110
added demo markers by Choupom. Closes #837
2012-01-10 23:13:19 +01:00
oy
590dbac239
put the game version constants all together in one file. Closes #870
2012-01-09 02:02:02 +01:00
oy
4073520214
cleaned up content folder creation. Closes #845
2012-01-09 01:38:45 +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
2785293469
don't start playing the music again if we're quitting
2012-01-06 20:03:57 +01:00
oy
29738552a6
made bindaddr config work for client and master too. Closes #909
2012-01-06 19:17:14 +01:00
oy
78bb0e3d8c
fixed compiling for macosx
2012-01-06 16:35:48 +01:00
oy
12f76e7f8d
made the editor work again. Closes #914
2012-01-06 12:55:19 +01:00
GreYFoX
c46f3e06e7
Merge branch 'master' of git://github.com/oy/teeworlds into DDRace
2012-01-04 20:10:07 +02:00
oy
7328098f8d
Merge pull request #912 from matricks/threadedflip
...
Threadedflip
2012-01-03 15:40:30 -08: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
Magnus Auvinen
c1942ca6cb
fixed the render frame time and cleaned up some more code
2012-01-01 13:38:46 +01: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
Magnus Auvinen
b31abc4053
fixed so that you can select graphics backend via gfx_threaded
2011-12-31 10:29:25 +01:00
Magnus Auvinen
7a36a103ae
fixed so that the rendering can be done async from the input, network and update
2011-12-31 10:04:46 +01:00
Magnus Auvinen
8e56885795
initial commit of the threaded graphics. can start game and render the gui. no textures at the moment. still waits for the swap for now
2011-12-31 01:06:04 +01:00
oy
de3e94d901
clean up temp commands on logout in the client
2011-12-30 19:21:00 +01:00
Magnus Auvinen
8ffe582615
ugly incomplete hack to put the rendering into another thread so we don't have to wait for the flip
2011-12-30 16:02:22 +01:00
oy
b44ee3d975
reworked ban system
2011-12-29 23:36:53 +01:00
GreYFoX
5ebf60891c
Merge branch 'master' of git://github.com/oy/teeworlds into DDRace
2011-12-01 19:48:09 +02:00
oy
05f77f64af
added caching for the play command. Closes #891
2011-11-30 01:41:00 +01:00
GreYFoX
7e24be5d83
Version 1.091a
2011-08-31 12:10:15 +02:00
GreYFoX
5b27758650
Removed level stuff
...
Removed client ID stuff
Removed console stuff
Resolved merge conflicts
Upgraded Banmaster
Cleaned up
2011-08-13 02:11:06 +02:00
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
oy
b25fc26c1c
zero out client memory on startup to prevent more bad surprises
2011-07-31 18:39:48 +02:00
oy
9cf4facd05
fixed a client crash in debug. Closes #806
2011-07-31 17:07:10 +02:00
oy
94bdd95957
added missing newlines at end of 2 files
2011-07-30 18:29:40 +02:00
Johannes Loher
e2664c1b00
Added server sided automatic demo recording
2011-07-30 18:23:59 +02:00