]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
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 .
Rudolf Polzer [Thu, 10 Oct 2013 17:45:38 +0000 (19:45 +0200)]
another superslow loop. FIXME added.
Rudolf Polzer [Thu, 10 Oct 2013 17:43:33 +0000 (19:43 +0200)]
add FIXME for totally slow unacceptable code
Rudolf Polzer [Thu, 10 Oct 2013 17:41:10 +0000 (19:41 +0200)]
Apply rename of category function.
Samual Lenks [Thu, 10 Oct 2013 17:40:32 +0000 (13:40 -0400)]
Add updatenotification support for recommended servers
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
Samual Lenks [Thu, 10 Oct 2013 17:24:54 +0000 (13:24 -0400)]
Clean up retrieval methods
Rudolf Polzer [Thu, 10 Oct 2013 17:14:28 +0000 (19:14 +0200)]
sync dpdefs
Samual Lenks [Thu, 10 Oct 2013 06:03:01 +0000 (02:03 -0400)]
Use ZCTX on category names
Samual Lenks [Thu, 10 Oct 2013 05:56:22 +0000 (01:56 -0400)]
More cleanup
Samual Lenks [Thu, 10 Oct 2013 05:48:25 +0000 (01:48 -0400)]
Update the item mapping function
Samual Lenks [Thu, 10 Oct 2013 05:42:30 +0000 (01:42 -0400)]
Fix some things
Rudolf Polzer [Thu, 10 Oct 2013 04:44:43 +0000 (06:44 +0200)]
Make categories registration code not define a function in the
interface.
Rudolf Polzer [Thu, 10 Oct 2013 04:28:59 +0000 (06:28 +0200)]
comments
Rudolf Polzer [Thu, 10 Oct 2013 04:21:33 +0000 (06:21 +0200)]
Refactor refreshServerList a bit.
Samual Lenks [Thu, 10 Oct 2013 04:21:01 +0000 (00:21 -0400)]
Fix something I did stupidly
Samual Lenks [Thu, 10 Oct 2013 04:08:20 +0000 (00:08 -0400)]
Fix handling of overrides with categories
Samual Lenks [Thu, 10 Oct 2013 02:25:07 +0000 (22:25 -0400)]
Begin adding categories checkbox
Samual Lenks [Thu, 10 Oct 2013 01:51:58 +0000 (21:51 -0400)]
Better handling of selection (fixes several bugs)
Samual Lenks [Thu, 10 Oct 2013 01:13:32 +0000 (21:13 -0400)]
Better handling of item selection with categories enabled
Samual Lenks [Thu, 10 Oct 2013 00:35:32 +0000 (20:35 -0400)]
Clean up/prepare header draw code
Samual Lenks [Thu, 10 Oct 2013 00:31:06 +0000 (20:31 -0400)]
Organize drawListBoxItem code
Samual Lenks [Thu, 10 Oct 2013 00:22:51 +0000 (20:22 -0400)]
Clean alllllllll the thingssss
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
Samual Lenks [Thu, 10 Oct 2013 00:16:45 +0000 (20:16 -0400)]
More cleanup
Samual Lenks [Thu, 10 Oct 2013 00:03:10 +0000 (20:03 -0400)]
Cleanup, plus add functionality to skip drawing headers when not plural
Samual Lenks [Wed, 9 Oct 2013 23:35:00 +0000 (19:35 -0400)]
More cleanup, add todo for sanity check
Samual Lenks [Wed, 9 Oct 2013 23:27:49 +0000 (19:27 -0400)]
Code cleanup
Samual Lenks [Wed, 9 Oct 2013 21:04:45 +0000 (17:04 -0400)]
All new method of declaring and setting up categories
Samual Lenks [Wed, 9 Oct 2013 18:26:50 +0000 (14:26 -0400)]
Begin adding recommended servers support
Samual Lenks [Tue, 8 Oct 2013 21:25:38 +0000 (17:25 -0400)]
Add more categories, improve analyzation of server category
Samual Lenks [Tue, 8 Oct 2013 20:11:57 +0000 (16:11 -0400)]
Use new m_getserverlistentrycategory feature, fix category drawing
Samual Lenks [Tue, 8 Oct 2013 16:25:36 +0000 (12:25 -0400)]
Merge remote-tracking branch 'origin/master' into samual/serverlist
Samual Lenks [Tue, 8 Oct 2013 04:26:30 +0000 (00:26 -0400)]
Use categories by name, other fixes
Samual Lenks [Tue, 8 Oct 2013 02:51:20 +0000 (22:51 -0400)]
Segmented serverlist now actually functions properly at its core! yay.
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.
Samual Lenks [Mon, 7 Oct 2013 02:06:39 +0000 (22:06 -0400)]
Update sortflags
Samual Lenks [Sun, 6 Oct 2013 21:23:50 +0000 (17:23 -0400)]
Merge remote-tracking branch 'origin/master' into samual/serverlist
Rudolf Polzer [Sat, 5 Oct 2013 15:52:15 +0000 (17:52 +0200)]
Update Morphed's credits
Rudolf Polzer [Fri, 4 Oct 2013 11:08:31 +0000 (13:08 +0200)]
Congratulations to terencehill - Italian is complete!
Rudolf Polzer [Fri, 4 Oct 2013 11:06:52 +0000 (13:06 +0200)]
Merge with transifex.
Rudolf Polzer [Fri, 4 Oct 2013 11:03:20 +0000 (13:03 +0200)]
Oops. Why wasn't merge-base updated...
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
Rudolf Polzer [Thu, 3 Oct 2013 10:11:25 +0000 (12:11 +0200)]
More Stuff. Belarusian is still empty.
Rudolf Polzer [Thu, 3 Oct 2013 09:56:02 +0000 (11:56 +0200)]
New pot.
Rudolf Polzer [Wed, 2 Oct 2013 04:33:32 +0000 (06:33 +0200)]
Add sorting logic to resolutions. Fixes a weird loop.
Rudolf Polzer [Wed, 2 Oct 2013 04:24:47 +0000 (06:24 +0200)]
textslider: allow inserting
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.
Rudolf Polzer [Tue, 1 Oct 2013 08:58:21 +0000 (10:58 +0200)]
Make Samual's horribilificabilitudinitatibus system compile again.
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.
Rudolf Polzer [Sun, 29 Sep 2013 11:49:44 +0000 (13:49 +0200)]
Merge branch 'divVerent/desktopfullscreen'
Rudolf Polzer [Fri, 27 Sep 2013 13:20:31 +0000 (15:20 +0200)]
Add missing Map_Goto command.
Samual Lenks [Tue, 24 Sep 2013 19:08:18 +0000 (15:08 -0400)]
Re-enable scoreboard_accuracy by default...
Rudolf Polzer [Tue, 24 Sep 2013 10:43:25 +0000 (12:43 +0200)]
Improve skybox sRGB calculator further.
Rudolf Polzer [Tue, 24 Sep 2013 10:35:13 +0000 (12:35 +0200)]
fix math
Rudolf Polzer [Tue, 24 Sep 2013 08:22:28 +0000 (10:22 +0200)]
Add a command to convert -nosRGB to -sRGB skyboxes equivalently.
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
Rudolf Polzer [Tue, 24 Sep 2013 07:50:13 +0000 (09:50 +0200)]
11 more rpn functions. Enjoy!
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
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.
Rudolf Polzer [Wed, 18 Sep 2013 09:45:48 +0000 (11:45 +0200)]
Fix cvars.
Rudolf Polzer [Wed, 18 Sep 2013 09:43:51 +0000 (11:43 +0200)]
Fix compile here too.
Rudolf Polzer [Wed, 18 Sep 2013 09:43:20 +0000 (11:43 +0200)]
Merge branch 'master' into divVerent/desktopfullscreen
Rudolf Polzer [Wed, 18 Sep 2013 09:43:11 +0000 (11:43 +0200)]
fix compile
Rudolf Polzer [Wed, 18 Sep 2013 09:41:55 +0000 (11:41 +0200)]
Control vid_desktopfullscreen too.
Rudolf Polzer [Wed, 18 Sep 2013 08:55:38 +0000 (10:55 +0200)]
Fix crash.
Rudolf Polzer [Wed, 18 Sep 2013 08:47:11 +0000 (10:47 +0200)]
make it compile
Rudolf Polzer [Wed, 18 Sep 2013 08:46:12 +0000 (10:46 +0200)]
improve res handling
Rudolf Polzer [Wed, 18 Sep 2013 08:30:02 +0000 (10:30 +0200)]
Inform the slider properly.
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)
Rudolf Polzer [Wed, 18 Sep 2013 06:07:19 +0000 (08:07 +0200)]
More cleanup.
Rudolf Polzer [Tue, 17 Sep 2013 19:43:32 +0000 (21:43 +0200)]
stuff
Rudolf Polzer [Tue, 17 Sep 2013 19:39:37 +0000 (21:39 +0200)]
Merge branch 'master' into divVerent/desktopfullscreen
Conflicts:
qcsrc/menu/menu.qc
Rudolf Polzer [Mon, 16 Sep 2013 15:37:23 +0000 (17:37 +0200)]
Update item location when moved.
Rudolf Polzer [Mon, 16 Sep 2013 15:15:01 +0000 (17:15 +0200)]
Fix water damage (ignore armor when drowning).
Rudolf Polzer [Mon, 16 Sep 2013 04:44:10 +0000 (06:44 +0200)]
Fix gravity check in menu
Samual Lenks [Sun, 15 Sep 2013 16:36:33 +0000 (12:36 -0400)]
Rocketlauncher: dec damage 12%, inc refire, dec guiderate, inc switchdelay
Samual Lenks [Sun, 15 Sep 2013 02:38:46 +0000 (22:38 -0400)]
Merge remote-tracking branch 'origin/samual/menu_requires_connection'
* origin/samual/menu_requires_connection:
Add requiresConnection flag to HUD panel dialogs and sandbox dialog
Implement a "requiresConnect" attribute for menu dialogs
Samual Lenks [Sun, 15 Sep 2013 02:33:08 +0000 (22:33 -0400)]
Add requiresConnection flag to HUD panel dialogs and sandbox dialog
Samual Lenks [Sun, 15 Sep 2013 01:18:45 +0000 (21:18 -0400)]
Implement a "requiresConnect" attribute for menu dialogs
Samual Lenks [Sat, 14 Sep 2013 20:12:55 +0000 (16:12 -0400)]
Merge remote-tracking branch 'origin/debugger/dualscreenresolution'
# By Debugger (1) and Samual Lenks (1)
* origin/debugger/dualscreenresolution:
Minor fix
adding the possbility to use dualscreenresolution
Samual Lenks [Sat, 14 Sep 2013 20:06:29 +0000 (16:06 -0400)]
Minor fix
Samual Lenks [Sat, 14 Sep 2013 19:50:39 +0000 (15:50 -0400)]
Merge remote-tracking branch 'origin/Mario/yet_another_vehicle_crashfix'
# By Mario
# Via Mario
* origin/Mario/yet_another_vehicle_crashfix:
Eject the player from their vehicle before killing them (fixes a crash when shuffling teams)
Samual Lenks [Sat, 14 Sep 2013 04:03:40 +0000 (00:03 -0400)]
Merge remote-tracking branch 'origin/samual/team_macros'
* origin/samual/team_macros:
Make some nice macros for team comparisons
Samual Lenks [Sat, 14 Sep 2013 00:25:52 +0000 (20:25 -0400)]
Make some nice macros for team comparisons
Rudolf Polzer [Fri, 13 Sep 2013 19:29:47 +0000 (21:29 +0200)]
transifex import
Rudolf Polzer [Fri, 13 Sep 2013 10:23:38 +0000 (12:23 +0200)]
Increase requirements for screenshots: doesn't reach caulk by an axial
direction, and must see an item/spawnpoint.
Rudolf Polzer [Fri, 13 Sep 2013 09:22:42 +0000 (11:22 +0200)]
Nicer merging.
Rudolf Polzer [Fri, 13 Sep 2013 09:00:44 +0000 (11:00 +0200)]
Import from transifex.
Rudolf Polzer [Fri, 13 Sep 2013 08:54:14 +0000 (10:54 +0200)]
Integrate with Transifex.
sh tx.sh - 3-way merge with changes on Transifex.
Debugger [Thu, 12 Sep 2013 20:32:53 +0000 (22:32 +0200)]
adding the possbility to use dualscreenresolution
Rudolf Polzer [Thu, 12 Sep 2013 18:41:23 +0000 (20:41 +0200)]
also check for errors
Samual Lenks [Thu, 12 Sep 2013 18:25:03 +0000 (14:25 -0400)]
Merge remote-tracking branch 'origin/samual/notification_updates'
* origin/samual/notification_updates: (37 commits)
Update common.pot
Fix some other things
Remove NOTIFICATIONS_DEBUG flag from compile
Remove FRAG_VERBOSE here
Update debug prints for initialization
Comment out the MSG_CHOICE debug on init
Fix restartnotifs command
Update config, fix some other things
Update announcer countdown system with different types, update debugprint
Remove some of that useless code kids are always talking about
Clean up checkargs a little bit
Update edit date
Remove old cvars from Dump_Notifications
Fix problems with sprintf argument limits
Probably better to comment team check out for now
Move flag capture verbosity to MSG_CHOICE, plus fix some various things
Move flag pickup verbose to MSG_CHOICE
Small cleanup
Update the notification format specifications
Reorganize notification values
...
Samual Lenks [Thu, 12 Sep 2013 16:36:19 +0000 (12:36 -0400)]
Update common.pot
Samual Lenks [Thu, 12 Sep 2013 16:29:37 +0000 (12:29 -0400)]
Merge remote-tracking branch 'origin/master' into samual/notification_updates
Conflicts:
qcsrc/client/announcer.qc
qcsrc/common/notifications.qh
qcsrc/server/g_damage.qc
qcsrc/server/mutators/gamemode_ctf.qc
Rudolf Polzer [Thu, 12 Sep 2013 07:36:23 +0000 (09:36 +0200)]
Merged; de: fix conflicts and untranslated, fuzzy left
Rudolf Polzer [Thu, 12 Sep 2013 07:35:20 +0000 (09:35 +0200)]
Merge remote-tracking branch 'origin/divVerent/merged-translations'
Samual Lenks [Wed, 11 Sep 2013 02:05:38 +0000 (22:05 -0400)]
Update translations from Pootle
Samual Lenks [Wed, 11 Sep 2013 01:26:13 +0000 (21:26 -0400)]
Update templates
Mario [Tue, 10 Sep 2013 06:04:26 +0000 (16:04 +1000)]
Eject the player from their vehicle before killing them (fixes a crash when shuffling teams)