Ravomavain
|
47a1e2b230
|
Fix banmaster compilation. Fix some sign-compare warnings
|
2011-08-26 16:28:13 +02:00 |
|
GreYFoX
|
de4a95c5d2
|
Merge branch 'master' of git://github.com/oy/teeworlds into DDRace0611
|
2011-08-20 06:50:06 +02:00 |
|
oy
|
b1e7797b19
|
fixed compiling with mingw
|
2011-08-19 00:12:30 +02:00 |
|
SushiTee
|
2ceb0fde91
|
fixed editor zooming if gui is not active
|
2011-08-16 23:15:51 +02:00 |
|
oy
|
2708256186
|
fixed quad selection via envelope preview
|
2011-08-16 21:35:00 +02:00 |
|
oy
|
f36cc57bdd
|
fixed last commit
|
2011-08-15 20:12:31 +02:00 |
|
Alexandre
|
de5eccef3f
|
Fix Stuffs & clean comments
|
2011-08-15 18:07:09 +02:00 |
|
Alexandre
|
367bb4b837
|
Map Editor: Envelope Preview
|
2011-08-15 18:07:05 +02:00 |
|
oy
|
c38c632d06
|
fixed multiple popup creation in the editor. Closes #836
|
2011-08-13 19:22:01 +02:00 |
|
oy
|
4e830a71a1
|
decreased top offset of image add button in the editor. Closes #834
|
2011-08-13 18:53:41 +02:00 |
|
oy
|
7058726236
|
changed default UiPage to PAGE_INTERNET. Closes #839
|
2011-08-13 18:50:17 +02:00 |
|
GreYFoX
|
06afe36db4
|
Removed old hook through prediction as 0.5.2 servers are no longer compatible
made it possible to load old maps
Enumerated layers
|
2011-08-13 02:12:40 +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 |
|
Shereef Marzouk
|
c6fd4a2cc5
|
General whitespace and tab cleanup
|
2011-08-11 10:59:14 +02:00 |
|
Shereef Marzouk
|
2084febca7
|
Removed outdated comment
|
2011-08-11 10:43:27 +02:00 |
|
oy
|
5fc5b63dac
|
just list the correct envelope types(colour/pos) when linking an envelope to a quad/tile layer
|
2011-08-06 22:30:18 +02:00 |
|
oy
|
de05682d87
|
fixed play hooking when tune player_collision is 0. Closes #825
|
2011-08-06 13:57:59 +02:00 |
|
oy
|
003c0aa281
|
fixed aspect ratio in the editor's image preview. Closes #784
|
2011-08-06 13:08:29 +02:00 |
|
oy
|
f1ea039df7
|
added separator in image menu. Closes #785
|
2011-08-05 19:52:39 +02:00 |
|
oy
|
2b2ddde04f
|
sort players in kick/move to spec vote and player options by team. Closes #809
|
2011-08-05 19:52:38 +02:00 |
|
oy
|
e5395f00b3
|
fixed that activating a quad point doesn't align it on the grid and made moving the pivot use the grid. Closes#792
|
2011-08-05 19:52:37 +02:00 |
|
oy
|
fee2c2c452
|
fixed an overlapping in the editor. Closes #794
|
2011-08-05 19:52:36 +02:00 |
|
oy
|
b7605dd0b5
|
reset quad point selection when activating a different quad. Closes #819
|
2011-08-05 19:52:34 +02:00 |
|
oy
|
72eb98c75e
|
changed to trunk again
|
2011-08-05 19:52:33 +02:00 |
|
oy
|
709c05bb37
|
improved description for restart command. Closes #796
|
2011-08-05 19:52:32 +02:00 |
|
oy
|
2aee50d5b1
|
fixed a nasty noise problem. Closes #812
|
2011-08-05 18:37:59 +02:00 |
|
oy
|
dfd9e142d5
|
Merge pull request #801 from fisted/fix_srs
here is clevar solution for serious design flaw
|
2011-08-03 13:54:48 -07:00 |
|
oy
|
435639636e
|
Merge pull request #808 from SushiTee/master
fixed a warning
|
2011-08-03 13:53:18 -07:00 |
|
Shereef Marzouk
|
8877cf2293
|
Refactored some pointers
|
2011-08-02 12:35:14 +02:00 |
|
Shereef Marzouk
|
2b5c532589
|
converted white spaces to tabs
|
2011-08-02 12:14:49 +02:00 |
|
Shereef Marzouk
|
c1b23535ff
|
fixed typo
|
2011-08-02 12:14:23 +02:00 |
|
Shereef Marzouk
|
29de27f9dd
|
Used the enum const TILESLAYERFLAG_GAME instead of 1
|
2011-08-02 12:14:00 +02:00 |
|
SushiTee
|
83652c91ec
|
fixed a warning in client (mac)
|
2011-08-01 21:03:51 +02:00 |
|
SushiTee
|
370b93d8e1
|
fixed a warning
|
2011-08-01 12:11:10 +02:00 |
|
oy
|
50edfd37c0
|
made 0.6.1 release
|
2011-07-31 23:17:00 +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
|
3209aec45f
|
fixed compiling error on osx
|
2011-07-31 13:17:38 +02:00 |
|
oy
|
9418802150
|
protected econ authentication against brute force
|
2011-07-31 13:05:12 +02:00 |
|
oy
|
1705c90e14
|
fixed ban for life on the server
|
2011-07-31 12:43:35 +02:00 |
|
oy
|
aabac3dcfc
|
send notification to enter a password when a client connects to econ. Closes #803
|
2011-07-31 02:25:55 +02:00 |
|
oy
|
9349af0085
|
clean up econ sockets on shutdown. Closes #804
|
2011-07-31 02:20:46 +02:00 |
|
oy
|
10c3e844d7
|
show alpha2 country code strings next to the flag in the country code selectors. Closes #805
|
2011-07-31 02:04:46 +02:00 |
|
oy
|
8d0cc2a825
|
reduced stack memory usage of CDataFileWriter
|
2011-07-31 01:40:28 +02:00 |
|
oy
|
34132ce244
|
fixed client crash in debug
|
2011-07-31 01:38:45 +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 |
|
oy
|
0f11cf014c
|
increased length for help string of temporary commands
|
2011-07-30 18:19:15 +02:00 |
|
oy
|
7db6d1e056
|
fixed problem with player collision. Closes #722
|
2011-07-30 18:08:24 +02:00 |
|
oy
|
b3e8506f20
|
create client on heap. Closes #744
|
2011-07-30 13:50:22 +02:00 |
|
oy
|
a0a62bcd70
|
fixed econ feature and tcp
|
2011-07-30 13:40:01 +02:00 |
|
heinrich5991
|
b0fdc40959
|
deleted unnecessary empty files
|
2011-07-29 17:51:19 +02:00 |
|
heinrich5991
|
2ba6fbd731
|
added econ functionality
|
2011-07-29 17:51:14 +02:00 |
|
oy
|
65d312fd06
|
fixed problem with lineinput. Closes #802
|
2011-07-28 22:01:14 +02:00 |
|
GreYFoX
|
74462d4611
|
enumerated laser types, made it possible to choose which weapon to disable using switch layer delay variable
|
2011-07-25 22:16:20 +02:00 |
|
GreYFoX
|
831aea796e
|
Saving hitting status on pause
|
2011-07-25 21:15:51 +02:00 |
|
fisted
|
7197d7bc13
|
extensive source layout enhancement
|
2011-07-25 18:28:02 +02:00 |
|
Choupom
|
b7aa8af7aa
|
thats why magic values sux
|
2011-07-23 18:42:51 +02:00 |
|
GreYFoX
|
344944c9d4
|
--b * 2
|
2011-07-22 16:23:03 +02:00 |
|
GreYFoX
|
d965eb7453
|
utter noobness
|
2011-07-22 16:15:39 +02:00 |
|
GreYFoX
|
cdbbf9e74b
|
Removed a useless line
ps. commiting from the car while driving via iPhone xD
|
2011-07-22 16:02:56 +02:00 |
|
GreYFoX
|
dd015c33c0
|
Fixing the sound for the laser when a player DCs after shooting it
|
2011-07-22 15:03:15 +02:00 |
|
GreYFoX
|
8f927a6033
|
Fixed a crash
|
2011-07-22 14:52:28 +02:00 |
|
GreYFoX
|
d7fe844690
|
1.082a
|
2011-07-22 14:33:07 +02:00 |
|
GreYFoX
|
2964919bf2
|
Some logic fixes
|
2011-07-22 14:29:27 +02:00 |
|
GreYFoX
|
b0420e66ee
|
used Teams() instead of ((CGameControllerDDRace*)GameServer()->m_pController)->m_Teams
|
2011-07-22 00:01:12 +02:00 |
|
GreYFoX
|
3d07ffdbdd
|
Added the Missing Single Tee No Hitting Logic
|
2011-07-21 03:13:59 +02:00 |
|
oy
|
6312a2d71c
|
fixed few things in th editor
|
2011-07-20 22:18:31 +02:00 |
|
Choupom
|
84e5c53432
|
added color envelope feature for tilemaps
|
2011-07-20 22:04:13 +02:00 |
|
Choupom
|
c2e8bf5035
|
made a constant for game layer flag
|
2011-07-20 21:54:23 +02:00 |
|
Choupom
|
188e622373
|
fixed auto_map.h header guard
|
2011-07-20 21:54:19 +02:00 |
|
Choupom
|
6b2dc40570
|
fixed a rcon authentication issue
|
2011-07-20 21:49:38 +02:00 |
|
GreYFoX
|
959b11b13d
|
Admin protection closes #59
|
2011-07-20 03:18:03 +02:00 |
|
GreYFoX
|
a6922db418
|
1.081a
|
2011-07-19 23:33:46 +02:00 |
|
GreYFoX
|
1dfd2882d2
|
Added Hit as a tile
Entities are in the previous commit
|
2011-07-19 23:33:12 +02:00 |
|
SushiTee
|
f7a9e80163
|
added possibility to collapse groups by double clicking them
|
2011-07-15 01:03:22 +02:00 |
|
SushiTee
|
ef881a5321
|
added layer/image scrolling via mouse wheel
|
2011-07-15 01:02:11 +02:00 |
|
SushiTee
|
d78c0d66e5
|
ability to name groups and layers
|
2011-07-15 00:47:52 +02:00 |
|
SushiTee
|
a3fec2f9f3
|
fixed clipping on some machines
|
2011-07-15 00:39:37 +02:00 |
|
oy
|
571dff6216
|
made rcon auto completion serverside. Closes #97
|
2011-07-14 22:07:21 +02:00 |
|
oy
|
5f4a5b3366
|
added country flags to language selectors
|
2011-07-12 20:33:53 +02:00 |
|
SushiTee
|
6cd2ab3887
|
added grid to editor
|
2011-07-11 12:03:16 +02:00 |
|
oy
|
f4ce34f01c
|
close spectator/emoticon menu when changing to team/spectator via bind. Closes #768
|
2011-07-11 12:02:45 +02:00 |
|
oy
|
d28108b8ad
|
fixed few issues with masters.cfg
|
2011-07-11 12:00:13 +02:00 |
|
Romain Labolle
|
a6dc6f34b6
|
Display a message when an admin forces a vote. Closes #759
|
2011-07-11 11:28:04 +02:00 |
|
oy
|
fc13cc6c18
|
cleaned up last commit
|
2011-07-11 11:26:41 +02:00 |
|
Romain Labolle
|
1058fe27f2
|
Allow multi-file input for dilate and tilset_borderfix commands
|
2011-07-11 11:22:04 +02:00 |
|
oy
|
7bc07b613f
|
added auto mapping feature by LordSkelethom
|
2011-07-09 01:09:06 +02:00 |
|
oy
|
f440944905
|
fixed problem with rcon authentication
|
2011-07-08 00:00:38 +02:00 |
|
oy
|
e37d536fdf
|
fixed some NETTYPE usage based on the socket state
|
2011-07-07 01:48:00 +02:00 |
|
oy
|
83d8422c4c
|
added "fixed tcp and added ipv6 tcp support" by SushiTee
|
2011-07-06 18:20:46 +02:00 |
|
oy
|
e18390fea8
|
fixed that client resets tuning. Closes #746
|
2011-07-05 23:32:32 +02:00 |
|
oy
|
20fbe2f92c
|
fixed that player friends are marked as online in the friends list if they match a clan friend
|
2011-07-05 23:23:33 +02:00 |
|
oy
|
ac9c3b8f7f
|
made the dropped flag sign blink faster the last 5 seconds to indicate that it's about to return. Closes #631
|
2011-07-05 23:15:24 +02:00 |
|
oy
|
ab1f7d6f95
|
clamped information flow when moving as spectator in free-view. Closes #551
|
2011-07-05 22:58:54 +02:00 |
|
oy
|
1ae474689d
|
added moderator support for the remote console. #518
|
2011-07-05 21:54:10 +02:00 |
|
oy
|
b153003b0b
|
fixed dm wincheck
|
2011-07-04 18:30:24 +02:00 |
|
oy
|
7648ba3024
|
added a different mouse sens for menus/editor
|
2011-07-03 00:36:07 +02:00 |
|
Choupom
|
520683c0aa
|
made so background musics restart where they got stopped
|
2011-07-02 19:24:21 +02:00 |
|