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
|
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 |
|
oy
|
06115dd49d
|
added "Whitespace and line Endings cleanup" by GreYFoX
|
2011-04-13 20:37:12 +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 |
|
GreYFoX
|
0cbcdd027a
|
Removed Helper made Moderators able to moderate only
Enumerated levels
http://ddrace.info/forum/showthread.php?t=528
or modify the server and change the game type to something other than DDRace thank you
|
2011-03-16 16:27:30 +02:00 |
|
oy
|
b834426548
|
fixed several problems with spectator view in game and demo player. Closes #83
|
2011-03-12 18:07:57 +01:00 |
|
oy
|
7b98b3dded
|
fixed camera in spectator mode
|
2011-03-10 17:57:15 +01:00 |
|
oy
|
ee2f625754
|
added extended spectator mode. Closes #28
|
2011-03-10 10:08:14 +01:00 |
|
oy
|
9811c2396b
|
made network clip flags. Closes #131
|
2011-03-04 17:08:10 +01:00 |
|
oy
|
4bede550be
|
only update the ping if the scoreboard is active. Closes #27
|
2011-03-01 18:31:20 +01:00 |
|
GreYFoXGTi
|
6e3818c779
|
Don't Reset Controls
|
2011-02-16 12:59:30 +02:00 |
|
GreYFoXGTi
|
f83132448d
|
Merged Oy, Isolated Freeze from Deep Freeze
|
2011-02-13 19:32:06 +02:00 |
|
SushiTee
|
c0b905f852
|
-fixed compiler warnings
-fixed mac compiling
|
2011-01-26 14:45:44 +02:00 |
|
GreYFoXGTi
|
2151883b43
|
Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
src/game/gamecore.cpp
src/game/server/entities/character.cpp
src/game/server/entities/laser.cpp
src/game/server/entities/pickup.cpp
src/game/server/entities/projectile.cpp
src/game/server/entity.h
src/game/server/gamecontext.cpp
src/game/server/player.cpp
src/game/variables.h
|
2011-01-20 16:10:32 +02:00 |
|
oy
|
216967c3bf
|
release gameclient components when opening the editor. Closes #429
|
2011-01-17 12:28:37 +01:00 |
|
GreYFoXGTi
|
5d9ee1736e
|
made the code so it would have less conflicts in the future and Merged branch 'master' of http://github.com/oy/teeworlds
Conflicts:
data/languages/dutch.txt
data/languages/french.txt
data/languages/german.txt
data/languages/russian.txt
src/game/server/entities/flag.cpp
src/game/server/entities/flag.h
src/game/server/gamecontext.cpp
src/game/server/gamemodes/ctf.cpp
src/game/server/gamemodes/ctf.h
src/game/server/gamemodes/dm.cpp
src/game/server/gamemodes/dm.h
src/game/server/gamemodes/mod.cpp
src/game/server/gamemodes/tdm.cpp
src/game/server/gamemodes/tdm.h
|
2010-11-22 00:26:00 +02:00 |
|
oy
|
8e3cba8dbf
|
disable free view when chatting as spectator. Closes #303
|
2010-11-21 18:05:26 +01:00 |
|
Sworddragon
|
fc9211c777
|
Updated copyrights
|
2010-11-20 21:26:06 +01:00 |
|
GreYFoXGTi
|
896634a061
|
Total Cleanup
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-09-30 23:28:06 +03:00 |
|
GreYFoXGTi
|
67a5765c9f
|
Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
src/engine/server/server.cpp
src/engine/shared/config_variables.h
src/game/client/components/camera.cpp
src/game/client/components/camera.h
src/game/editor/ed_editor.cpp
src/game/editor/ed_layer_tiles.cpp
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-09-19 21:27:40 +03:00 |
|
oy
|
80b570c795
|
fixed view offset when changing from spectator to player. Closes #152
|
2010-09-19 16:00:46 +02:00 |
|
btd
|
909c583d96
|
End merge
|
2010-08-26 00:30:21 +04:00 |
|
GreYFoXGTi
|
7f8fb7a5a7
|
Merging the client manually into the server
but i can't get the client to accept the console class of the server -.-" yet..
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-08-25 17:31:49 +02:00 |
|
oy
|
d37c83962d
|
fixed weapon change on start bug
|
2010-08-10 13:54:13 +02:00 |
|
oy
|
ad1ce01446
|
fixed shotbug (#80)
|
2010-06-03 02:57:46 +08:00 |
|
Tom Adams
|
f14e7369f1
|
fixed movement bug (#741)
|
2010-05-31 21:40:40 +00:00 |
|
Magnus Auvinen
|
72c06a2589
|
copied refactor to trunk
|
2010-05-29 07:25:38 +00:00 |
|
Magnus Auvinen
|
cdc5f26900
|
new font rendering system using freetype2. only compiles under linux for now
|
2009-06-07 14:36:54 +00:00 |
|
Alfred Eriksson
|
82f9be8ce0
|
added help messages for all commands. added syntax in the help msg
|
2009-01-24 14:10:26 +00:00 |
|
Magnus Auvinen
|
5f186c8906
|
fixed so the console show help for each command. not all commands have descriptions however
|
2009-01-24 13:12:04 +00:00 |
|
Magnus Auvinen
|
9d51d47cea
|
added tab completion to the console. works for local and remote
|
2009-01-24 12:16:02 +00:00 |
|
Magnus Auvinen
|
24899a13e8
|
improved the prediction timer to handle crappy connections better
|
2009-01-21 00:05:07 +00:00 |
|
Alfred Eriksson
|
397804cdc4
|
fixed dynamic nameplates bug #674
|
2009-01-17 17:06:24 +00:00 |
|
Magnus Auvinen
|
1dc158bb78
|
fixed so when you are in not in playing mode, the input snapping drops to 1hz to save even more bandwidth
|
2009-01-10 13:34:01 +00:00 |
|
Magnus Auvinen
|
c79402d075
|
increased input snapping rate from 5hz to 10hz inorder to predict the network latency better
|
2009-01-10 11:50:31 +00:00 |
|
Alfred Eriksson
|
00794899d6
|
paused the aiming when game is paused
|
2008-11-16 15:39:22 +00:00 |
|
Magnus Auvinen
|
9f7a6a04b0
|
correctly paused input for game when chatting or in menu
|
2008-10-20 22:53:42 +00:00 |
|
Magnus Auvinen
|
ed4d4bfdc4
|
fixed cursor problems
|
2008-09-13 05:57:11 +00:00 |
|
Dominik Geyer
|
51a9d23dae
|
fixed spectator mode freeview
|
2008-09-09 15:50:41 +00:00 |
|
Magnus Auvinen
|
fa266334fd
|
fixed on_console_init and on_save
|
2008-09-04 21:36:44 +00:00 |
|
Magnus Auvinen
|
04eddacd65
|
setting of correct game type in game controller. fixed gametype filter in browser. various cleanups
|
2008-08-31 21:50:14 +00:00 |
|
Magnus Auvinen
|
cd7a3519a7
|
added the loading screen again
|
2008-08-30 22:38:56 +00:00 |
|
Magnus Auvinen
|
72ec4f1a9d
|
fixed weapon switching
|
2008-08-27 20:04:07 +00:00 |
|
Magnus Auvinen
|
ae364d4d29
|
scoreboard fixed
|
2008-08-27 19:50:33 +00:00 |
|
Magnus Auvinen
|
dfe499248f
|
major commit. game client restructure. not complete, loads of stuff not working, but the structure is there
|
2008-08-27 15:48:50 +00:00 |
|