Commit graph

569 commits

Author SHA1 Message Date
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
oy a7574f75d2 fixed last commit 2013-02-01 11:38:09 +02:00
BeaR c86ebb34df Bug: Losing render-commands if commandbuffer is full(gfx)
Problem:
If there is a new draw call, it is checked if there is enough free memory for the vertices in the databuffer but not if we have enough free space in the commandbuffer to add the command
So we lose some commands during a frame cuz the commandbuffer is full

This fixes the 2nd part of issue 1004
2013-02-01 11:38:09 +02:00
BeaR 50b722b2b4 Closes #153.
Fix Input Handling
2012-11-12 20:39:36 +02: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 27daa26b99 fixed stuck mouse cursor when loosing fullscreen focus on windows 2012-02-05 13:28:35 +01:00
oy 0c05b3bfa1 fixed compiling with vs2008 (#932) 2012-02-05 13:22:39 +01: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
oy 672b70e9b9 fixed some line endings 2012-01-08 13:57:40 +01:00
oy be37147342 fixed border rendering in the editor's image preview. Closes #908 2012-01-08 01:47:53 +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 6ad6d59b6f fixed memory corruption with snd_buffer_size config 2012-01-06 19:27:18 +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 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
GreYFoX c46f3e06e7 Merge branch 'master' of git://github.com/oy/teeworlds into DDRace 2012-01-04 20:10:07 +02: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
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
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 8b76105cfa cleaned up some of the code 2011-12-31 14:00:49 +01:00
Magnus Auvinen 6e57620c2c added flags for mipmap generation on textures. fixes missing texts 2011-12-31 11:18:55 +01: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 8a91bfa1dd fixed texture upload support. removed raw gl calls from the text render 2011-12-31 09:40:11 +01:00
Magnus Auvinen 50e75da333 fixed so that the resolusion is set correctly on init 2011-12-31 01:23:04 +01:00
Magnus Auvinen 09b785a290 splitted out the graphics threaded into a separate header 2011-12-31 01:11:24 +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
oy 988b1c22cf fixed that the server browser list gets sorted twice on a new entry 2011-12-29 13:06:53 +01:00
oy af9775f400 fixed texture increasing in the text renderer 2011-12-29 13:03:06 +01:00
Shereef Marzouk c496bf3c4e Merge branch 'master' of https://github.com/oy/teeworlds into DDRace
Conflicts:
	bam.lua
	scripts/make_release.py
2011-12-14 17:01:47 +02:00
oy 6e20c32859 removed some resource loading spam. Closes #894 2011-12-10 18:23:29 +01:00
GreYFoX 1446d0980b Merge branch 'master' of git://github.com/oy/teeworlds into DDRace
* Version 1.098a
Conflicts:
	bam.lua
	src/game/client/gameclient.h
	src/game/mapitems.h
2011-12-05 11:32:01 +02:00
oy 0fdc9c1b8e cleaned up few things 2011-12-04 14:17:05 +01:00