edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-05 15:48:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
16298 commits 1 branch 428 tags 411 MiB
Commit graph

16298 commits

This branch
This branch
All branches
Author SHA1 Message Date
def 1d09dfa004 Add compiler colors when using ninja 2019-04-11 08:12:40 +02:00
bors[bot] 279eeed9fc Merge #1614 
1614: Remove unmaintained Android code (fixes #1575) r=heinrich5991 a=def-

Thoughts?

Co-authored-by: def <dennis@felsin9.de>
 2019-04-11 00:02:17 +00:00
bors[bot] 92a0dc8366 Merge #1618 
1618: Implement color_to_rgb r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
 2019-04-10 23:38:29 +00:00
bors[bot] 933f938b48 Merge #1619 
1619: Rcon console fixes r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
 2019-04-10 23:27:13 +00:00
def b91530eedc Console: Can't deallocate temp entries, so don't even try 2019-04-10 23:32:45 +02:00
def ab9912c9c1 Rcon console: Don't show duplicates 
when connecting to next server after old server shutdown
 2019-04-10 23:31:06 +02:00
def 2eab795c9e Implement color_to_rgb 2019-04-10 22:45:30 +02:00
bors[bot] 6de90cbe44 Merge #1615 
1615: fix no score when joining when using file based score r=def- a=fokkonaut



Co-authored-by: fokkonaut <35420825+fokkonaut@users.noreply.github.com>
 2019-04-10 20:14:12 +00:00
fokkonaut 15658b3b10
removed brackets 2019-04-10 22:13:10 +02:00
def 279d6e60ca No duplicate () on rank 2019-04-10 22:05:44 +02:00
fokkonaut b92607eb7d
fix no score when joining when using file based score 2019-04-10 21:40:31 +02:00
def 94f3d97ddf Remove unmaintained Android code (fixes #1575) 2019-04-10 19:40:50 +02:00
def 11127f9344 Release fixes 2019-04-10 17:57:56 +02:00
Dennis Felsing 93b88647eb
Merge pull request #1612 from def-/pr-12.1 
Version 12.1
 2019-04-10 17:38:37 +02:00
Dennis Felsing ed34dcfec5
Merge pull request #1602 from def-/pr-explain-tiles 
Explain game tiles and entities in editor (fixes #1600)
 2019-04-10 17:38:22 +02:00
Dennis Felsing 5d79c41010
Merge pull request #1603 from def-/pr-demo-open 
Enable dragging demo file into client to play it directly
 2019-04-10 17:38:00 +02:00
Dennis Felsing 2d69935a6b Add explanations for TILE_THROUGH_CUT/ALL/DIR 2019-04-10 15:48:23 +02:00
bors[bot] f0cce17bfc Merge #1597 
1597: Console command "color_from_rgb" (fixes #1581) r=heinrich5991 a=def-

Converts RGB colors to TW's HSL format

Co-authored-by: def <dennis@felsin9.de>
Co-authored-by: Dennis Felsing <dennis@felsin9.de>
 2019-04-10 12:21:19 +00:00
Dennis Felsing fc5810fa56 Version 12.1 2019-04-10 14:17:06 +02:00
Dennis Felsing 7c0f4c9856 Address reviewer comments 2019-04-10 09:00:06 +02:00
Dennis Felsing bd4e3716a1 color -> color_from_rgb 2019-04-10 08:58:08 +02:00
bors[bot] b05b268a6a Merge #1598 #1601 #1605 #1606 #1607 #1609 
1598: Fix home/end keys in console r=heinrich5991 a=def-



1601: 2 more tries to force DB to respond in UTF8 (fixes #1599) r=heinrich5991 a=def-



1605: Fix memory leak in draggers r=heinrich5991 a=def-



1606: Always initialize m_InfosLoaded r=heinrich5991 a=def-

otherwise it's uninitialized and then read, found by valgrind --tool=memcheck

1607: Enable a few more GCC warnings r=heinrich5991 a=def-



1609: Fix C90 compatibility on Windows r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
 2019-04-09 22:09:18 +00:00
bors[bot] f84f96629d Merge #1611 
1611: Clear up instructions on using make r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
 2019-04-09 21:31:58 +00:00
def 85503c381a Add -GNinja mention in README 2019-04-09 23:30:14 +02:00
def 11162f84eb Clear up instructions on using make 2019-04-09 22:54:41 +02:00
def fe432b8ae4 Enable a few more GCC warnings 2019-04-09 22:05:21 +02:00
def 0e7a514c7b Fix C90 compatibility on Windows 2019-04-09 21:58:04 +02:00
Dennis Felsing bdb579330d Improve game tile explanations a bit 
As suggested by Bojidar and jao
 2019-04-09 14:23:40 +02:00
bors[bot] d4d6ab681d Merge #1593 
1593: Add emacs style ctrl-a ctrl-e navigation r=def- a=ChillerDragon

Im sure im not the only one who keeps pressing ctrl-a and ctrl-e in the teewoods console and nothing happens .-.

Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
 2019-04-09 10:54:04 +00:00
ChillerDragon 0b18d6eb44 Remove if nesting for compose keys in console 2019-04-09 12:11:29 +02:00
def 05fe69751d Add jao's explanations for telegun 2019-04-08 22:36:47 +02:00
def c3e36ee483 Always initialize m_InfosLoaded 2019-04-08 22:13:47 +02:00
def 708019c675 Grammar fix: Catched -> Caught 2019-04-08 21:54:33 +02:00
def 173b43d487 Fix memory leak in draggers 2019-04-08 21:54:12 +02:00
bors[bot] e11b7d684a Merge #1604 
1604: Fix crash when draggers don't have a number r=def- a=12pm



Co-authored-by: 12pm <30786226+12pm@users.noreply.github.com>
 2019-04-08 19:49:34 +00:00
12pm 7b95d38bf3 Fix crash when draggers don't have a number 2019-04-08 21:47:22 +02:00
def cca80da554 Enable dragging demo file into client to play it directly 2019-04-08 21:43:59 +02:00
def eda16acbca Explain game tiles and entities in editor (fixes #1600) 
- Explanations by Lady Saavik taken from https://ddnet.tw/explain/
- CCW/CW were mixed up in enum names, fixed
- Make sure that the texts fits, otherwise reduce font size
- Still need explanations for Portal tiles
 2019-04-08 19:39:56 +02:00
def ea093f6d39 2 more tries to force DB to respond in UTF8 (fixes #1599) 2019-04-08 16:55:53 +02:00
def 527859e70c Fix home/end keys in console 2019-04-07 23:28:30 +02:00
def 01ffde25f3 Console command "colors" (fixes #1581) 
Converts RGB colors to TW's HSL format
 2019-04-07 22:54:29 +02:00
Ryozuki 5641a9541c
ups 2019-04-07 21:19:31 +02:00
Ryozuki be708d0498
a mess 2019-04-07 21:18:43 +02:00
bors[bot] a4e2130342 Merge #1571 
1571: show_ips r=heinrich5991 a=def-

The problem is that the same console output is sent to all right now,
not sure how to change that cleanly

Co-authored-by: def <dennis@felsin9.de>
 2019-04-07 19:01:21 +00:00
bors[bot] 52c00dcc02 Merge #1573 
1573: Handle FS failures while updating (fixes #1560) r=heinrich5991 a=def-

Not sure if I caught all locations

Co-authored-by: def <dennis@felsin9.de>
 2019-04-07 18:50:08 +00:00
Ryozuki 0138dd32e3
apply alpha to solo players 2019-04-07 19:42:26 +02:00
Ryozuki 813c24bf29
add m_IsSolo and fix hook col 2019-04-07 18:58:49 +02:00
ChillerDragon e9f8bd42b7 Add emacs style ctrl-a ctrl-e navigation 2019-04-07 15:59:15 +02:00
bors[bot] 4931d00201 Merge #1589 
1589: Remove some code duplication in CSaveTee::LoadString r=def- a=def-

by using a switch-case with fallthroughs, seems like the perfect use case.

Co-authored-by: def <dennis@felsin9.de>
 2019-04-07 12:01:59 +00:00
bors[bot] 79a6ae6ae9 Merge #1592 
1592: Add bound check in datafile.cpp anywhere m_ppDataPtrs is accessed as … r=def- a=ChillerDragon

…an array. Should fix https://github.com/teeworlds/teeworlds/issues/2073

(cherry picked from commit e086f4b35b)

Co-authored-by: Jordy Ruiz <jordy.ruiz@univ-lille.fr>
 2019-04-07 11:28:44 +00:00