]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
11 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

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

11 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

11 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

11 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.

11 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.

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

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

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

11 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.

11 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

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

11 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

11 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

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

11 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

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

11 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

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

11 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.

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

11 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

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

11 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

11 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 http://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir into samual/serverlist

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

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

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

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

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

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

11 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.

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

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

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

11 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

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

11 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)

11 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

11 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

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

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

11 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

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

11 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

11 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

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

11 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

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

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

11 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

11 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

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

11 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

11 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

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

11 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.

11 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.

11 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.

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

11 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

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

11 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!

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

11 years agoOops. Why wasn't merge-base updated...
Rudolf Polzer [Fri, 4 Oct 2013 11:03:20 +0000 (13:03 +0200)]
Oops. Why wasn't merge-base updated...

11 years agofix eval and when commands. Now this works:
Rudolf Polzer [Thu, 3 Oct 2013 15:09:00 +0000 (17:09 +0200)]
fix eval and when commands. Now this works:

rpn /i 91 def /k 2 def "/\"/pop 1\" \"/\\\"//k k 1 add def dup eval\\\" \\\"/pop 0\\\" i k mod 0 > when eval\" k k mul i > when eval" dup eval

11 years agoMore Stuff. Belarusian is still empty.
Rudolf Polzer [Thu, 3 Oct 2013 10:11:25 +0000 (12:11 +0200)]
More Stuff. Belarusian is still empty.

11 years agoNew pot.
Rudolf Polzer [Thu, 3 Oct 2013 09:56:02 +0000 (11:56 +0200)]
New pot.

11 years agoAdd sorting logic to resolutions. Fixes a weird loop.
Rudolf Polzer [Wed, 2 Oct 2013 04:33:32 +0000 (06:33 +0200)]
Add sorting logic to resolutions. Fixes a weird loop.

11 years agotextslider: allow inserting
Rudolf Polzer [Wed, 2 Oct 2013 04:24:47 +0000 (06:24 +0200)]
textslider: allow inserting

11 years agoan eval toy for the RPN hackers. RPN probably is turing complete with this.
Rudolf Polzer [Tue, 1 Oct 2013 15:49:44 +0000 (17:49 +0200)]
an eval toy for the RPN hackers. RPN probably is turing complete with this.

11 years agoMake Samual's horribilificabilitudinitatibus system compile again.
Rudolf Polzer [Tue, 1 Oct 2013 08:58:21 +0000 (10:58 +0200)]
Make Samual's horribilificabilitudinitatibus system compile again.

11 years agoWe can't use YO_DAWG_CPP any more.
Rudolf Polzer [Tue, 1 Oct 2013 08:29:33 +0000 (10:29 +0200)]
We can't use YO_DAWG_CPP any more.

fteqcc and gmqcc both dropped it - for a good reason, as it's non-C11
and we want the QC language go towards a more standard-like dialect to
help new coders.

11 years agoMerge branch 'divVerent/desktopfullscreen'
Rudolf Polzer [Sun, 29 Sep 2013 11:49:44 +0000 (13:49 +0200)]
Merge branch 'divVerent/desktopfullscreen'

11 years agoAdd missing Map_Goto command.
Rudolf Polzer [Fri, 27 Sep 2013 13:20:31 +0000 (15:20 +0200)]
Add missing Map_Goto command.

11 years agoRe-enable scoreboard_accuracy by default...
Samual Lenks [Tue, 24 Sep 2013 19:08:18 +0000 (15:08 -0400)]
Re-enable scoreboard_accuracy by default...

11 years agoImprove skybox sRGB calculator further.
Rudolf Polzer [Tue, 24 Sep 2013 10:43:25 +0000 (12:43 +0200)]
Improve skybox sRGB calculator further.

11 years agofix math
Rudolf Polzer [Tue, 24 Sep 2013 10:35:13 +0000 (12:35 +0200)]
fix math

11 years agoAdd a command to convert -nosRGB to -sRGB skyboxes equivalently.
Rudolf Polzer [Tue, 24 Sep 2013 08:22:28 +0000 (10:22 +0200)]
Add a command to convert -nosRGB to -sRGB skyboxes equivalently.

11 years agoRPN: more accuracy; add sRGB conversion macros.
Rudolf Polzer [Tue, 24 Sep 2013 07:59:36 +0000 (09:59 +0200)]
RPN: more accuracy; add sRGB conversion macros.

Usage:

rpn 0.1 $rpn_sRGB_to_linear

11 years ago11 more rpn functions. Enjoy!
Rudolf Polzer [Tue, 24 Sep 2013 07:50:13 +0000 (09:50 +0200)]
11 more rpn functions. Enjoy!

11 years agoMerge remote-tracking branch 'origin/divVerent/noautomaplist'
Rudolf Polzer [Mon, 23 Sep 2013 15:23:25 +0000 (17:23 +0200)]
Merge remote-tracking branch 'origin/divVerent/noautomaplist'

Conflicts:
qcsrc/common/mapinfo.qh

11 years agoGet rid of welcome_message_time cvar. Only annoying to track down.
Rudolf Polzer [Mon, 23 Sep 2013 10:11:44 +0000 (12:11 +0200)]
Get rid of welcome_message_time cvar. Only annoying to track down.

This made the MOTD useless. Users can always use the i key to hide the
MOTD, so this shouldn't be a big issue.

11 years agoFix cvars.
Rudolf Polzer [Wed, 18 Sep 2013 09:45:48 +0000 (11:45 +0200)]
Fix cvars.

11 years agoFix compile here too.
Rudolf Polzer [Wed, 18 Sep 2013 09:43:51 +0000 (11:43 +0200)]
Fix compile here too.

11 years agoMerge branch 'master' into divVerent/desktopfullscreen
Rudolf Polzer [Wed, 18 Sep 2013 09:43:20 +0000 (11:43 +0200)]
Merge branch 'master' into divVerent/desktopfullscreen

11 years agofix compile
Rudolf Polzer [Wed, 18 Sep 2013 09:43:11 +0000 (11:43 +0200)]
fix compile

11 years agoControl vid_desktopfullscreen too.
Rudolf Polzer [Wed, 18 Sep 2013 09:41:55 +0000 (11:41 +0200)]
Control vid_desktopfullscreen too.

11 years agoFix crash.
Rudolf Polzer [Wed, 18 Sep 2013 08:55:38 +0000 (10:55 +0200)]
Fix crash.

11 years agomake it compile
Rudolf Polzer [Wed, 18 Sep 2013 08:47:11 +0000 (10:47 +0200)]
make it compile

11 years agoimprove res handling
Rudolf Polzer [Wed, 18 Sep 2013 08:46:12 +0000 (10:46 +0200)]
improve res handling

11 years agoInform the slider properly.
Rudolf Polzer [Wed, 18 Sep 2013 08:30:02 +0000 (10:30 +0200)]
Inform the slider properly.

11 years agodefaultmodel selection: if the player's selected model is in the list, always use...
Rudolf Polzer [Wed, 18 Sep 2013 08:14:52 +0000 (10:14 +0200)]
defaultmodel selection: if the player's selected model is in the list, always use that (no randomization then)

11 years agoMore cleanup.
Rudolf Polzer [Wed, 18 Sep 2013 06:07:19 +0000 (08:07 +0200)]
More cleanup.

11 years agostuff
Rudolf Polzer [Tue, 17 Sep 2013 19:43:32 +0000 (21:43 +0200)]
stuff

11 years agoMerge branch 'master' into divVerent/desktopfullscreen
Rudolf Polzer [Tue, 17 Sep 2013 19:39:37 +0000 (21:39 +0200)]
Merge branch 'master' into divVerent/desktopfullscreen

Conflicts:
qcsrc/menu/menu.qc

11 years agoUpdate item location when moved.
Rudolf Polzer [Mon, 16 Sep 2013 15:37:23 +0000 (17:37 +0200)]
Update item location when moved.

11 years agoFix water damage (ignore armor when drowning).
Rudolf Polzer [Mon, 16 Sep 2013 15:15:01 +0000 (17:15 +0200)]
Fix water damage (ignore armor when drowning).

11 years agoFix gravity check in menu
Rudolf Polzer [Mon, 16 Sep 2013 04:44:10 +0000 (06:44 +0200)]
Fix gravity check in menu

11 years agoRocketlauncher: dec damage 12%, inc refire, dec guiderate, inc switchdelay
Samual Lenks [Sun, 15 Sep 2013 16:36:33 +0000 (12:36 -0400)]
Rocketlauncher: dec damage 12%, inc refire, dec guiderate, inc switchdelay