Commit graph

7149 commits

Author SHA1 Message Date
GreYFoXGTi 7029c93507 /EHsc 2010-10-08 13:57:29 +02:00
GreYFoXGTi 6ca75f086e Merge branch 'master' of http://github.com/oy/teeworlds 2010-10-08 13:37:38 +02:00
oy a075889312 fixed a listing problem in the demo browser 2010-10-08 00:13:05 +02:00
oy 04234c109e show filename of the map in the editor. Closes #122 2010-10-08 00:04:46 +02:00
oy 6a26cd6621 fixed various problems with the file dialog in the editor 2010-10-07 23:51:07 +02:00
GreYFoXGTi a1a2a6aa75 Modified Broadcast Message out of Race
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-10-07 16:32:11 +02:00
GreYFoXGTi 48b205fac4 Merge branch 'master' of github.com:GreYFoXGTi/DDRace into Cleanup 2010-10-07 15:34:11 +02:00
GreYFoXGTi faaa8c241e Merge branch 'master' of http://github.com/oy/teeworlds into Cleanup 2010-10-07 15:33:48 +02:00
GreYFoXGTi 5f0cf76e4f Revert "Reworked laser rotation. Opens #59."
This reverts commit be122406ef.
2010-10-07 15:28:29 +02:00
GreYFoXGTi cf08ccb597 Fixed Doors + Switches creation, Closes #77.
DDRace.cpp and gamecontext.cpp cleanup, old comments that are not needed
2010-10-07 15:22:03 +02:00
GreYFoXGTi 76f1dff55e Merge branch 'master' of http://github.com/btd/DDRace 2010-10-07 14:31:50 +02:00
btd fb93343873 Make work chat all and chat team both 2010-10-07 16:10:49 +04:00
GreYFoXGTi c836c7f1f7 Merge branch 'master' of github.com:GreYFoXGTi/DDRace into Cleanup 2010-10-07 04:02:49 +02:00
GreYFoXGTi ee6cb26e90 Can;t Super again if you are super
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-10-07 04:02:24 +02:00
GreYFoXGTi d5b758d9c7 Fixed a MaxSpeed Speeder Bug
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-10-07 01:12:31 +02:00
GreYFoXGTi cfe7ef6f38 Merge branch 'master' of github.com:GreYFoXGTi/DDRace into Cleanup 2010-10-06 23:48:39 +02:00
GreYFoXGTi 304084434b Created Destructor for Layers and Collision but making them default Destructor didn't work so i made them normal functions and called them as needed, i am not sure this is the right way though. Closes #74, Closes #35.(#35 Needs in depth testing, i tested for 3 minutes copying stuff around)
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-10-06 23:47:23 +02:00
oy 3a98f7a048 added mod system. Closes #34 2010-10-06 23:07:35 +02:00
GreYFoXGTi 59bd0f1c87 Merge branch 'master' of github.com:GreYFoXGTi/DDRace into Cleanup 2010-10-06 22:48:24 +02:00
btd c4b6094ebb Make team chat working properly.
If you in team 0 your messages for all if not in team 0 your messages only for team members
2010-10-07 00:35:19 +04:00
btd d91690b619 Fix plasma 2010-10-05 00:39:23 +04:00
btd 94cd8159a3 Fix kill tile 2010-10-05 00:11:10 +04:00
btd 4571836f25 New entities, Thanks Fisico. 2010-10-04 23:55:36 +04:00
btd 538efe273b Clean Tele Layer initialization and holding. 2010-10-04 23:17:56 +04:00
btd 3f7c5c4413 Fix crashing on Mo(2) map, Thanks him 2010-10-04 22:51:16 +04:00
btd cdc2cfe220 Fix destructor 2010-10-04 22:43:25 +04:00
btd 6969851ca3 Clean up Doors and Teleport initialization. 2010-10-04 22:37:39 +04:00
btd b1cadd2d4d See this carefully 2010-10-04 11:59:16 +04:00
btd b07cc717d4 Fix plasmas 2010-10-04 11:45:10 +04:00
btd c87a68b2ba Log messages to try undestand client prediction bug 2010-10-02 16:04:39 +04:00
btd ecd5f296ef This is good to make so. Maybe this is not bad. Now when you join to any team your cannot use hack with finish status. 2010-10-02 15:54:43 +04:00
GreYFoXGTi dff5a70b91 Merge branch 'master' of github.com:GreYFoXGTi/DDRace into Cleanup
Conflicts:
	src/game/editor/ed_editor.cpp
	src/game/server/entities/character.cpp
	src/game/server/entities/projectile.cpp
2010-10-02 03:32:44 +02:00
GreYFoXGTi 5bdb8090af Fixed Projectile Team mask
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-10-02 03:25:42 +02:00
GreYFoXGTi dd500710b5 Reworked Character snap
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-10-02 03:06:15 +02:00
GreYFoXGTi badfdcb968 you need to be super to be able to unsuper
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-10-02 02:07:59 +02:00
GreYFoXGTi d20b7360b8 unsuper me now returns you to the previous team
forgot some dbgmsg
2010-10-02 02:06:42 +02:00
GreYFoXGTi 301a9d6953 Enhanced GetMapIndices preformance
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-10-02 01:40:01 +02:00
GreYFoXGTi 8fc790a4c3 lol.... fixed evil teleporters 2010-10-02 00:52:22 +02:00
GreYFoXGTi 0763a62601 fixed unsafe /team
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-10-02 00:45:11 +02:00
GreYFoXGTi be122406ef Reworked laser rotation. Closes #59.
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-10-02 00:00:41 +02:00
GreYFoXGTi 16bb3621c3 Not only the main game layer is always on top, all game layers are on top of other layers, but in a specified order to each other. Closes #38. again 2010-10-01 21:28:56 +02:00
GreYFoXGTi 56c4655e55 Merge branch 'master' of github.com:GreYFoXGTi/DDRace into Cleanup 2010-10-01 19:33:39 +02:00
GreYFoXGTi 8a5d1100a5 This reverts commit b4b2404303.
thanks to Speedy-Consoles for pointing out the commit

Closes #54.

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-10-01 19:25:54 +02:00
GreYFoXGTi e885fcb8a2 Merge branch 'master' of http://github.com/oy/teeworlds into Cleanup 2010-10-01 13:08:13 +02:00
oy a62a7413d1 made linereader work with window line endings. Closes #196 2010-10-01 12:43:44 +02:00
GreYFoXGTi f3e33d8e82 Merge branch 'master' of github.com:GreYFoXGTi/DDRace into Cleanup
Conflicts:
	src/game/client/components/hud.cpp
	src/game/server/entities/character.cpp
2010-10-01 04:05:46 +02:00
SushiTee 1f5849f6dc fixed last digit in current time 2010-10-01 04:03:08 +02:00
SushiTee 8824d41011 race time wasnt in center 2010-10-01 04:03:07 +02:00
oy 67e9f03f23 when setting a config string variable check if it's a utf8 string and encode it if the check fails. Closes #10 2010-10-01 00:55:16 +02:00
GreYFoXGTi 34d6f06e9f Updated the time string
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-10-01 00:40:32 +02:00