]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
TimePath [Sun, 29 Nov 2015 02:45:20 +0000 (13:45 +1100)]
Merge branch 'master' into TimePath/stats
# Conflicts:
# qcsrc/client/hud/panel/ammo.qc
# qcsrc/client/hud/panel/powerups.qc
# qcsrc/client/view.qc
# qcsrc/common/mutators/mutator/nades/nades.qc
# qcsrc/common/physics.qc
# qcsrc/common/physics.qh
# qcsrc/common/weapons/weapon/vortex.qc
# qcsrc/lib/registry.qh
# qcsrc/lib/stats.qh
TimePath [Sun, 29 Nov 2015 00:32:01 +0000 (11:32 +1100)]
Stats: port vectors
TimePath [Sat, 28 Nov 2015 06:35:15 +0000 (17:35 +1100)]
Stats: port gamemodes
TimePath [Sat, 28 Nov 2015 03:39:52 +0000 (14:39 +1100)]
Stats: port remaining movevars
Mario [Fri, 27 Nov 2015 14:48:44 +0000 (00:48 +1000)]
Finish off the last of the stats
Mario [Fri, 27 Nov 2015 14:13:42 +0000 (00:13 +1000)]
Do another bunch of stats
TimePath [Tue, 24 Nov 2015 11:42:29 +0000 (22:42 +1100)]
Stats: port 5 more
TimePath [Tue, 24 Nov 2015 11:16:50 +0000 (22:16 +1100)]
Stats: remove dependence on engine assigned stats
TimePath [Mon, 23 Nov 2015 09:18:16 +0000 (20:18 +1100)]
Weapons: cache WepSet
TimePath [Mon, 23 Nov 2015 06:00:10 +0000 (17:00 +1100)]
Registry: break limits
TimePath [Mon, 23 Nov 2015 05:44:43 +0000 (16:44 +1100)]
entcs: use ArrayList
TimePath [Mon, 23 Nov 2015 05:24:12 +0000 (16:24 +1100)]
ArrayList: implement
List with O(1) access
TimePath [Mon, 23 Nov 2015 05:18:45 +0000 (16:18 +1100)]
Shownames: optimize
Mario [Sun, 22 Nov 2015 21:21:20 +0000 (07:21 +1000)]
Update bulldozer to use new assets by KingPimpCommander, also add a comment to make sure someone doesn't make the same mistake with impulses
TimePath [Sun, 22 Nov 2015 11:29:15 +0000 (22:29 +1100)]
General cleanup/optimize
TimePath [Sun, 22 Nov 2015 05:10:52 +0000 (16:10 +1100)]
lib/iter: FOREACH_ENTITY
TimePath [Sun, 22 Nov 2015 03:38:46 +0000 (14:38 +1100)]
Physics: unroll unstick_offsets
TimePath [Sat, 21 Nov 2015 10:23:34 +0000 (21:23 +1100)]
csqcmodel: optimize server2csqc
TimePath [Sat, 21 Nov 2015 09:06:49 +0000 (20:06 +1100)]
CA: fix spectate
closes #1592
Mario [Sat, 21 Nov 2015 07:07:41 +0000 (17:07 +1000)]
Do 10 more stats
Mario [Sat, 21 Nov 2015 06:06:38 +0000 (16:06 +1000)]
Add the last 2 remaining brick types for the main bulldozer campaign
TimePath [Fri, 20 Nov 2015 05:54:41 +0000 (16:54 +1100)]
entcs: unset .has_origin when player model leaves PVS
Mario [Fri, 20 Nov 2015 02:25:33 +0000 (12:25 +1000)]
Don't send weapon priority on update, as this can break in-game stuff (like weaplast command) and switch the player's weapon to "best"
Mario [Fri, 20 Nov 2015 02:11:43 +0000 (02:11 +0000)]
Merge branch 'terencehill/hud_cvars' into 'master'
Cleanups / fixes of some hud-related cvars
See merge request !259
TimePath [Wed, 18 Nov 2015 02:05:19 +0000 (13:05 +1100)]
CTS: fix player not being reset
terencehill [Tue, 17 Nov 2015 22:55:06 +0000 (23:55 +0100)]
HUD skins: sync cfg exporter with cfg files
terencehill [Tue, 17 Nov 2015 19:38:35 +0000 (20:38 +0100)]
Get rid of a pointless convention (unquoted main panel cvar value) that was broken by the minigame panels cvars
terencehill [Tue, 17 Nov 2015 18:40:24 +0000 (19:40 +0100)]
hud_configure_grid_xsize and hud_configure_grid_ysize must have 6 decimal digits otherwise the relative sliders in the HUD Setup dialog doesn't recognize them
Mario [Tue, 17 Nov 2015 11:58:16 +0000 (21:58 +1000)]
Add level 5
Mario [Tue, 17 Nov 2015 10:59:47 +0000 (20:59 +1000)]
Do another 6
Mario [Tue, 17 Nov 2015 10:51:23 +0000 (20:51 +1000)]
Port another 10 stats
TimePath [Tue, 17 Nov 2015 08:36:02 +0000 (08:36 +0000)]
Merge branch 'TimePath/csqc_sounds' into 'master'
CSQC player sounds
`cl_forceplayermodels 1` users rejoice!
See merge request !251
TimePath [Tue, 17 Nov 2015 08:37:01 +0000 (19:37 +1100)]
Globalsounds: update entcs origin
TimePath [Tue, 17 Nov 2015 08:33:34 +0000 (19:33 +1100)]
Globalsounds: remove optional REGISTRY_SORT parameter
TimePath [Tue, 17 Nov 2015 08:28:31 +0000 (19:28 +1100)]
Playersounds: fix volume
TimePath [Tue, 17 Nov 2015 08:08:12 +0000 (19:08 +1100)]
ent_cs: don't remove on death, really
TimePath [Tue, 17 Nov 2015 07:42:44 +0000 (18:42 +1100)]
ent_cs: don't remove on death
TimePath [Tue, 17 Nov 2015 07:22:00 +0000 (18:22 +1100)]
ent_cs: fix strunzone crash
terencehill [Mon, 16 Nov 2015 19:58:32 +0000 (20:58 +0100)]
Make 2 hud skin cvars into user cvars (hud_panel_timer_increment and hud_panel_physics_speed_unit) so that they remain the same when loading another skin
TimePath [Mon, 16 Nov 2015 10:34:04 +0000 (21:34 +1100)]
Merge branch 'master' into TimePath/csqc_sounds
# Conflicts:
# qcsrc/client/main.qc
# qcsrc/server/cl_player.qh
TimePath [Mon, 16 Nov 2015 09:58:02 +0000 (20:58 +1100)]
ent_cs: rewrite
Mario [Mon, 16 Nov 2015 08:16:10 +0000 (08:16 +0000)]
Merge branch 'Mario/bulldozer' into 'master'
Merge branch Mario/bulldozer (M merge request)
Bulldozer (Sokoban) minigame.
Assets are all from OpenClipArt, license should be fine.
See merge request !258
Mario [Mon, 16 Nov 2015 07:53:02 +0000 (17:53 +1000)]
Fix victory message
Mario [Mon, 16 Nov 2015 07:49:02 +0000 (17:49 +1000)]
Remove trailing semicolon separator
Mario [Mon, 16 Nov 2015 07:20:24 +0000 (17:20 +1000)]
Make victory message more detailed
Mario [Sun, 15 Nov 2015 22:53:54 +0000 (22:53 +0000)]
Merge branch 'terencehill/menu_gametype_sliders' into 'master'
When fraglimit and teams sliders can't be configured for a certain gametype show…
See merge request !256
Mario [Sun, 15 Nov 2015 22:53:01 +0000 (22:53 +0000)]
Merge branch 'terencehill/g_lms_extra_lives' into 'master'
Extralife for g_lms_extra_lives
See merge request !252
Mario [Sun, 15 Nov 2015 22:51:31 +0000 (22:51 +0000)]
Merge branch 'terencehill/menu_serverlist_tooltip' into 'master'
Show a tooltip when the cursor is over the server icons in the serverlist
See merge request !255
Mario [Sun, 15 Nov 2015 22:46:23 +0000 (22:46 +0000)]
Merge branch 'terencehill/menu_saveCvarsMulti_fix' into 'master'
Fix saveCvarsMulti sending cvars prefixed with !
See merge request !257
Mario [Sun, 15 Nov 2015 19:24:04 +0000 (05:24 +1000)]
Add an unfill mode to the fill tool
Mario [Sun, 15 Nov 2015 19:10:44 +0000 (05:10 +1000)]
Add level 4
Mario [Sun, 15 Nov 2015 18:45:18 +0000 (04:45 +1000)]
Show dozer with the correct angle during placement
terencehill [Sun, 15 Nov 2015 18:44:17 +0000 (19:44 +0100)]
Fix saveCvarsMulti sending cvars prefixed with !
Mario [Sun, 15 Nov 2015 18:42:18 +0000 (04:42 +1000)]
Update dozer angle in existing levels
Mario [Sun, 15 Nov 2015 18:41:05 +0000 (04:41 +1000)]
Default pieces to downward angle
Mario [Sun, 15 Nov 2015 18:17:48 +0000 (04:17 +1000)]
Add a placeholder finish level
Mario [Sun, 15 Nov 2015 18:08:09 +0000 (04:08 +1000)]
Add level 3
Mario [Sun, 15 Nov 2015 17:36:57 +0000 (03:36 +1000)]
Clean up both levels a little
Mario [Sun, 15 Nov 2015 17:16:55 +0000 (03:16 +1000)]
Fix moving of dozer
Mario [Sun, 15 Nov 2015 17:10:18 +0000 (03:10 +1000)]
Rework level 1 for new brick textures
Mario [Sun, 15 Nov 2015 16:57:06 +0000 (02:57 +1000)]
Add some new brick textures
Mario [Sun, 15 Nov 2015 16:52:14 +0000 (02:52 +1000)]
Add icons for bulldozer
Mario [Sun, 15 Nov 2015 16:34:03 +0000 (02:34 +1000)]
Merge branch 'master' into Mario/bulldozer
Mario [Sun, 15 Nov 2015 15:31:37 +0000 (01:31 +1000)]
Silence a warning
Mario [Sun, 15 Nov 2015 15:28:27 +0000 (01:28 +1000)]
Add an option to auto return if the toucher is already carrying a flag in manual return mode
Mario [Sun, 15 Nov 2015 14:43:59 +0000 (00:43 +1000)]
Add level saving for admins, and include 2 levels to progress through
terencehill [Sun, 15 Nov 2015 14:02:54 +0000 (15:02 +0100)]
When fraglimit and teams sliders can't be configured for a certain gametype show no handle and no value.
GameType_ConfigureSliders now really configures both fraglimit and teams sliders, not just the former
Mario [Sun, 15 Nov 2015 10:32:10 +0000 (20:32 +1000)]
Merge branch 'master' into Mario/bulldozer
Mario [Sun, 15 Nov 2015 05:19:07 +0000 (15:19 +1000)]
Revert an unintentional change, fixes potential purity issues
TimePath [Sun, 15 Nov 2015 03:01:09 +0000 (14:01 +1100)]
Registry: simplify API
TimePath [Sun, 15 Nov 2015 03:00:52 +0000 (14:00 +1100)]
Map: explicit remove function
terencehill [Sat, 14 Nov 2015 18:53:51 +0000 (19:53 +0100)]
Show a tooltip when the cursor is over the server icons in the serverlist
Mario [Sat, 14 Nov 2015 13:33:59 +0000 (23:33 +1000)]
Port 10 more
Mario [Sat, 14 Nov 2015 13:05:51 +0000 (23:05 +1000)]
Port clipload and clipsize
Mario [Sat, 14 Nov 2015 12:59:39 +0000 (22:59 +1000)]
Port leadlimit
Mario [Sat, 14 Nov 2015 12:52:52 +0000 (22:52 +1000)]
Port shotorg stat
TimePath [Sat, 14 Nov 2015 09:45:48 +0000 (20:45 +1100)]
Reset: `this` param
TimePath [Sat, 14 Nov 2015 08:15:18 +0000 (19:15 +1100)]
ReadyRestart: revert uncrustify regression, fixes #1585
TimePath [Sat, 14 Nov 2015 07:45:40 +0000 (07:45 +0000)]
Merge branch 'terencehill/announcer_fix' into 'master'
Fix missing countdown messages and announcements when a round is starting. Fixes #1589
See merge request !254
terencehill [Fri, 13 Nov 2015 17:28:27 +0000 (18:28 +0100)]
Fix missing countdown messages and announcements when a round is starting. Fixes #1589
Mirio [Fri, 13 Nov 2015 18:29:58 +0000 (19:29 +0100)]
Merge branch 'sev/hud_teamkill_icons'
Severin Meyer [Fri, 13 Nov 2015 17:51:11 +0000 (18:51 +0100)]
Add missing teamkill icons to default HUD theme
Mario [Fri, 13 Nov 2015 16:54:23 +0000 (02:54 +1000)]
Experimental editor
Mario [Fri, 13 Nov 2015 14:29:42 +0000 (00:29 +1000)]
Merge branch 'master' into Mario/bulldozer
TimePath [Fri, 13 Nov 2015 06:04:24 +0000 (17:04 +1100)]
Minigames: fix fatal error
TimePath [Fri, 13 Nov 2015 05:25:43 +0000 (16:25 +1100)]
Net: float/vector IO
TimePath [Fri, 13 Nov 2015 03:15:19 +0000 (14:15 +1100)]
Merge branch 'master' into TimePath/csqc_sounds
# Conflicts:
# qcsrc/server/cl_player.qh
Mario [Fri, 13 Nov 2015 01:32:33 +0000 (11:32 +1000)]
Fix notification again
Mario [Fri, 13 Nov 2015 00:08:29 +0000 (10:08 +1000)]
Add an option to control the color saturation of the beam
Mario [Thu, 12 Nov 2015 22:15:18 +0000 (08:15 +1000)]
Enable the new beam by default
Mario [Thu, 12 Nov 2015 21:29:27 +0000 (07:29 +1000)]
Fix connecting message only showing to the connecting player
Mario [Thu, 12 Nov 2015 10:47:04 +0000 (20:47 +1000)]
Merge branch 'Mario/colorbeams_v2'
Mario [Thu, 12 Nov 2015 10:17:35 +0000 (20:17 +1000)]
Add an extra option to change how long beams last
Mario [Thu, 12 Nov 2015 10:13:41 +0000 (20:13 +1000)]
Colorful vaporizer beams, with a cvar to disable
Mario [Thu, 12 Nov 2015 09:42:29 +0000 (19:42 +1000)]
Fix a crash
Mario [Thu, 12 Nov 2015 06:20:46 +0000 (16:20 +1000)]
Add a nasty hook to customise impact effects
Mario [Thu, 12 Nov 2015 05:57:17 +0000 (15:57 +1000)]
Add a mutator hook to customise vortex beam
terencehill [Wed, 11 Nov 2015 20:57:34 +0000 (21:57 +0100)]
Use a more appropriated check
terencehill [Wed, 11 Nov 2015 20:22:02 +0000 (21:22 +0100)]
LMS, g_lms_extra_lives enabled: turn MegaHealth into Extralife powerup (like in Instagib)
TimePath [Wed, 11 Nov 2015 11:22:22 +0000 (22:22 +1100)]
Vector: inline cross function