Andrey Akhmichin 5cb433092b Merge branch 'master' into sohl1.2

2019-07-12 06:14:01 +05:00

..

activity.h

Spirit 1.2

2017-12-18 02:39:44 +03:00

activitymap.h

Spirit 1.2

2017-12-18 02:39:44 +03:00

aflock.cpp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

agrunt.cpp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

airtank.cpp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

alias.cpp

Fix some warnings.

2018-02-12 21:09:39 +05:00

Android.mk

Update Android.mk.

2018-04-09 21:22:07 +05:00

animating.cpp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

animation.cpp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

animation.h

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

apache.cpp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

barnacle.cpp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

barney.cpp

Fix some warnings.

2018-02-12 21:09:39 +05:00

basemonster.h

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

bigmomma.cpp

Fix some warnings.

2018-02-12 21:09:39 +05:00

bloater.cpp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

bmodels.cpp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

bullsquid.cpp

Merge branch 'master' into sohl1.2

2019-07-12 06:14:01 +05:00

buttons.cpp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

cbase.cpp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

cbase.h

Merge branch 'master' into sohl1.2

2018-03-31 17:24:38 +05:00

cdll_dll.h

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

client.cpp

Merge branch 'master' into sohl1.2

2019-07-12 06:14:01 +05:00

client.h

Spirit 1.2

2017-12-18 02:39:44 +03:00

CMakeLists.txt

Merge branch 'cmake' into sohl1.2

2018-09-12 06:04:01 +05:00

combat.cpp

Fix some warnings.

2018-02-12 21:09:39 +05:00

compile.bat

Add spaces between source files in compile.bat

2019-05-02 13:12:57 +03:00

controller.cpp

Fix some warnings.

2018-02-12 21:09:39 +05:00

crossbow.cpp

Merge branch 'master' into sohl1.2

2019-07-12 06:14:01 +05:00

crowbar.cpp

Merge branch 'master' into sohl1.2

2019-07-12 06:14:01 +05:00

decals.h

Spirit 1.2

2017-12-18 02:39:44 +03:00

defaultai.cpp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

defaultai.h

Spirit 1.2

2017-12-18 02:39:44 +03:00

doors.cpp

Merge branch 'master' into sohl1.2

2019-07-12 06:14:01 +05:00

doors.h

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

effects.cpp

Fix some warnings.

2018-02-12 21:09:39 +05:00

effects.h

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

egon.cpp

Merge branch 'master' into sohl1.2

2019-07-12 06:14:01 +05:00

enginecallback.h

Spirit 1.2

2017-12-18 02:39:44 +03:00

explode.cpp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

explode.h

Spirit 1.2

2017-12-18 02:39:44 +03:00

exportdef.h

Spirit 1.2

2017-12-18 02:39:44 +03:00

extdll.h

Try to fix clang build.

2019-07-07 19:45:28 +05:00

flyingmonster.cpp

Spirit 1.2

2017-12-18 02:39:44 +03:00

flyingmonster.h

Spirit 1.2

2017-12-18 02:39:44 +03:00

func_break.cpp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

func_break.h

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

func_tank.cpp

Apply BUzer's fix for func_tank.

2018-02-16 20:41:15 +05:00

game.cpp

Merge branch 'master' into sohl1.2

2019-07-12 06:14:01 +05:00

game.h

Replace magic numbers, Put changes under cvar

2019-05-30 22:28:50 +03:00

gamerules.cpp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

gamerules.h

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

gargantua.cpp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

gauss.cpp

Merge branch 'master' into sohl1.2

2019-07-12 06:14:01 +05:00

genericmonster.cpp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

ggrenade.cpp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

globals.cpp

Spirit 1.2

2017-12-18 02:39:44 +03:00

glock.cpp

Add a missing const qualifiers. Remove unneeded casts.

2019-07-07 19:37:24 +05:00

gman.cpp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

h_ai.cpp

Spirit 1.2

2017-12-18 02:39:44 +03:00

h_battery.cpp

Merge branch 'master' into sohl1.2

2019-07-12 06:14:01 +05:00

h_cine.cpp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

h_cycler.cpp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

h_export.cpp

Spirit 1.2

2017-12-18 02:39:44 +03:00

handgrenade.cpp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

hassassin.cpp

Fix some warnings.

2018-02-12 21:09:39 +05:00

headcrab.cpp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

healthkit.cpp

Merge branch 'master' into sohl1.2

2019-07-12 06:14:01 +05:00

hgrunt.cpp

Fix some warnings.

2018-02-12 21:09:39 +05:00

hl.def

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

hl.dsp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

hornet.cpp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

hornet.h

Spirit 1.2

2017-12-18 02:39:44 +03:00

hornetgun.cpp

Add a missing const qualifiers. Remove unneeded casts.

2019-07-07 19:37:24 +05:00

houndeye.cpp

Merge branch 'master' into sohl1.2

2019-07-12 06:14:01 +05:00

ichthyosaur.cpp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

islave_deamon.cpp

Update islave_deamon.cpp.

2018-02-16 12:36:01 +05:00

items.cpp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

items.h

Spirit 1.2

2017-12-18 02:39:44 +03:00

leech.cpp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

lights.cpp

Merge branch 'master' into sohl1.2

2018-07-16 04:51:30 +05:00

locus.cpp

Fix some warnings.

2018-02-12 21:09:39 +05:00

locus.h

Spirit 1.2

2017-12-18 02:39:44 +03:00

Makefile

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

maprules.cpp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

maprules.h

Spirit 1.2

2017-12-18 02:39:44 +03:00

monsterevent.h

Spirit 1.2

2017-12-18 02:39:44 +03:00

monstermaker.cpp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

monsters.cpp

Merge branch 'master' into sohl1.2

2019-07-12 06:14:01 +05:00

monsters.h

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

monsterstate.cpp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

mortar.cpp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

movewith.cpp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

movewith.h

Spirit 1.2

2017-12-18 02:39:44 +03:00

mp5.cpp

Merge branch 'master' into sohl1.2

2019-07-12 06:14:01 +05:00

mpstubb.cpp

Apply some @AlliedModders's patches.

2017-06-29 18:56:03 +05:00

multiplay_gamerules.cpp

Merge branch 'master' into sohl1.2

2018-04-14 05:17:34 +05:00

nihilanth.cpp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

nodes_compat.h

Replaced magic numbers with defines in dlls/nodes*

2019-04-11 16:18:22 +03:00

nodes.cpp

Merge branch 'master' into sohl1.2

2019-07-12 06:14:01 +05:00

nodes.h

Replaced magic numbers with defines in dlls/nodes*

2019-04-11 16:18:22 +03:00

observer.cpp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

osprey.cpp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

pathcorner.cpp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

physcallback.h

Do not reorganize variables in classes. Add missing #pragma once directives and more #include guards.

2017-12-11 02:44:30 +05:00

plane.cpp

Spirit 1.2

2017-12-18 02:39:44 +03:00

plane.h

Spirit 1.2

2017-12-18 02:39:44 +03:00

plats.cpp

Merge branch 'master' into sohl1.2

2019-07-12 06:14:01 +05:00

player.cpp

Reorder messages registration list.

2018-10-08 14:36:56 +05:00

player.h

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

playermonster.cpp

All copyright symbols to (c)

2018-01-19 20:00:32 +03:00

prop.cpp

Remove unneeded casts.

2017-07-24 02:47:26 +05:00

python.cpp

Merge branch 'master' into sohl1.2

2019-07-12 06:14:01 +05:00

rat.cpp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

replace.sh

Add sed script and convert all SetXXX macros

2016-03-02 11:39:18 +00:00

roach.cpp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

rpg.cpp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

satchel.cpp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

saverestore.h

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

schedule.cpp

Revert changes in schedule.cpp.

2018-02-16 12:29:42 +05:00

schedule.h

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

scientist.cpp

Merge branch 'master' into sohl1.2

2019-07-12 06:14:01 +05:00

scripted.cpp

Fix some warnings.

2018-02-12 21:09:39 +05:00

scripted.h

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

scriptevent.h

Spirit 1.2

2017-12-18 02:39:44 +03:00

shotgun.cpp

Merge branch 'master' into sohl1.2

2019-07-12 06:14:01 +05:00

singleplay_gamerules.cpp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

skill.cpp

Spirit 1.2

2017-12-18 02:39:44 +03:00

skill.h

Spirit 1.2

2017-12-18 02:39:44 +03:00

sound.cpp

Merge branch 'master' into sohl1.2

2019-07-12 06:14:01 +05:00

soundent.cpp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

soundent.h

Spirit 1.2

2017-12-18 02:39:44 +03:00

spectator.cpp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

spectator.h

Spirit 1.2

2017-12-18 02:39:44 +03:00

squad.h

All copyright symbols to (c)

2018-01-19 20:00:32 +03:00

squadmonster.cpp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

squadmonster.h

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

squeakgrenade.cpp

Merge branch 'master' into sohl1.2

2019-07-12 06:14:01 +05:00

stats.cpp

All copyright symbols to (c)

2018-01-19 20:00:32 +03:00

subs.cpp

Merge branch 'master' into sohl1.2

2019-07-12 06:14:01 +05:00

talkmonster.cpp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

talkmonster.h

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

teamplay_gamerules.cpp

Spirit 1.2

2017-12-18 02:39:44 +03:00

teamplay_gamerules.h

Spirit 1.2

2017-12-18 02:39:44 +03:00

tempmonster.cpp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

tentacle.cpp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

trains.h

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

triggers.cpp

Fix some warnings.

2018-02-12 21:09:39 +05:00

tripmine.cpp

Merge branch 'master' into sohl1.2

2019-07-12 06:14:01 +05:00

turret.cpp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

util.cpp

Merge branch 'master' into sohl1.2

2019-07-12 06:14:01 +05:00

util.h

Merge branch 'master' into sohl1.2

2019-07-12 06:14:01 +05:00

vector.h

Spirit 1.2

2017-12-18 02:39:44 +03:00

weapons.cpp

Merge branch 'master' into sohl1.2

2019-07-12 06:14:01 +05:00

weapons.h

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

world.cpp

Merge branch 'master' into sohl1.2

2018-04-14 05:17:34 +05:00

wscript

wscript: strip lib prefix for HLSDK

2019-05-06 04:14:48 +03:00

Wxdebug.cpp

move useless files to useless/dlls directory.

2016-06-25 21:45:47 +05:00

wxdebug.h

move useless files to useless/dlls directory.

2016-06-25 21:45:47 +05:00

xen.cpp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00

zombie.cpp

Merge branch 'master' into sohl1.2

2017-12-18 23:47:12 +03:00