Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Server browser duplicates #98

Merged
merged 15 commits into from
May 26, 2019
Merged

Server browser duplicates #98

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
b80c842
ui: Cleanup duplicate listings of multiprotocol servers.
dGr8LookinSparky Mar 13, 2019
a7339b6
Remove the --universal tag for installing freetype using homebrew for…
dGr8LookinSparky Mar 14, 2019
f70166f
client: fix demo playback
dGr8LookinSparky Mar 20, 2019
7e3c8a7
client: Avoid accidental stopping of demos from pressing a random key…
dGr8LookinSparky Mar 20, 2019
3d80a23
travis-ci: disable the installation of free type for macos builds.
dGr8LookinSparky Mar 20, 2019
75c27da
license/server:
dGr8LookinSparky Apr 5, 2019
79be706
Force all line endings to be Unix based with git checkouts.
dGr8LookinSparky Apr 9, 2019
c706831
Fix .gitattributes
dGr8LookinSparky Apr 9, 2019
61236ad
Updated README with Windows build/run instructions
cengique May 19, 2019
bcfd271
more README changes
cengique May 19, 2019
564bc9e
Don't attempt to play a demo from the demo playback menu if a demo is…
dGr8LookinSparky May 19, 2019
2d147ad
docker updated to Ubuntu Bionic Beaver. Makefile fixes for MinGW and …
cengique May 20, 2019
415f73f
Merge branch 'server-browser-duplicates' of https://github.com/grange…
cengique May 20, 2019
bf2adc4
updated build instructions using new docker image under grangerhub ac…
cengique May 25, 2019
18ef9b1
Updated Docker and Windows notes in README and Travis CI script
cengique May 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* text eol=lf
2 changes: 0 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@ matrix:
compiler: clang
env: ARCH=x86_64
before_install:
- brew update
- brew install freetype --universal
- rm -rf build
script:
- ./misc/travis-ci-build.sh
Expand Down
879 changes: 610 additions & 269 deletions GPL
View file
Open in desktop

Large diffs are not rendered by default.

28 changes: 24 additions & 4 deletions assets/ui/main.menu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,14 +119,34 @@
}
}

itemDef
{
name mainmenu
text "Demos"
type ITEM_TYPE_BUTTON
style WINDOW_STYLE_EMPTY
textstyle ITEM_TEXTSTYLE_NORMAL
textscale .416
rect X (Y+(3*ELEM_H)) W ELEM_H
textalign ALIGN_RIGHT
backcolor 0 0 0 0
forecolor 1 1 1 1
visible MENU_TRUE
action
{
play "sound/misc/menu1.wav";
open demo
}
}

itemDef
{
name browse_for_folders
text "Browse Folders"
type ITEM_TYPE_BUTTON
style WINDOW_STYLE_EMPTY
textstyle ITEM_TEXTSTYLE_NORMAL
rect X (Y+(3*ELEM_H)) W ELEM_H
rect X (Y+(4*ELEM_H)) W ELEM_H
textscale .416
textalign ALIGN_RIGHT
forecolor 1 1 1 1
Expand All @@ -145,7 +165,7 @@
type ITEM_TYPE_BUTTON
style WINDOW_STYLE_EMPTY
textstyle ITEM_TEXTSTYLE_NORMAL
rect X (Y+(4*ELEM_H)) W ELEM_H
rect X (Y+(5*ELEM_H)) W ELEM_H
textscale .416
textalign ALIGN_RIGHT
forecolor 1 1 1 1
Expand All @@ -164,7 +184,7 @@
type ITEM_TYPE_BUTTON
style WINDOW_STYLE_EMPTY
textstyle ITEM_TEXTSTYLE_NORMAL
rect X (Y+(5*ELEM_H)) W ELEM_H
rect X (Y+(6*ELEM_H)) W ELEM_H
textscale .416
textalign ALIGN_RIGHT
forecolor 1 1 1 1
Expand All @@ -180,7 +200,7 @@
{
name copyright
type ITEM_TYPE_TEXT
text "Copyright (C) 2015-2018 GrangerHub"
text "Copyright (C) 2015-2019 GrangerHub"
style WINDOW_STYLE_EMPTY
textstyle ITEM_TEXTSTYLE_NORMAL
textscale .30
Expand Down
2 changes: 1 addition & 1 deletion external/nettle-3.3/nettle/bignum-random-prime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
or

* the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your
Software Foundation; either version 3 of the License, or (at your
option) any later version.

or both in parallel, as here.
Expand Down
2 changes: 1 addition & 1 deletion external/nettle-3.3/nettle/bignum-random.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
or

* the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your
Software Foundation; either version 3 of the License, or (at your
option) any later version.

or both in parallel, as here.
Expand Down
2 changes: 1 addition & 1 deletion external/nettle-3.3/nettle/bignum.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
or

* the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your
Software Foundation; either version 3 of the License, or (at your
option) any later version.

or both in parallel, as here.
Expand Down
2 changes: 1 addition & 1 deletion external/nettle-3.3/nettle/bignum.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
or

* the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your
Software Foundation; either version 3 of the License, or (at your
option) any later version.

or both in parallel, as here.
Expand Down
2 changes: 1 addition & 1 deletion external/nettle-3.3/nettle/buffer-init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
or

* the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your
Software Foundation; either version 3 of the License, or (at your
option) any later version.

or both in parallel, as here.
Expand Down
2 changes: 1 addition & 1 deletion external/nettle-3.3/nettle/buffer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
or

* the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your
Software Foundation; either version 3 of the License, or (at your
option) any later version.

or both in parallel, as here.
Expand Down
2 changes: 1 addition & 1 deletion external/nettle-3.3/nettle/buffer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
or

* the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your
Software Foundation; either version 3 of the License, or (at your
option) any later version.

or both in parallel, as here.
Expand Down
2 changes: 1 addition & 1 deletion external/nettle-3.3/nettle/gmp-glue.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
or

* the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your
Software Foundation; either version 3 of the License, or (at your
option) any later version.

or both in parallel, as here.
Expand Down
2 changes: 1 addition & 1 deletion external/nettle-3.3/nettle/gmp-glue.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
or

* the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your
Software Foundation; either version 3 of the License, or (at your
option) any later version.

or both in parallel, as here.
Expand Down
2 changes: 1 addition & 1 deletion external/nettle-3.3/nettle/macros.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
or

* the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your
Software Foundation; either version 3 of the License, or (at your
option) any later version.

or both in parallel, as here.
Expand Down
2 changes: 1 addition & 1 deletion external/nettle-3.3/nettle/mini-gmp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ it under the terms of either:
or

* the GNU General Public License as published by the Free Software
Foundation; either version 2 of the License, or (at your option) any
Foundation; either version 3 of the License, or (at your option) any
later version.

or both in parallel, as here.
Expand Down
2 changes: 1 addition & 1 deletion external/nettle-3.3/nettle/mini-gmp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ it under the terms of either:
or

* the GNU General Public License as published by the Free Software
Foundation; either version 2 of the License, or (at your option) any
Foundation; either version 3 of the License, or (at your option) any
later version.

or both in parallel, as here.
Expand Down
2 changes: 1 addition & 1 deletion external/nettle-3.3/nettle/nettle-internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
or

* the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your
Software Foundation; either version 3 of the License, or (at your
option) any later version.

or both in parallel, as here.
Expand Down
2 changes: 1 addition & 1 deletion external/nettle-3.3/nettle/nettle-meta.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
or

* the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your
Software Foundation; either version 3 of the License, or (at your
option) any later version.

or both in parallel, as here.
Expand Down
2 changes: 1 addition & 1 deletion external/nettle-3.3/nettle/nettle-types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
or

* the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your
Software Foundation; either version 3 of the License, or (at your
option) any later version.

or both in parallel, as here.
Expand Down
2 changes: 1 addition & 1 deletion external/nettle-3.3/nettle/nettle-write.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
or

* the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your
Software Foundation; either version 3 of the License, or (at your
option) any later version.

or both in parallel, as here.
Expand Down
2 changes: 1 addition & 1 deletion external/nettle-3.3/nettle/pkcs1-rsa-sha256.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
or

* the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your
Software Foundation; either version 3 of the License, or (at your
option) any later version.

or both in parallel, as here.
Expand Down
2 changes: 1 addition & 1 deletion external/nettle-3.3/nettle/pkcs1.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
or

* the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your
Software Foundation; either version 3 of the License, or (at your
option) any later version.

or both in parallel, as here.
Expand Down
2 changes: 1 addition & 1 deletion external/nettle-3.3/nettle/pkcs1.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
or

* the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your
Software Foundation; either version 3 of the License, or (at your
option) any later version.

or both in parallel, as here.
Expand Down
2 changes: 1 addition & 1 deletion external/nettle-3.3/nettle/realloc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
or

* the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your
Software Foundation; either version 3 of the License, or (at your
option) any later version.

or both in parallel, as here.
Expand Down
2 changes: 1 addition & 1 deletion external/nettle-3.3/nettle/realloc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
or

* the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your
Software Foundation; either version 3 of the License, or (at your
option) any later version.

or both in parallel, as here.
Expand Down
2 changes: 1 addition & 1 deletion external/nettle-3.3/nettle/rsa-keygen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
or

* the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your
Software Foundation; either version 3 of the License, or (at your
option) any later version.

or both in parallel, as here.
Expand Down
2 changes: 1 addition & 1 deletion external/nettle-3.3/nettle/rsa-sha256-sign.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
or

* the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your
Software Foundation; either version 3 of the License, or (at your
option) any later version.

or both in parallel, as here.
Expand Down
2 changes: 1 addition & 1 deletion external/nettle-3.3/nettle/rsa-sha256-verify.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
or

* the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your
Software Foundation; either version 3 of the License, or (at your
option) any later version.

or both in parallel, as here.
Expand Down
2 changes: 1 addition & 1 deletion external/nettle-3.3/nettle/rsa-sign.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
or

* the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your
Software Foundation; either version 3 of the License, or (at your
option) any later version.

or both in parallel, as here.
Expand Down
2 changes: 1 addition & 1 deletion external/nettle-3.3/nettle/rsa-verify.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
or

* the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your
Software Foundation; either version 3 of the License, or (at your
option) any later version.

or both in parallel, as here.
Expand Down
2 changes: 1 addition & 1 deletion external/nettle-3.3/nettle/rsa.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
or

* the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your
Software Foundation; either version 3 of the License, or (at your
option) any later version.

or both in parallel, as here.
Expand Down
2 changes: 1 addition & 1 deletion external/nettle-3.3/nettle/rsa.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
or

* the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your
Software Foundation; either version 3 of the License, or (at your
option) any later version.

or both in parallel, as here.
Expand Down
2 changes: 1 addition & 1 deletion external/nettle-3.3/nettle/rsa2sexp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
or

* the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your
Software Foundation; either version 3 of the License, or (at your
option) any later version.

or both in parallel, as here.
Expand Down
2 changes: 1 addition & 1 deletion external/nettle-3.3/nettle/sexp-format.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
or

* the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your
Software Foundation; either version 3 of the License, or (at your
option) any later version.

or both in parallel, as here.
Expand Down
2 changes: 1 addition & 1 deletion external/nettle-3.3/nettle/sexp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
or

* the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your
Software Foundation; either version 3 of the License, or (at your
option) any later version.

or both in parallel, as here.
Expand Down
2 changes: 1 addition & 1 deletion external/nettle-3.3/nettle/sexp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
or

* the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your
Software Foundation; either version 3 of the License, or (at your
option) any later version.

or both in parallel, as here.
Expand Down
2 changes: 1 addition & 1 deletion external/nettle-3.3/nettle/sexp2bignum.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
or

* the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your
Software Foundation; either version 3 of the License, or (at your
option) any later version.

or both in parallel, as here.
Expand Down
2 changes: 1 addition & 1 deletion external/nettle-3.3/nettle/sexp2rsa.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
or

* the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your
Software Foundation; either version 3 of the License, or (at your
option) any later version.

or both in parallel, as here.
Expand Down
2 changes: 1 addition & 1 deletion external/nettle-3.3/nettle/sha2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
or

* the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your
Software Foundation; either version 3 of the License, or (at your
option) any later version.

or both in parallel, as here.
Expand Down
2 changes: 1 addition & 1 deletion external/nettle-3.3/nettle/sha256-compress.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
or

* the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your
Software Foundation; either version 3 of the License, or (at your
option) any later version.

or both in parallel, as here.
Expand Down
Loading