Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

engine
- Activity
- Members
- Labels
- Redmine
- Releases
- Model registry

Snippets Groups Projects

2bf736b5

Commit 2bf736b5 authored Aug 25, 2018 by Byurrrer

Downloads
- Plain Diff

Merge branch 'dev' of https://dev.ds-servers.com/sip/engine into dev

parents e814a7d3 cfcbfe26

No related branches found

No related tags found

1 merge request!1Version 0.10.1

Changes 8

Show whitespace changes

Inline Side-by-side

Showing

build/gamesource/gui/menu/settings_video.html 1 addition, 1 deletion

build/gamesource/gui/menu/settings_video.html
source/common 1 addition, 1 deletion

source/common
source/game/BaseCharacter.cpp 1 addition, 1 deletion

source/game/BaseCharacter.cpp
source/game/LightPoint.cpp 1 addition, 1 deletion

source/game/LightPoint.cpp
source/geom/green.cpp 10 additions, 2 deletions

source/geom/green.cpp
source/physics/PhyWorld.cpp 130 additions, 37 deletions

source/physics/PhyWorld.cpp
source/physics/PhyWorld.h 17 additions, 16 deletions

source/physics/PhyWorld.h
source/physics/sxphysics_dll.cpp 11 additions, 11 deletions

source/physics/sxphysics_dll.cpp

with 172 additions and 70 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment