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 |
|
oy
|
c20a33ede7
|
added more space for translations in demo details. Closes #592
|
2011-04-03 23:33:43 +02:00 |
|
oy
|
9712e4004c
|
improved the add/remove friend and ignore/notice chat buttons
|
2011-03-29 00:48:36 +02:00 |
|
oy
|
867f944459
|
added graphic buttons for remove/add friend and chat ignore/notice
|
2011-03-28 21:10:37 +02:00 |
|
oy
|
4d5443affa
|
added demo loading speed enhancement by MAP94. Closes #555
|
2011-03-27 16:42:47 +02:00 |
|
oy
|
2aa1bda97e
|
made mouse wheel change speed in demo player. Closes #524
|
2011-03-27 16:26:50 +02:00 |
|
oy
|
b4bec53359
|
added clan name and country flag selector to the player settings
|
2011-03-16 21:31:55 +01:00 |
|
oy
|
be8f669333
|
added extended demo infos in the demo browser
|
2011-03-13 10:41:10 +01:00 |
|
oy
|
a04eb45354
|
added rename button to the demo browser and updated localisation entries
|
2011-03-12 19:08:44 +01: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
|
088ec3e2f3
|
made the client's map search work with sub folders. Closes #254
|
2011-02-21 11:23:30 +01:00 |
|
GreYFoXGTi
|
f83132448d
|
Merged Oy, Isolated Freeze from Deep Freeze
|
2011-02-13 19:32:06 +02:00 |
|
GreYFoXGTi
|
1b2703aaba
|
Refactoring & fixed WEAPONSPEC_GUN in content.py
|
2011-02-12 21:18:41 +01:00 |
|
SushiTee
|
c0b905f852
|
-fixed compiler warnings
-fixed mac compiling
|
2011-01-26 14:45:44 +02:00 |
|
oy
|
3727deee43
|
increased mouse scroll value from 1 to 3 in the other listboxes too
|
2011-01-23 17:54:19 +01:00 |
|
oy
|
9358b24113
|
reset demo player on end and when pressing the stop button. Closes #401
|
2011-01-09 23:42:37 +01:00 |
|
oy
|
13902fef6c
|
show an error popup when demo deletion fails
|
2011-01-05 22:22:07 +01:00 |
|
Damian Kaczmarek
|
073044747b
|
-Working ui_scale parameter.
(doing it properly would require lots of framework/interface job ...)
|
2011-01-05 12:14:36 +01:00 |
|
oy
|
7414271309
|
check the return values of RemoveFile and CreateFolder
|
2010-12-07 23:47:41 +01:00 |
|
oy
|
e4f1e18c4e
|
fixed entry names in the demo browser and the editor's file dialog. Closes #301
|
2010-11-21 12:33:13 +01:00 |
|
oy
|
f75ad090e9
|
fixed a localisation string
|
2010-11-20 23:46:49 +01:00 |
|
Choupom
|
38c2a1b45c
|
fixed so every demo infos are not loaded when making the demos list
|
2010-11-20 21:34:13 +01:00 |
|
Sworddragon
|
fc9211c777
|
Updated copyrights
|
2010-11-20 21:26:06 +01:00 |
|
oy
|
d94355729d
|
added icons in the demo browser and the editor's file dialog. Closes #209
|
2010-11-17 19:46:50 +01:00 |
|
oy
|
1209ad9baf
|
fixed a problem with the skin selector
|
2010-10-25 21:23:05 +02:00 |
|
SushiTee
|
314cda05c7
|
changed demo animations according to demo speed and added some demo speeds. (fixes #206)
|
2010-10-19 18:52:16 +02:00 |
|
oy
|
5801326ebc
|
fixed line endings
|
2010-10-13 12:59:30 +02:00 |
|
oy
|
85b9c60158
|
added info in the demo browser by Choupom
|
2010-10-09 13:27:21 +02:00 |
|
oy
|
a075889312
|
fixed a listing problem in the demo browser
|
2010-10-08 00:13:05 +02:00 |
|
oy
|
3a98f7a048
|
added mod system. Closes #34
|
2010-10-06 23:07:35 +02:00 |
|
oy
|
2f388139c1
|
fixed auto-scrolling in server browser and listbox
|
2010-09-30 01:13:12 +02:00 |
|
oy
|
aaf8e2bc8e
|
cleaned up demo listing and fixed its sorting. Closes #73
|
2010-09-29 00:53:53 +02:00 |
|
oy
|
7e0b37e06c
|
fixed that it checks the current dir for demos too
|
2010-09-24 13:38:03 +02:00 |
|
Choupom
|
1cbf731fc0
|
improved demos listing
|
2010-09-24 13:22:40 +02:00 |
|
oy
|
cf2d46d3ba
|
increased deadzone when seeking through the file in the demo player
|
2010-09-19 16:36:10 +02:00 |
|
oy
|
a2083b31e3
|
fixed last commit
|
2010-09-16 12:48:32 +02:00 |
|
Choupom
|
582763bc21
|
made folders in editor (#80)
|
2010-09-16 12:28:10 +02:00 |
|
oy
|
d4b145a8ee
|
fixed Gui lock while deleting/reading demos. Closes #167
|
2010-09-08 02:27:48 +02:00 |
|
oy
|
eecdff0cf5
|
fixed overlapping in last commit
|
2010-09-07 19:31:20 +02:00 |
|
ghost
|
56c4081da4
|
Demo name is now showed while playing a demo file
|
2010-09-07 19:12:11 +02:00 |
|
oy
|
0cfd1de760
|
fixed line endings
|
2010-09-05 19:06:27 +02:00 |
|
oy
|
5588e1ec8c
|
fixed selected index when deleting a demo and added a popup to confirm the deletion
|
2010-09-05 17:53:31 +02:00 |
|
Choupom
|
fcfaa8389f
|
added Remove button in demos browser (#66)
|
2010-09-05 17:40:51 +02:00 |
|
oy
|
62fe7cd5b2
|
link selected item in the demo list to the first entry (if available) on startup and browse
|
2010-09-05 14:28:08 +02:00 |
|
Choupom
|
8f3e98208e
|
fixed demo browser (#61)
|
2010-09-05 14:13:42 +02:00 |
|
Choupom
|
25be8b1be3
|
fixed so clicking 3 times doesn't generate 2 double-clicks
|
2010-09-05 13:50:10 +02:00 |
|
Fujnky
|
4123f28bba
|
Improved demo player another bit.
* Replaced the reset button by more common stop button
* Made the demo player automatically reset after demo ended
|
2010-09-04 16:23:20 +02:00 |
|
oy
|
16f201794d
|
fixed a variable name
|
2010-08-16 04:12:03 +02:00 |
|
Fujnky
|
4d8c4ffadb
|
Improved the replay control buttons in the demo player a lot.
* Now there is a combined play/pause button + a reset button
* Replaced the ugly strings with nice graphics
|
2010-08-13 03:17:13 +02:00 |
|
oy
|
d471663913
|
added localisation fixes by fujnky
|
2010-08-09 00:35:37 +02:00 |
|
oy
|
ec334a9d68
|
small cleanup
|
2010-06-11 12:34:11 +02:00 |
|
Fujnky
|
f8b9f342d3
|
Fix for l10n in menus_demo.cpp and sime german l10n tweaks.
|
2010-06-11 15:50:47 +08:00 |
|
Choupom
|
8e8cbdb562
|
fix for folders in demo browser
|
2010-06-10 20:38:16 +08:00 |
|
xalduin
|
dc3feaf42c
|
Fixed remaining compiler warnings for gcc on Linux
|
2010-06-10 20:38:03 +08:00 |
|
xalduin
|
be5e19d2bd
|
Fixed some compiler warnings
|
2010-06-09 20:41:00 +08:00 |
|
Choupom
|
848764544f
|
added folders in demo browser (#25)
|
2010-06-04 22:14:02 +02:00 |
|
Fujnky
|
551170656d
|
Fixed localization for 'Error loading demo'-Popup
|
2010-06-03 17:41:45 +02:00 |
|
Magnus Auvinen
|
72c06a2589
|
copied refactor to trunk
|
2010-05-29 07:25:38 +00:00 |
|
Magnus Auvinen
|
878ede3080
|
major update with stuff
|
2009-10-27 14:38:53 +00:00 |
|
Magnus Auvinen
|
7b68ff4277
|
fixed chaining of console commands, allows snatching updates of console variables. cleaned up some code
|
2009-06-15 14:01:36 +00:00 |
|
Magnus Auvinen
|
57b2c49d57
|
fixed so that the demo player doesn't crash when the map isn't found
|
2009-06-15 13:16:33 +00:00 |
|
Magnus Auvinen
|
d023c72256
|
fixed demo browser so it's ordered and shows all files
|
2009-06-15 10:12:16 +00:00 |
|
Magnus Auvinen
|
ab171f8f30
|
updated localization
|
2009-06-15 07:34:25 +00:00 |
|
Magnus Auvinen
|
e447ef04cc
|
fixed so that events isn't processed when scrubbing a demo
|
2008-12-19 11:41:17 +00:00 |
|
Alfred Eriksson
|
9167fdea18
|
fixed demo list refreshing
|
2008-11-17 16:46:21 +00:00 |
|
Magnus Auvinen
|
d15860e44f
|
renamed gc_render* to render*
|
2008-10-20 23:46:39 +00:00 |
|
Magnus Auvinen
|
12472ef7f4
|
major update. continued on ban support. added demo recording (client and server side). added demo player. added demo menu. demos have some quirks and file size optimizations havn't been done yet. some interface tweaks
|
2008-10-06 18:05:01 +00:00 |
|