Pfauenauge
|
b2918c2ebc
|
New Buttons and Input Frame
Former-commit-id: 140b27f9d41de04eb7018d1bbe65012af889a271
|
2019-05-03 13:02:03 +02:00 |
|
Pfauenauge90
|
0dbe9c7846
|
Controls Window
Former-commit-id: e6e83aaa0eb5606b59581c3005b30e969123bb56
|
2019-05-02 20:06:23 +02:00 |
|
Pfauenauge
|
77397788e7
|
rebase
Former-commit-id: d40850ca70c5c833f17cba6a9f16de8c63bb5717
|
2019-05-02 14:44:51 +02:00 |
|
Yeedo
|
b7ba7f0795
|
Use shorter help text format, compact stuff into one format!()
Former-commit-id: 345bef9a2f0714986e4ba6fb24b0bc150023a12e
|
2019-05-01 23:15:43 +01:00 |
|
Pfauenauge
|
5362ac7289
|
rebase
Former-commit-id: 047a4ffcad326721eaff6f77eb9c8b57cfa0b2b4
|
2019-05-01 23:47:09 +02:00 |
|
Pfauenauge
|
8c35f06ed7
|
Controls Window Contents
Former-commit-id: f11a9b4da250ba9bd095220efc9e8fc97d32c983
|
2019-05-01 23:20:31 +02:00 |
|
Pfauenauge
|
1ba1eb20c7
|
Controls Window Text
Former-commit-id: 2e479f29af73fd36b5cb8e6f34b8d2d4265dd100
|
2019-05-01 15:50:41 +02:00 |
|
Pfauenauge
|
777f4066d4
|
changed char head and offset
Former-commit-id: 6e9ca7249a33504bc0b7cf8f5b5591ead0399151
|
2019-05-01 14:11:55 +02:00 |
|
Pfauenauge
|
532a570923
|
rebase
Former-commit-id: b3eef84c3a76629e399827e12327556b4c8c7ffa
|
2019-04-30 13:49:29 +02:00 |
|
Pfauenauge
|
85bdff364d
|
settings window
Former-commit-id: b85c0f656c331195bd9c35f57a2609cd4f34f3fa
|
2019-04-30 12:59:55 +02:00 |
|
Pfauenauge
|
1a12bc91a1
|
settings window
Former-commit-id: 1fc6e52bb860c2f114114bd75ef0b260d9f43871
|
2019-04-30 12:59:10 +02:00 |
|
Pfauenauge
|
e12a1a623a
|
Map Window, Settings Window
Former-commit-id: 72ac20ecdcaccf39c1691be1fbdcb5305d900e78
|
2019-04-30 12:58:30 +02:00 |
|
Pfauenauge
|
052c5ecbda
|
settings window
Former-commit-id: 0dd430bdff017ab95f8df35403c5f4b6d8f10198
|
2019-04-30 12:57:34 +02:00 |
|
Pfauenauge
|
bbbcfd15ba
|
Map Window, Settings Window
Former-commit-id: 74560f37005ec0dc1b5fda6dc18e2b56d74f598d
|
2019-04-30 12:54:46 +02:00 |
|
Yeedo
|
f1e268986b
|
cargo fmt, also remove a stray <<<<HEAD thing
Former-commit-id: 2be13ebd752d8f90fb22358597878dc8dd8df1ef
|
2019-04-29 22:23:31 +01:00 |
|
Yeedo
|
164feaa616
|
fix merge conflicts
Former-commit-id: 72614e5d57607a2095161857df45ce746e8c1b06
|
2019-04-29 22:13:14 +01:00 |
|
Forest Anderson
|
993388e56a
|
Ran fmt on codebase
Former-commit-id: 7fecffa1dc66fffba4f07d45fb80960dc5178f4f
|
2019-04-29 20:37:19 +00:00 |
|
Forest Anderson
|
0ca4b55322
|
Merge branch 'clean-up-gitignore' into 'master'
Fix gitignore and delete gitignores in subdirs
See merge request veloren/veloren!91
Former-commit-id: 689231e73e7a97a49fb3d20d76ccc43af3f2681a
|
2019-04-29 20:14:52 +00:00 |
|
Monty Marz
|
c7b61d5626
|
New Settings Window and Map Window
Former-commit-id: ca6d1c937193cb29afb2dd484c596b79c947f36e
|
2019-04-29 19:04:52 +00:00 |
|
timokoesters
|
f35e8d7b98
|
Fix gitignore and delete gitignores in subdirs
Former-commit-id: 4d57caa521c47d137e29d5b781abbdda6a2d8759
|
2019-04-29 20:43:04 +02:00 |
|
Forest Anderson
|
3c45d3c996
|
Merge branch 'ao-artifact-fix' into 'master'
Fix ambient occlusion artifact
See merge request veloren/veloren!89
Former-commit-id: b529f9df722d8b174b0c8e5ce9ef2d32965d7294
|
2019-04-29 17:00:56 +00:00 |
|
Erocs
|
c68f33babe
|
Add VOXYGEN_LOG env variable to allow detailed terminal logging.
Former-commit-id: 01c29a65311dbd6a4739be5aca9865d4ac0872d9
|
2019-04-29 16:56:38 +00:00 |
|
robojumper
|
cf88e9a5b1
|
Line endings are hard
Former-commit-id: 3a0e48b7571ff706feeff4e089fb9c5d63f6ac7a
|
2019-04-29 17:41:12 +02:00 |
|
robojumper
|
0bd84b58ec
|
Fix occlusion artifact
Former-commit-id: 23be3f1173706076802809576e3455833e64b4e4
|
2019-04-29 17:39:35 +02:00 |
|
Forest Anderson
|
c95bee9838
|
Merge branch '12-terrain-ao' into 'master'
Add terrain and figure ambient occlusion
Closes #12
See merge request veloren/veloren!84
Former-commit-id: 943648d9ca3399e07a275946487d3431ba3832de
|
2019-04-29 13:14:36 +00:00 |
|
robojumper
|
7091557b82
|
Rename mod ao to vol
Former-commit-id: ef126e03761b18151594780777fa27e94efe24d7
|
2019-04-28 23:35:47 +02:00 |
|
robojumper
|
021c6eeda1
|
Generalize meshing and AO code over terrain, figure
Former-commit-id: f0a91173ec5a0a9c683e6d1c222cb74e858625b7
|
2019-04-28 19:12:45 +02:00 |
|
robojumper
|
32509d2fb1
|
Add terrain ambient occlusion
Former-commit-id: de73dcb09f68bcad5dc7431c30849e16f68c5ab7
|
2019-04-28 17:10:09 +02:00 |
|
Pfauenauge
|
3773653072
|
Closable minimap
Former-commit-id: bc92efc783adb780c11c507bd4084e09494a7e32
|
2019-04-28 15:56:40 +02:00 |
|
Yeedo
|
0dbdb185d4
|
Redo settings -> help text, add supplement_events to Window.
Former-commit-id: 2f341c1de302f5600436a3ded1c69af7c9b2c329
|
2019-04-28 14:19:08 +01:00 |
|
Yeedo
|
c032e60d12
|
Tiny fix to prevent settings from permanently being marked as changed
Former-commit-id: c12d760a22926eebc2661be1db4609546286c89a
|
2019-04-28 14:19:08 +01:00 |
|
Yeedo
|
dc5ec137e9
|
Update help window to use player's keybindings (fix #42)
Former-commit-id: b5bc8a8801fd4633ec94ea53a8973bcb891a4fd6
|
2019-04-28 14:19:08 +01:00 |
|
Yeedo
|
ad1fc20cfe
|
Redo settings -> help text, add supplement_events to Window.
Former-commit-id: 5b29776d3f37fbf87842bc61c8d287fe8e66b691
|
2019-04-28 14:19:08 +01:00 |
|
Yeedo
|
00e92e5ea2
|
Tiny fix to prevent settings from permanently being marked as changed
Former-commit-id: 99927ee1ca6c1cabb5268353690ec88425b7ae3d
|
2019-04-28 14:19:08 +01:00 |
|
Yeedo
|
e1fc901b5f
|
Update help window to use player's keybindings (fix #42)
Former-commit-id: c79b4184b279b2e6fbaac8e0b7c641741d8eb51e
|
2019-04-28 14:19:08 +01:00 |
|
Yeedo
|
44f8e834fc
|
Redo settings -> help text, add supplement_events to Window.
Former-commit-id: a0e023c1cce1677cd1178490df9c569b774db6b6
|
2019-04-28 14:19:08 +01:00 |
|
Yeedo
|
48747dd9a9
|
Tiny fix to prevent settings from permanently being marked as changed
Former-commit-id: ce120495a91ce0306bcb010923cd340fc70b87db
|
2019-04-28 14:19:08 +01:00 |
|
Yeedo
|
488132f63b
|
Update help window to use player's keybindings (fix #42)
Former-commit-id: b1d374e83ab134a094b664ada8f35916e4734602
|
2019-04-28 14:19:08 +01:00 |
|
Yeedo
|
be9a399269
|
Redo settings -> help text, add supplement_events to Window.
Former-commit-id: 1e679a6fc3300b6269672650564405c031b151ae
|
2019-04-28 14:19:08 +01:00 |
|
Yeedo
|
7593d4e821
|
Tiny fix to prevent settings from permanently being marked as changed
Former-commit-id: 665a8851526c1386e497064e2b0f3f8689db60d8
|
2019-04-28 14:19:08 +01:00 |
|
Yeedo
|
50c6518d89
|
Update help window to use player's keybindings (fix #42)
Former-commit-id: 5f35a153f05b48ae8c21ae9735080c5c7392e2dc
|
2019-04-28 14:19:08 +01:00 |
|
Pfauenauge90
|
0afbba3303
|
FPS display moved, changes to windows
Former-commit-id: 141d250e29273f59edf661eff7fc7ebd88754435
|
2019-04-28 13:18:00 +02:00 |
|
Pfauenauge90
|
33515bd04c
|
removed test_assets in voxygen
Former-commit-id: 6f2a995cf6905066e41d4224016b3d63dfbcacca
|
2019-04-28 13:18:00 +02:00 |
|
timokoesters
|
a4d7d0d488
|
Implement StartSingleplayerState
Former-commit-id: 982246096fe20c33631c1df3ce172c60b4f49bfe
|
2019-04-27 22:57:55 +02:00 |
|
Joshua Barretto
|
b72c6b7185
|
Merge branch 'master' into 'master'
bag visuals fix
See merge request veloren/veloren!75
Former-commit-id: 30b26e73c0d43ef4f0c3d55154547e5d010a33a7
|
2019-04-25 21:59:55 +00:00 |
|
Pfauenauge
|
d7be49def1
|
Minimap changes, grass colour adjusted
Former-commit-id: 9dd743eb6277c76c0b596592bc8bec4a875038b5
|
2019-04-25 23:43:32 +02:00 |
|
timokoesters
|
fb0b0f682a
|
Fix duplicated code
Former-commit-id: 3096669413032d1bdb43cb349c333948e497b538
|
2019-04-25 22:59:11 +02:00 |
|
Pfauenauge
|
bf8bb9180b
|
bag visuals fix
Former-commit-id: e73f822883badd76d823c69984675a76e9bbbf1e
|
2019-04-25 22:33:14 +02:00 |
|
Joshua Barretto
|
f1b63732af
|
Merge branch 'master' into 'master'
Terrain
Closes #5
See merge request veloren/veloren!66
Former-commit-id: 01d1eb1e0aaae62d0c2a53390fd847db524d217e
|
2019-04-25 19:35:35 +00:00 |
|
Forest Anderson
|
cabb06717b
|
Merge branch 'show-mouse-esc' into 'master'
Show mouse on Esc, hide when pressing again
Closes #28
See merge request veloren/veloren!61
Former-commit-id: 37d5792a563f4cce2f2c9f13d3d46cf098caf27f
|
2019-04-25 18:27:08 +00:00 |
|