Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dev 2021-02-07 #66

Merged
merged 70 commits into from
Feb 13, 2021
Merged

Dev 2021-02-07 #66

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
b01d12f
Don't use pandaIncludes.h.
IsakTheHacker Feb 7, 2021
193da35
Add useful page.
IsakTheHacker Feb 7, 2021
19c892e
Move game::setConsoleTitle function to platform specific win32 source…
IsakTheHacker Feb 7, 2021
4f38f28
Include platformPicker.h in gameFunctions.h.
IsakTheHacker Feb 7, 2021
33d4771
Add two new source files for linux and windows specific code respecti…
IsakTheHacker Feb 7, 2021
e906ea6
Move setConsoleTitle definition to win32Platform.cpp.
IsakTheHacker Feb 7, 2021
9840745
Set console title at startup.
IsakTheHacker Feb 7, 2021
97ec143
Change console title.
IsakTheHacker Feb 7, 2021
610b816
Change console title again.
IsakTheHacker Feb 7, 2021
090a8d6
Fix python link errors when building with debugmode.
IsakTheHacker Feb 7, 2021
b960d1c
Add new configurations for Linux.
IsakTheHacker Feb 7, 2021
a693e5b
Change some options for the linux configurations.
IsakTheHacker Feb 7, 2021
c569b33
Remove crap source file.
IsakTheHacker Feb 7, 2021
ee8a5c8
Remove Collision.cpp.
IsakTheHacker Feb 7, 2021
ff8e471
Sort values in CppProperties.json.
IsakTheHacker Feb 7, 2021
67983e0
Add exception handling when saving universes.
IsakTheHacker Feb 7, 2021
36946ad
Merge branch 'main' into dev
IsakTheHacker Feb 7, 2021
7cc2efd
Change window title to "Prealpha 0.1.5".
IsakTheHacker Feb 7, 2021
466d921
Add snow texture.
IsakTheHacker Feb 7, 2021
c9a0537
Add new function: game::setTextColor.
IsakTheHacker Feb 7, 2021
ba9f672
Add FG_COLORS and BG_COLORS enums.
IsakTheHacker Feb 7, 2021
06c29ba
Commit staged changes.
IsakTheHacker Feb 7, 2021
76e1a23
Define the global HANDLE h in win32Platform.cpp instead of gameFuncti…
IsakTheHacker Feb 7, 2021
a37d4a1
Add overload for game::setTextColor which doesn't require a HANDLE ar…
IsakTheHacker Feb 7, 2021
5e4e144
Use function game::setTextColor inside all log functions.
IsakTheHacker Feb 7, 2021
3132689
Use game::setTextColor when scene graph statistics gets printed.
IsakTheHacker Feb 7, 2021
ee52c79
Add setConsoleTitle function for linux platforms.
IsakTheHacker Feb 8, 2021
294ce9a
Remove unused code.
IsakTheHacker Feb 8, 2021
4384f65
Readd global directional light.
IsakTheHacker Feb 8, 2021
5579def
Remove unused code again.
IsakTheHacker Feb 8, 2021
640bd9b
Testing Panda3D's particle system.
IsakTheHacker Feb 8, 2021
f94918f
Replace globalClock with ClockObject::get_global_clock().
IsakTheHacker Feb 8, 2021
0d1e49e
Replace taskMgr with AsyncTaskManager::get_global_ptr().
IsakTheHacker Feb 8, 2021
741a60d
Organize main.cpp
IsakTheHacker Feb 8, 2021
9c081ea
Use deltatime for player movement in X and Y axis.
IsakTheHacker Feb 8, 2021
71a1d88
Use deltatime for player movement in Z axis.
IsakTheHacker Feb 8, 2021
4510243
Change some particle settings.
IsakTheHacker Feb 8, 2021
adc804e
Don't try to save other chunks if one chunk has failed.
IsakTheHacker Feb 8, 2021
3509a74
Remove unnecessary code and organize some things.
IsakTheHacker Feb 8, 2021
608f8f1
Add exception handling for when the user tries to remove a block.
IsakTheHacker Feb 9, 2021
a1098dd
Add some code comments.
IsakTheHacker Feb 10, 2021
feef109
Move hotbar updating to its own task.
IsakTheHacker Feb 10, 2021
56e0b94
Add sand texture
IsakTheHacker Feb 10, 2021
1dcc77e
Export sand texture to png format.
IsakTheHacker Feb 10, 2021
9babed9
Add configuration file for sand block
IsakTheHacker Feb 10, 2021
3cd1cc3
Make blocky an entity.
IsakTheHacker Feb 10, 2021
df071c5
Remove project for the old textbased installer.
IsakTheHacker Feb 11, 2021
fc770cb
Change name of VS project.
IsakTheHacker Feb 11, 2021
e13cf1b
Ignore binary.
IsakTheHacker Feb 11, 2021
096dee1
Add sand block to hotbar.
IsakTheHacker Feb 11, 2021
5686391
Add prototype for lakes and beaches.
IsakTheHacker Feb 11, 2021
bd8667b
Change sneak-distance option.
IsakTheHacker Feb 11, 2021
3473934
Decrease player x and y speed whilst sneaking.
IsakTheHacker Feb 11, 2021
3327fe6
Don't rotate items in hotbar.
IsakTheHacker Feb 11, 2021
195873c
Add ability to specify parent on creation of game::object.
IsakTheHacker Feb 11, 2021
c398d6d
Replace hotbar placeholders with real items.
IsakTheHacker Feb 11, 2021
a746570
Remove unnecessary output when game::objects are constructed.
IsakTheHacker Feb 11, 2021
3d10ae4
Add new button in pause menu for generating new universes.
IsakTheHacker Feb 11, 2021
de0bc78
Add pass function for Panda3D events: epass
IsakTheHacker Feb 11, 2021
380d6e4
Hide crosshair when pause menu is activated.
IsakTheHacker Feb 11, 2021
c6c002b
Add configuration file for water.
IsakTheHacker Feb 11, 2021
95f8659
Add water to hotbar.
IsakTheHacker Feb 11, 2021
86b9e7e
Add support for transparency and specify transparency parameter for w…
IsakTheHacker Feb 11, 2021
2589015
Add water texture.
IsakTheHacker Feb 11, 2021
404a6fa
Use water texture in water config file.
IsakTheHacker Feb 11, 2021
b3a201c
Generate lakes with water blocks.
IsakTheHacker Feb 11, 2021
ebe25ed
Change properties for water.
IsakTheHacker Feb 11, 2021
81592c7
Don't generate trees underwater.
IsakTheHacker Feb 11, 2021
110c2e4
Add appendItem function to inventory class.
IsakTheHacker Feb 12, 2021
5ab6959
Add getItems function to inventory class.
IsakTheHacker Feb 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Change some options for the linux configurations.
  • Loading branch information
@IsakTheHacker
IsakTheHacker committed Feb 7, 2021
commit a693e5b7a489419eed210e2141c2fb7859e03655
21 changes: 21 additions & 0 deletions CppProperties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,27 @@
"_UNICODE"
],
"intelliSenseMode": "windows-msvc-x64"
},
{
"name": "Linux-Debug",
"generator": "Unix Makefiles",
"configurationType": "Debug",
"cmakeExecutable": "/usr/bin/cmake",
"remoteCopySourcesExclusionList": [ ".vs", ".git", "out" ],
"cmakeCommandArgs": "",
"buildCommandArgs": "",
"ctestCommandArgs": "",
"inheritEnvironments": [ "linux_x64" ],
"remoteMachineName": "${defaultRemoteMachineName}",
"remoteCMakeListsRoot": "$HOME/.vs/${projectDirName}/${workspaceHash}/src",
"remoteBuildRoot": "$HOME/.vs/${projectDirName}/${workspaceHash}/out/build/${name}",
"remoteInstallRoot": "$HOME/.vs/${projectDirName}/${workspaceHash}/out/install/${name}",
"remoteCopySources": true,
"rsyncCommandArgs": "-t --delete --delete-excluded",
"remoteCopyBuildOutput": false,
"remoteCopySourcesMethod": "rsync",
"addressSanitizerRuntimeFlags": "detect_leaks=0",
"variables": []
}
]
}
2 changes: 1 addition & 1 deletion Panda project.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ Global
{1EA3B4B7-2E9E-4E28-832F-75E29E069A0B}.Linux-Debug|ARM.Build.0 = Linux-Release|x64
{1EA3B4B7-2E9E-4E28-832F-75E29E069A0B}.Linux-Debug|ARM64.ActiveCfg = Linux-Release|x64
{1EA3B4B7-2E9E-4E28-832F-75E29E069A0B}.Linux-Debug|ARM64.Build.0 = Linux-Release|x64
{1EA3B4B7-2E9E-4E28-832F-75E29E069A0B}.Linux-Debug|x64.ActiveCfg = Linux-Release|x64
{1EA3B4B7-2E9E-4E28-832F-75E29E069A0B}.Linux-Debug|x64.ActiveCfg = Debug|x64
{1EA3B4B7-2E9E-4E28-832F-75E29E069A0B}.Linux-Debug|x86.ActiveCfg = Linux-Release|Win32
{1EA3B4B7-2E9E-4E28-832F-75E29E069A0B}.Linux-Release|ARM.ActiveCfg = Linux-Release|Win32
{1EA3B4B7-2E9E-4E28-832F-75E29E069A0B}.Linux-Release|ARM64.ActiveCfg = Linux-Release|Win32
Expand Down
22 changes: 22 additions & 0 deletions Panda project/Panda project.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,28 @@
<IntDir>$(SolutionDir)bin\intermediates\$(Platform)\$(Configuration)\</IntDir>
<ExecutablePath>C:\Users\Administrator\Documents\Panda3d Build\panda3d-1.10.7 Opti\built_x64\bin;$(ExecutablePath)</ExecutablePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Linux-Debug|Win32'">
<OutDir>$(SolutionDir)bin\$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)bin\intermediates\$(Platform)\$(Configuration)\</IntDir>
<IncludePath>$(ProjectDir)src\header;$(ProjectDir)src\header\external;$(ProjectDir)src\header\external\panda;$(ProjectDir)src\header\external\python;$(IncludePath)</IncludePath>
<ReferencePath>$(VC_ReferencesPath_x64);</ReferencePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Linux-Release|Win32'">
<OutDir>$(SolutionDir)bin\$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)bin\intermediates\$(Platform)\$(Configuration)\</IntDir>
<IncludePath>$(ProjectDir)src\header;$(ProjectDir)src\header\external;$(ProjectDir)src\header\external\panda;$(ProjectDir)src\header\external\python;$(IncludePath)</IncludePath>
<ReferencePath>$(VC_ReferencesPath_x64);</ReferencePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Linux-Debug|x64'">
<OutDir>$(SolutionDir)bin\$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)bin\intermediates\$(Platform)\$(Configuration)\</IntDir>
<IncludePath>$(ProjectDir)src\header;$(ProjectDir)src\header\external;$(ProjectDir)src\header\external\panda;$(ProjectDir)src\header\external\python;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Linux-Release|x64'">
<OutDir>$(SolutionDir)bin\$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)bin\intermediates\$(Platform)\$(Configuration)\</IntDir>
<IncludePath>$(ProjectDir)src\header;$(ProjectDir)src\header\external;$(ProjectDir)src\header\external\panda;$(ProjectDir)src\header\external\python;$(IncludePath)</IncludePath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
Expand Down