]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
Mario [Mon, 2 Mar 2015 08:13:56 +0000 (19:13 +1100)]
Make it work
Mario [Sun, 1 Mar 2015 03:48:53 +0000 (14:48 +1100)]
Close to finalized, side scrolling view mode by Player 2
Mario [Sat, 28 Feb 2015 08:34:51 +0000 (19:34 +1100)]
Some more attempts
Mario [Thu, 26 Feb 2015 10:24:40 +0000 (21:24 +1100)]
Experimental view location trigger, new branch as it may interfere with regular modes in its curren state
Mario [Wed, 25 Feb 2015 05:49:53 +0000 (16:49 +1100)]
Add shotgunarena as a mutator
Mario [Tue, 24 Feb 2015 12:02:29 +0000 (23:02 +1100)]
Remove revolver (seems we reached a weapon breakage limit)
Mario [Tue, 24 Feb 2015 11:45:12 +0000 (22:45 +1100)]
Fix compile with CHAOS mode
Mario [Sun, 22 Feb 2015 05:35:10 +0000 (16:35 +1100)]
Fix door notifications
Mario [Sun, 22 Feb 2015 02:15:40 +0000 (13:15 +1100)]
Network colormod even to players (g_player_brightness)
Mario [Sun, 22 Feb 2015 02:12:27 +0000 (13:12 +1100)]
Add an option to use the new "pro" hook texture
Mario [Sat, 14 Feb 2015 13:13:03 +0000 (00:13 +1100)]
Merge branch 'master' into Mario/combined_updates
Mario [Sat, 14 Feb 2015 13:07:07 +0000 (13:07 +0000)]
Merge branch 'sev/weapon_panel_retry' into 'master'
Weapon Panel Retry
Based on the discussion at !105, I've made the following changes to @terencehill's implementation:
- The icons are distributed symmetrically, no matter if the panel is arranged vertically or horizontally
- If the bounds touch a screen edge, the panel is snapped to that edge
This merge request replaces !105.
See merge request !106
Mario [Sat, 14 Feb 2015 13:02:54 +0000 (00:02 +1100)]
Merge branch 'master' into sev/weapon_panel_retry
Mario [Fri, 13 Feb 2015 19:39:39 +0000 (06:39 +1100)]
Apply a bad hack to give flak rockets on pickup
Mario [Thu, 12 Feb 2015 19:44:30 +0000 (06:44 +1100)]
Experimental new weapon: Flak Cannon
Mario [Thu, 12 Feb 2015 11:01:28 +0000 (22:01 +1100)]
Disable ammo charging by default
Mirio [Thu, 12 Feb 2015 10:44:03 +0000 (11:44 +0100)]
Forgot keep owner cvar in 0.8; buff SG; change back spawn furthest
Mario [Thu, 12 Feb 2015 10:38:52 +0000 (21:38 +1100)]
Some experiments with arc types (currently too broken for use)
Mario [Mon, 9 Feb 2015 21:10:00 +0000 (08:10 +1100)]
Merge branch 'master' into Mario/combined_updates
Severin Meyer [Mon, 9 Feb 2015 19:16:29 +0000 (20:16 +0100)]
Center onlyowned weapon panel if the panel bounds reach across the whole screen
Rudolf Polzer [Mon, 9 Feb 2015 11:07:58 +0000 (12:07 +0100)]
Merge remote-tracking branch 'origin/divVerent/crypto-fixes'
Mario [Mon, 9 Feb 2015 06:55:41 +0000 (17:55 +1100)]
Merge branch 'master' into Mario/combined_updates
Mirio [Sun, 8 Feb 2015 17:23:48 +0000 (18:23 +0100)]
Add Melano to extended, add translators
Mario [Sun, 8 Feb 2015 15:22:12 +0000 (15:22 +0000)]
Merge branch 'terencehill/menu_fix' into 'master'
Terencehill/menu fix
Fix for bug #1453 "Advanced settings dialog does not close after pressing OK"
See merge request !107
Mario [Sun, 8 Feb 2015 11:32:09 +0000 (22:32 +1100)]
Do specific checks for sound formats
Mario [Sun, 8 Feb 2015 08:29:52 +0000 (19:29 +1100)]
Experimental day-night cycle mutator
Mario [Sun, 8 Feb 2015 07:01:22 +0000 (18:01 +1100)]
Add some extra checks to event_damage, to prevent possible crashes
Mario [Sat, 7 Feb 2015 17:17:16 +0000 (04:17 +1100)]
If health or armor are above set limits, send items to piggybacker
Mario [Sat, 7 Feb 2015 17:10:58 +0000 (04:10 +1100)]
Give some touched items to the rider while riding monsters
Mario [Sat, 7 Feb 2015 12:57:37 +0000 (12:57 +0000)]
Merge branch 'TimePath/issues/1455' into 'master'
"volume must be in range 0-1" warnings when playing the tuba
Closes xonotic/xonotic-data.pk3dir#1455
See merge request !108
Mario [Sat, 7 Feb 2015 08:54:45 +0000 (08:54 +0000)]
Merge branch 'TimePath/issues/1454' into 'master'
Menu VM crash when g_invasion is set to 1
See merge request !109
TimePath [Sat, 7 Feb 2015 08:45:19 +0000 (19:45 +1100)]
Don't call gameTypeChangeNotify() without a parent
Closes #1454
TimePath [Sat, 7 Feb 2015 08:34:23 +0000 (19:34 +1100)]
Cleanup
TimePath [Sat, 7 Feb 2015 07:03:54 +0000 (18:03 +1100)]
Fix the tuba with pythonic modulo
Closes #1455
TimePath [Sat, 7 Feb 2015 05:54:02 +0000 (16:54 +1100)]
Cleanup
Mario [Fri, 6 Feb 2015 12:40:08 +0000 (23:40 +1100)]
Allow swinging nades around with hook
Mario [Fri, 6 Feb 2015 10:05:28 +0000 (21:05 +1100)]
Add a monstercount option for mapinfos
Mario [Fri, 6 Feb 2015 08:48:10 +0000 (19:48 +1100)]
Increase secondary force to 400 (300 was way too little)
Mario [Fri, 6 Feb 2015 08:42:37 +0000 (19:42 +1100)]
Fix a silly mistake
Mario [Fri, 6 Feb 2015 08:34:43 +0000 (19:34 +1100)]
Possible fix for insanely fast dodging speed
Mario [Fri, 6 Feb 2015 00:04:08 +0000 (11:04 +1100)]
Fix some small things
Mario [Fri, 6 Feb 2015 00:00:48 +0000 (11:00 +1100)]
and now for something completely different
Severin Meyer [Thu, 5 Feb 2015 20:43:33 +0000 (21:43 +0100)]
Make the weapon panel snapping work with any padding value
Severin Meyer [Thu, 5 Feb 2015 19:09:07 +0000 (20:09 +0100)]
Base weapon panel snap threshold on screen size
Mario [Thu, 5 Feb 2015 18:30:23 +0000 (05:30 +1100)]
Fix TDM slider not changing point limit
Mario [Thu, 5 Feb 2015 18:17:37 +0000 (05:17 +1100)]
Finally fixed nade slapping and being able to shoot yourself, thanks to divVerent
Severin Meyer [Thu, 5 Feb 2015 17:09:49 +0000 (18:09 +0100)]
Make the weapon panel even more symmetrical and snappier
terencehill [Thu, 5 Feb 2015 14:52:06 +0000 (15:52 +0100)]
Revert
855007679 as it caused bug #1453 "Advanced settings dialog does not close after pressing OK"
Mario [Thu, 5 Feb 2015 13:14:55 +0000 (00:14 +1100)]
If round hasn't started, don't imprison players (possible fix for players burning after respawn at round end)
Mario [Thu, 5 Feb 2015 12:36:48 +0000 (23:36 +1100)]
Don't remove nades that pass through weapon clips (has some side effects, but also breaks maps like xoylent if nade is removed)
Mario [Thu, 5 Feb 2015 11:23:05 +0000 (22:23 +1100)]
Make it really compile
Mario [Thu, 5 Feb 2015 11:17:13 +0000 (22:17 +1100)]
Fix compile
Severin Meyer [Wed, 4 Feb 2015 20:05:58 +0000 (21:05 +0100)]
Distribute the icons on the weapons panel more symmetrically and snap the panel to the screen edge
Mario [Wed, 4 Feb 2015 16:38:30 +0000 (03:38 +1100)]
435 conflicts, 135 files conflicts, fixed in 7 hours #nolife
Mario [Wed, 4 Feb 2015 09:41:41 +0000 (20:41 +1100)]
Add a fallback for TDM (untested potential fix to a nasty crash)
Mario [Wed, 4 Feb 2015 07:40:58 +0000 (18:40 +1100)]
Add a little hack to fix packet loss caused by findradius
Mario [Wed, 4 Feb 2015 03:20:10 +0000 (03:20 +0000)]
Merge branch 'sev/crosshairs_size' into 'master'
Crosshair size
I've noticed that the default scale of the crosshairs is quite small. This causes aliasing issues, even at a resolution of 1920x1080, esp. for the per-weapon crosshairs.
With this branch I propose to slightly increase the default scale of all crosshairs from 0.3 to 0.4, as well as to increase some of the per-weapon crosshair scales,
to improve the first impression.
Before/After (1920x1080):
![crosshairs](https://gitlab.com/uploads/xonotic/xonotic-data.pk3dir/
15a0b111db /crosshairs.png)
See merge request !104
Severin Meyer [Tue, 3 Feb 2015 16:21:36 +0000 (17:21 +0100)]
Slightly increase the default scale of the crosshairs
Mario [Tue, 3 Feb 2015 10:51:50 +0000 (21:51 +1100)]
Merge branch 'sev/new_crosshairs'
Severin Meyer [Tue, 3 Feb 2015 10:08:41 +0000 (11:08 +0100)]
Add new crosshairs to the menu. The old crosshairs remain accessible through the crosshair cvar.
Mario [Tue, 3 Feb 2015 05:31:40 +0000 (05:31 +0000)]
Merge branch 'Mirio/credits' into 'master'
Mirio/credits
Somehow CuBe0wL got lost
See merge request !92
Mario [Tue, 3 Feb 2015 04:40:48 +0000 (04:40 +0000)]
Merge branch 'terencehill/weapon_panel_fix' into 'master'
Terencehill/weapon panel fix
Recent weapons panel changes weren't all good so I had to revert them: weapon icons currently are too wide when owning few weapons, onlyowned enabled and the panel shape is more squared.
Then I furtherly improved the previous code to achieve the same sev's goal, that is, more compact layout and better use of the available space.
See merge request !102
Mario [Tue, 3 Feb 2015 04:40:20 +0000 (04:40 +0000)]
Merge branch 'terencehill/string_prefixes_cleanup' into 'master'
Terencehill/string prefixes cleanup
Clean up translation context prefixes
See merge request !89
Mario [Tue, 3 Feb 2015 04:38:14 +0000 (04:38 +0000)]
Merge branch 'terencehill/GetClientErrorString_fix' into 'master'
Terencehill/GetClientErrorString fix
Add color code handling to GetClientErrorString (example command where it gets called: tell ^1wrong_player_name blabla)
See merge request !101
terencehill [Tue, 3 Feb 2015 00:22:56 +0000 (01:22 +0100)]
Add color code handling to GetClientErrorString (example command where it gets called: tell ^1wrong_player_name blabla)
terencehill [Tue, 3 Feb 2015 00:41:19 +0000 (01:41 +0100)]
Merge branch 'master' into terencehill/string_prefixes_cleanup
Conflicts:
qcsrc/menu/xonotic/dialog_multiplayer_profile.qc
terencehill [Mon, 2 Feb 2015 23:37:19 +0000 (00:37 +0100)]
Merge branch 'master' into terencehill/weapon_panel_fix
Conflicts:
qcsrc/client/hud.qc
terencehill [Mon, 2 Feb 2015 18:43:13 +0000 (19:43 +0100)]
Fix weapon count when there's a complain_weapon (add it only if you don't have it!)
terencehill [Mon, 2 Feb 2015 17:52:09 +0000 (18:52 +0100)]
Show default set of owned weapons in the hud editor even if onlyowned is disabled
terencehill [Mon, 2 Feb 2015 16:45:38 +0000 (17:45 +0100)]
Weapons panel: better way to enlarge weapon_size to match desired aspect
Mario [Mon, 2 Feb 2015 10:22:27 +0000 (21:22 +1100)]
Merge remote-tracking branch 'origin/develop'
TimePath [Mon, 2 Feb 2015 09:45:34 +0000 (20:45 +1100)]
Fix post qc_updates merge fallout
TimePath [Mon, 2 Feb 2015 09:26:21 +0000 (20:26 +1100)]
Fix post qc_updates merge fallout
Mario [Mon, 2 Feb 2015 08:42:40 +0000 (08:42 +0000)]
Merge branch 'Mario/qc_updates' into 'master'
QC Updates
Updates mainly aiding transpilation, but also nice to have if sticking with DarkPlaces
* `float` -> `int`/`bool`
* Helps the transpiler immensely
* Scope visibility reduction
* Replaces `#define` with `const`
* More readable transpiler output (constant names instead of inline values)
* Replaces `vector_[xyz]` with `vector.[xyz]` (but not `entity.vector_[xyz]` because of a compiler bug)
* Removes `-Wno-double-declaration`
* Required for compilation of transpiled source
* Removes useless uses of `var`, `noref` and `local`
* Uses `#include` instead of `progs.src`
* Will help qc_physics
Squashed preview: [
7239bacff8b7fb9fe9541d6c6dc852e78b5049ac ](https://gitlab.com/xonotic/xonotic-data.pk3dir/commit/
7239bacff8b7fb9fe9541d6c6dc852e78b5049ac ?force_show_diff=true)
See merge request !97
TimePath [Mon, 2 Feb 2015 08:23:09 +0000 (19:23 +1100)]
Merge branch 'master' into Mario/qc_updates
Conflicts:
qcsrc/menu/classes.c
qcsrc/menu/item/modalcontroller.qc
qcsrc/menu/menu.qh
qcsrc/menu/xonotic/maplist.qc
qcsrc/server/command/banning.qc
qcsrc/server/ipban.qc
qcsrc/server/miscfunctions.qc
TimePath [Mon, 2 Feb 2015 07:32:58 +0000 (18:32 +1100)]
Move functions out of headers
Mario [Mon, 2 Feb 2015 06:56:12 +0000 (17:56 +1100)]
Merge branch 'master' into Mario/combined_updates
Mario [Mon, 2 Feb 2015 06:54:15 +0000 (17:54 +1100)]
Hide preconnect hook behind an #ifdef
Mario [Mon, 2 Feb 2015 05:11:07 +0000 (05:11 +0000)]
Merge branch 'TimePath/issues/1451' into 'master'
seta _cl_gender
Closes xonotic/xonotic-data.pk3dir#1451
See merge request !100
TimePath [Mon, 2 Feb 2015 00:39:08 +0000 (11:39 +1100)]
seta _cl_gender
TimePath [Mon, 2 Feb 2015 00:19:10 +0000 (11:19 +1100)]
Fix a regression
Rudolf Polzer [Sun, 1 Feb 2015 17:58:58 +0000 (18:58 +0100)]
Serverbench: include full scoreboard.
terencehill [Sun, 1 Feb 2015 13:09:39 +0000 (14:09 +0100)]
Merge branch 'master' into terencehill/weapon_panel_fix
Mario [Sun, 1 Feb 2015 12:39:45 +0000 (23:39 +1100)]
Possibly fix server console spam when IRC users chat
Mario [Sun, 1 Feb 2015 11:37:43 +0000 (22:37 +1100)]
Remove keys instantly rather than on a delay (partially fixes the problem of keys teleporting to world origin for half a second)
Mario [Sun, 1 Feb 2015 10:54:53 +0000 (10:54 +0000)]
Merge branch 'Melanosuchus/preconnect' into 'master'
ClientPreConnect
Sends an event log on ClientPreConnect, requires xonotic/darkplaces!14
The log format is basically the same as the one used in :join.
See merge request !99
Mario [Sun, 1 Feb 2015 08:20:35 +0000 (19:20 +1100)]
Merge branch 'master' into Mario/combined_updates
Mario [Sun, 1 Feb 2015 08:19:33 +0000 (08:19 +0000)]
Merge branch 'terencehill/menu_optimizations' into 'master'
Terencehill/menu optimizations
Optimize ModalController_draw code so that #1432 (Header labels flicker) gets partially fixed (that is, only in the tab that fades out)
More details in this comment: https://gitlab.com/xonotic/xonotic-data.pk3dir/issues/1432#note_709376
See merge request !79
Mario [Sun, 1 Feb 2015 08:11:27 +0000 (19:11 +1100)]
Port the so-called "mod pack" to a branch for easier maintenance and eventually porting of features to separate branches
Mario [Sun, 1 Feb 2015 04:31:41 +0000 (04:31 +0000)]
Merge branch 'Melanosuchus/kickban-unconnected' into 'master'
Melanosuchus/kickban unconnected
Changes:
* Unconnected clients cannot call votes
* Kickban won't discard said unconnected clients
* Bans are enforced on unconnected clients
See merge request !98
Mattia Basaglia [Sat, 31 Jan 2015 21:52:41 +0000 (22:52 +0100)]
Event log on ClientPreConnect
Mattia Basaglia [Sat, 31 Jan 2015 21:34:46 +0000 (22:34 +0100)]
Merge branch 'master' of ssh://gitlab.com/xonotic/xonotic-data.pk3dir into Melanosuchus/kickban-unconnected
Rudolf Polzer [Sat, 31 Jan 2015 19:47:23 +0000 (20:47 +0100)]
Don't use the name "binds-default.cfg"!
Names ending in "default.cfg" are magic to DarkPlaces, and lead to the
engine cvar defaults getting locked.
Fixes #1444, #1448.
TimePath [Sat, 31 Jan 2015 08:14:09 +0000 (19:14 +1100)]
Tweak the order of some #includes
TimePath [Sat, 31 Jan 2015 04:25:46 +0000 (15:25 +1100)]
Declare keycodes as ints
TimePath [Sat, 31 Jan 2015 04:25:34 +0000 (15:25 +1100)]
Bring back `TRUE` and `FALSE` as deprecated aliases
TimePath [Sat, 31 Jan 2015 04:05:34 +0000 (15:05 +1100)]
Remove client and menu sys-post and sys-pre
Mario [Sat, 31 Jan 2015 02:55:48 +0000 (02:55 +0000)]
Merge branch 'Mario/target_items_fix' into 'master'
Merge branch Mario/target_items_fix (XXS merge request)
Fixes target_items not compatible with old weapon names.
See merge request !96
Mario [Sat, 31 Jan 2015 02:40:58 +0000 (13:40 +1100)]
Possibly fix issue with old weapon names and target_items
Mario [Fri, 30 Jan 2015 10:27:59 +0000 (21:27 +1100)]
Make Luma the default HUD and menu theme