xonotic/xonotic-data.pk3dir.git
6 years agoMerge remote-tracking branch 'origin/master' into samual/serverlist
Samual Lenks [Thu, 24 Oct 2013 18:11:06 +0000 (14:11 -0400)]
Merge remote-tracking branch 'origin/master' into samual/serverlist

6 years agoActually, 0.04 was always intended here, not 0.07. Now checked engine
Rudolf Polzer [Thu, 24 Oct 2013 11:23:09 +0000 (13:23 +0200)]
Actually, 0.04 was always intended here, not 0.07. Now checked engine
source that 0.04 still supports cl_netrepeatinput 1.

6 years agofix g_warmup_allguns 1
Rudolf Polzer [Fri, 18 Oct 2013 01:15:57 +0000 (03:15 +0200)]
fix g_warmup_allguns 1

6 years agoSimpler function accumulation. Thanks, graphitemaster.
Rudolf Polzer [Fri, 18 Oct 2013 00:38:07 +0000 (02:38 +0200)]
Simpler function accumulation. Thanks, graphite

6 years agoMerge remote-tracking branch 'origin/samual/warmup_onlyonmap'
Samual Lenks [Thu, 17 Oct 2013 20:31:49 +0000 (16:31 -0400)]
Merge remote-tracking branch 'origin/samual/warmup_onlyonmap'

* origin/samual/warmup_onlyonmap:
  Add feature to warmup_allguns which only provides weapons in the map

6 years agoAdd feature to warmup_allguns which only provides weapons in the map
Samual Lenks [Thu, 17 Oct 2013 20:25:14 +0000 (16:25 -0400)]
Add feature to warmup_allguns which only provides weapons in the map

6 years agoFix a division by zero.
Rudolf Polzer [Thu, 17 Oct 2013 19:50:53 +0000 (21:50 +0200)]
Fix a division by zero.

6 years agoGet rid of an useless trace and like 1000 instructions each frame and player.
Rudolf Polzer [Thu, 17 Oct 2013 19:44:56 +0000 (21:44 +0200)]
Get rid of an useless trace and like 1000 instructions each frame and player.

6 years agoUse new cvar check URL; kill CVAR_POPCON.
Rudolf Polzer [Tue, 15 Oct 2013 16:43:23 +0000 (18:43 +0200)]
Use new cvar check URL; kill CVAR_POPCON.

6 years agofix typo
Rudolf Polzer [Mon, 14 Oct 2013 01:38:25 +0000 (03:38 +0200)]
fix typo

6 years agoShow recommended servers when categories are disabled too
Samual Lenks [Mon, 14 Oct 2013 00:01:06 +0000 (20:01 -0400)]
Show recommended servers when categories are disabled too

6 years agoAdd a compatibility stop date to the update notification info.
Rudolf Polzer [Sun, 13 Oct 2013 22:49:15 +0000 (00:49 +0200)]
Add a compatibility stop date to the update notification info.

After this date, servers below the current minor version (second part of
version number) will not be shown any more.

6 years agoMerge branch 'master' into samual/serverlist
Rudolf Polzer [Sun, 13 Oct 2013 22:50:32 +0000 (00:50 +0200)]
Merge branch 'master' into samual/serverlist

6 years agoOOPS. Add missing strcmp builtin defs. How could that have slipped through for ages...
Rudolf Polzer [Sun, 13 Oct 2013 21:16:46 +0000 (23:16 +0200)]
OOPS. Add missing strcmp builtin defs. How could that have slipped through for ages...

6 years agoHide empty servers a little bit more, making good servers stand out more.
Rudolf Polzer [Sun, 13 Oct 2013 20:34:17 +0000 (22:34 +0200)]
Hide empty servers a little bit more, making good servers stand out more.

6 years agoFix my breaking of emergency pk3's :D
Samual Lenks [Sun, 13 Oct 2013 19:19:31 +0000 (15:19 -0400)]
Fix my breaking of emergency pk3's :D

6 years agoFix colormap loading, fixes #1558
Rudolf Polzer [Sun, 13 Oct 2013 16:09:57 +0000 (18:09 +0200)]
Fix colormap loading, fixes #1558

6 years agoMenu: avoid loading font twice on resolution switch; avoid extra r_restart on resolut...
Rudolf Polzer [Sun, 13 Oct 2013 14:23:50 +0000 (16:23 +0200)]
Menu: avoid loading font twice on resolution switch; avoid extra r_restart on resolution switch; avoid menu reload on resolution switch

6 years agoARGH, that really was a STUPID bug.
Rudolf Polzer [Sun, 13 Oct 2013 01:21:45 +0000 (03:21 +0200)]
ARGH, that really was a STUPID bug.

6 years agoARGH, that really was a STUPID bug.
Rudolf Polzer [Sun, 13 Oct 2013 01:21:45 +0000 (03:21 +0200)]
ARGH, that really was a STUPID bug.

6 years agoHide DVD resolutions
Samual Lenks [Sun, 13 Oct 2013 01:20:49 +0000 (21:20 -0400)]
Hide DVD resolutions

6 years agoMake APPEND_STRING behave "sane".
Rudolf Polzer [Sun, 13 Oct 2013 00:04:58 +0000 (02:04 +0200)]
Make APPEND_STRING behave "sane".

6 years agoSome cleanup
Samual Lenks [Sat, 12 Oct 2013 23:17:20 +0000 (19:17 -0400)]
Some cleanup

6 years agoProperly handle the cvars for serverlist categories now
Samual Lenks [Sat, 12 Oct 2013 23:15:26 +0000 (19:15 -0400)]
Properly handle the cvars for serverlist categories now

6 years agoSupport promoted servers in the recommendations
Samual Lenks [Sat, 12 Oct 2013 22:54:31 +0000 (18:54 -0400)]
Support promoted servers in the recommendations

6 years agoSwitch to new format for updatenotification
Samual Lenks [Sat, 12 Oct 2013 22:42:00 +0000 (18:42 -0400)]
Switch to new format for updatenotification

6 years agoAdd a checkbox for crypto_aeslevel.
Rudolf Polzer [Sat, 12 Oct 2013 22:09:07 +0000 (00:09 +0200)]
Add a checkbox for crypto_aeslevel.

6 years agoSwitch to recommendation mode 3
Samual Lenks [Sat, 12 Oct 2013 19:53:06 +0000 (15:53 -0400)]
Switch to recommendation mode 3

6 years agoRename "Bookmark" button to "Favorite" button (it's called favorites...)
Samual Lenks [Sat, 12 Oct 2013 19:09:45 +0000 (15:09 -0400)]
Rename "Bookmark" button to "Favorite" button (it's called favorites...)

6 years agoRevert "Require >= 800x600 now. Users who want lower res and have a higher res deskto...
Rudolf Polzer [Sat, 12 Oct 2013 17:27:49 +0000 (19:27 +0200)]
Revert "Require >= 800x600 now. Users who want lower res and have a higher res desktop will need to manually set vid_width/vid_height." no, users probably can know what they are doing, and adjust expectations ;)

This reverts commit f1a4f975c754e9993e5617dc86e7025779f75bd2.

6 years agoRequire >= 800x600 now. Users who want lower res and have a higher res desktop will...
Rudolf Polzer [Sat, 12 Oct 2013 17:26:22 +0000 (19:26 +0200)]
Require >= 800x600 now. Users who want lower res and have a higher res desktop will need to manually set vid_width/vid_height.

6 years agoAdjustments to category rendering- left align with colon over servername
Samual Lenks [Sat, 12 Oct 2013 17:22:16 +0000 (13:22 -0400)]
Adjustments to category rendering- left align with colon over servername

6 years agoThis (zero-sizes text warning) can now actually happen if someone sets 320x240 res...
Rudolf Polzer [Sat, 12 Oct 2013 17:18:54 +0000 (19:18 +0200)]
This (zero-sizes text warning) can now actually happen if someone sets 320x240 res. Let's just allow it.

6 years agor_restart on conwidth/conheight change to reload fonts at the proper sizes
Rudolf Polzer [Sat, 12 Oct 2013 17:17:00 +0000 (19:17 +0200)]
r_restart on conwidth/conheight change to reload fonts at the proper sizes

6 years agokill more 640x480 hacks
Rudolf Polzer [Sat, 12 Oct 2013 17:08:49 +0000 (19:08 +0200)]
kill more 640x480 hacks

6 years agoSimplify a LOT.
Rudolf Polzer [Sat, 12 Oct 2013 02:00:06 +0000 (04:00 +0200)]
Simplify a LOT.

6 years agoMerge remote-tracking branch 'origin/master' into samual/serverlist
Samual Lenks [Sat, 12 Oct 2013 01:57:00 +0000 (21:57 -0400)]
Merge remote-tracking branch 'origin/master' into samual/serverlist

6 years agoFix compilation with gmqcc.
Rudolf Polzer [Fri, 11 Oct 2013 14:54:39 +0000 (16:54 +0200)]
Fix compilation with gmqcc.

6 years agoMerge remote-tracking branch 'origin/mirceakitsune/func_train_beizer_curve'
Rudolf Polzer [Fri, 11 Oct 2013 14:51:19 +0000 (16:51 +0200)]
Merge remote-tracking branch 'origin/mirceakitsune/func_train_beizer_curve'

Conflicts:
qcsrc/server/t_plats.qc

6 years agoMerge remote-tracking branch 'origin/mrbougo/quickfix-mapinfo_gen_typo', fixes #1756
Rudolf Polzer [Fri, 11 Oct 2013 14:48:35 +0000 (16:48 +0200)]
Merge remote-tracking branch 'origin/mrbougo/quickfix-mapinfo_gen_typo', fixes #1756

* origin/mrbougo/quickfix-mapinfo_gen_typo:
  fix typo in mapinfo generation

6 years agoMerge matthiaskrgr/cmds by squashing, fixes #1783.
Rudolf Polzer [Fri, 11 Oct 2013 14:45:51 +0000 (16:45 +0200)]
Merge matthiaskrgr/cmds by squashing, fixes #1783.

6 years agoRefactor item position code. Should be easier to adapt to new category handling.
Rudolf Polzer [Fri, 11 Oct 2013 12:59:03 +0000 (14:59 +0200)]
Refactor item position code. Should be easier to adapt to new category handling.

6 years agoONE BYTE.
Rudolf Polzer [Fri, 11 Oct 2013 06:06:25 +0000 (08:06 +0200)]
ONE BYTE.

6 years agoFix bug in begin handling.
Rudolf Polzer [Fri, 11 Oct 2013 05:43:14 +0000 (07:43 +0200)]
Fix bug in begin handling.

6 years agoBottom align the headings.
Rudolf Polzer [Fri, 11 Oct 2013 05:33:52 +0000 (07:33 +0200)]
Bottom align the headings.

6 years agoGive the headings 1.5 rows height.
Rudolf Polzer [Fri, 11 Oct 2013 05:20:04 +0000 (07:20 +0200)]
Give the headings 1.5 rows height.

6 years agoMerge remote-tracking branch 'origin/master' into samual/serverlist
Rudolf Polzer [Fri, 11 Oct 2013 05:21:21 +0000 (07:21 +0200)]
Merge remote-tracking branch 'origin/master' into samual/serverlist

6 years agouse a proper binary search
Rudolf Polzer [Fri, 11 Oct 2013 04:33:13 +0000 (06:33 +0200)]
use a proper binary search

6 years agoAdd comment for another binary search method
Samual Lenks [Fri, 11 Oct 2013 03:11:59 +0000 (23:11 -0400)]
Add comment for another binary search method

6 years agoUse binary search to find first item for each category
Samual Lenks [Fri, 11 Oct 2013 01:08:27 +0000 (21:08 -0400)]
Use binary search to find first item for each category

6 years agoremove useless comment
Samual Lenks [Thu, 10 Oct 2013 22:59:48 +0000 (18:59 -0400)]
remove useless comment

6 years agoImprove purity checks for category selection
Samual Lenks [Thu, 10 Oct 2013 22:12:04 +0000 (18:12 -0400)]
Improve purity checks for category selection

6 years agoMore improvements to recommendations logic
Samual Lenks [Thu, 10 Oct 2013 21:50:45 +0000 (17:50 -0400)]
More improvements to recommendations logic

6 years agoRegistration has to be done much earlier, not in configuration
Samual Lenks [Thu, 10 Oct 2013 19:27:15 +0000 (15:27 -0400)]
Registration has to be done much earlier, not in configuration

6 years agoWorking on recommendation logic
Samual Lenks [Thu, 10 Oct 2013 18:57:34 +0000 (14:57 -0400)]
Working on recommendation logic

6 years agoRevert "another superslow loop. FIXME added." as this is just once per
Rudolf Polzer [Thu, 10 Oct 2013 17:47:56 +0000 (19:47 +0200)]
Revert "another superslow loop. FIXME added." as this is just once per
frame.

This reverts commit d6ba966669f62089c5cb01bcc9662ad4cddc6054.

6 years agoanother superslow loop. FIXME added.
Rudolf Polzer [Thu, 10 Oct 2013 17:45:38 +0000 (19:45 +0200)]
another superslow loop. FIXME added.

6 years agoadd FIXME for totally slow unacceptable code
Rudolf Polzer [Thu, 10 Oct 2013 17:43:33 +0000 (19:43 +0200)]
add FIXME for totally slow unacceptable code

6 years agoApply rename of category function.
Rudolf Polzer [Thu, 10 Oct 2013 17:41:10 +0000 (19:41 +0200)]
Apply rename of category function.

6 years agoAdd updatenotification support for recommended servers
Samual Lenks [Thu, 10 Oct 2013 17:40:32 +0000 (13:40 -0400)]
Add updatenotification support for recommended servers

6 years agoMerge branch 'samual/serverlist' of http://nl.git.xonotic.org/xonotic/xonotic-data...
Samual Lenks [Thu, 10 Oct 2013 17:25:17 +0000 (13:25 -0400)]
Merge branch 'samual/serverlist' of nl.git.xonotic.org/xonotic/xonotic-data.pk3dir into samual/serverlist

6 years agoClean up retrieval methods
Samual Lenks [Thu, 10 Oct 2013 17:24:54 +0000 (13:24 -0400)]
Clean up retrieval methods

6 years agosync dpdefs
Rudolf Polzer [Thu, 10 Oct 2013 17:14:28 +0000 (19:14 +0200)]
sync dpdefs

6 years agoUse ZCTX on category names
Samual Lenks [Thu, 10 Oct 2013 06:03:01 +0000 (02:03 -0400)]
Use ZCTX on category names

6 years agoMore cleanup
Samual Lenks [Thu, 10 Oct 2013 05:56:22 +0000 (01:56 -0400)]
More cleanup

6 years agoUpdate the item mapping function
Samual Lenks [Thu, 10 Oct 2013 05:48:25 +0000 (01:48 -0400)]
Update the item mapping function

6 years agoFix some things
Samual Lenks [Thu, 10 Oct 2013 05:42:30 +0000 (01:42 -0400)]
Fix some things

6 years agoMake categories registration code not define a function in the
Rudolf Polzer [Thu, 10 Oct 2013 04:44:43 +0000 (06:44 +0200)]
Make categories registration code not define a function in the
interface.

6 years agocomments
Rudolf Polzer [Thu, 10 Oct 2013 04:28:59 +0000 (06:28 +0200)]
comments

6 years agoRefactor refreshServerList a bit.
Rudolf Polzer [Thu, 10 Oct 2013 04:21:33 +0000 (06:21 +0200)]
Refactor refreshServerList a bit.

6 years agoFix something I did stupidly
Samual Lenks [Thu, 10 Oct 2013 04:21:01 +0000 (00:21 -0400)]
Fix something I did stupidly

6 years agoFix handling of overrides with categories
Samual Lenks [Thu, 10 Oct 2013 04:08:20 +0000 (00:08 -0400)]
Fix handling of overrides with categories

6 years agoBegin adding categories checkbox
Samual Lenks [Thu, 10 Oct 2013 02:25:07 +0000 (22:25 -0400)]
Begin adding categories checkbox

6 years agoBetter handling of selection (fixes several bugs)
Samual Lenks [Thu, 10 Oct 2013 01:51:58 +0000 (21:51 -0400)]
Better handling of selection (fixes several bugs)

6 years agoBetter handling of item selection with categories enabled
Samual Lenks [Thu, 10 Oct 2013 01:13:32 +0000 (21:13 -0400)]
Better handling of item selection with categories enabled

6 years agoClean up/prepare header draw code
Samual Lenks [Thu, 10 Oct 2013 00:35:32 +0000 (20:35 -0400)]
Clean up/prepare header draw code

6 years agoOrganize drawListBoxItem code
Samual Lenks [Thu, 10 Oct 2013 00:31:06 +0000 (20:31 -0400)]
Organize drawListBoxItem code

6 years agoClean alllllllll the thingssss
Samual Lenks [Thu, 10 Oct 2013 00:22:51 +0000 (20:22 -0400)]
Clean alllllllll the thingssss

6 years agoWhoops, nItems still needs to be set even when categories are disabled
Samual Lenks [Thu, 10 Oct 2013 00:18:41 +0000 (20:18 -0400)]
Whoops, nItems still needs to be set even when categories are disabled

6 years agoMore cleanup
Samual Lenks [Thu, 10 Oct 2013 00:16:45 +0000 (20:16 -0400)]
More cleanup

6 years agoCleanup, plus add functionality to skip drawing headers when not plural
Samual Lenks [Thu, 10 Oct 2013 00:03:10 +0000 (20:03 -0400)]
Cleanup, plus add functionality to skip drawing headers when not plural

6 years agoMore cleanup, add todo for sanity check
Samual Lenks [Wed, 9 Oct 2013 23:35:00 +0000 (19:35 -0400)]
More cleanup, add todo for sanity check

6 years agoCode cleanup
Samual Lenks [Wed, 9 Oct 2013 23:27:49 +0000 (19:27 -0400)]
Code cleanup

6 years agoAll new method of declaring and setting up categories
Samual Lenks [Wed, 9 Oct 2013 21:04:45 +0000 (17:04 -0400)]
All new method of declaring and setting up categories

6 years agoBegin adding recommended servers support
Samual Lenks [Wed, 9 Oct 2013 18:26:50 +0000 (14:26 -0400)]
Begin adding recommended servers support

6 years agoMinstaGib really should use SetModname... :(
Rudolf Polzer [Tue, 8 Oct 2013 21:46:05 +0000 (23:46 +0200)]
MinstaGib really should use SetModname... :(

6 years agoAdd more categories, improve analyzation of server category
Samual Lenks [Tue, 8 Oct 2013 21:25:38 +0000 (17:25 -0400)]
Add more categories, improve analyzation of server category

6 years agoUse new m_getserverlistentrycategory feature, fix category drawing
Samual Lenks [Tue, 8 Oct 2013 20:11:57 +0000 (16:11 -0400)]
Use new m_getserverlistentrycategory feature, fix category drawing

6 years agocomments
Rudolf Polzer [Tue, 8 Oct 2013 16:44:37 +0000 (18:44 +0200)]
comments

6 years agoMerge remote-tracking branch 'origin/master' into samual/serverlist
Samual Lenks [Tue, 8 Oct 2013 16:25:36 +0000 (12:25 -0400)]
Merge remote-tracking branch 'origin/master' into samual/serverlist

6 years agoUse categories by name, other fixes
Samual Lenks [Tue, 8 Oct 2013 04:26:30 +0000 (00:26 -0400)]
Use categories by name, other fixes

6 years agoFixes
Rudolf Polzer [Tue, 8 Oct 2013 03:51:16 +0000 (05:51 +0200)]
Fixes

6 years agoSegmented serverlist now actually functions properly at its core! yay.
Samual Lenks [Tue, 8 Oct 2013 02:51:20 +0000 (22:51 -0400)]
Segmented serverlist now actually functions properly at its core! yay.

6 years agoRefactor to try to support variable sized list items.
Rudolf Polzer [Tue, 8 Oct 2013 00:58:50 +0000 (02:58 +0200)]
Refactor to try to support variable sized list items.

6 years agoAvoid memory leak in the resolution slider when toggling the fullscreen
Rudolf Polzer [Tue, 8 Oct 2013 00:26:39 +0000 (02:26 +0200)]
Avoid memory leak in the resolution slider when toggling the fullscreen
checkbox.

6 years agoUpdate sortflags
Samual Lenks [Mon, 7 Oct 2013 02:06:39 +0000 (22:06 -0400)]
Update sortflags

6 years agoMerge remote-tracking branch 'origin/master' into samual/serverlist
Samual Lenks [Sun, 6 Oct 2013 21:23:50 +0000 (17:23 -0400)]
Merge remote-tracking branch 'origin/master' into samual/serverlist

6 years agoUpdate Morphed's credits
Rudolf Polzer [Sat, 5 Oct 2013 15:52:15 +0000 (17:52 +0200)]
Update Morphed's credits

6 years agoCongratulations to terencehill - Italian is complete!
Rudolf Polzer [Fri, 4 Oct 2013 11:08:31 +0000 (13:08 +0200)]
Congratulations to terencehill - Italian is complete!

6 years agoMerge with transifex.
Rudolf Polzer [Fri, 4 Oct 2013 11:06:52 +0000 (13:06 +0200)]
Merge with transifex.